diff options
Diffstat (limited to 'ubuntu/maverick/tdebase')
18 files changed, 173 insertions, 173 deletions
diff --git a/ubuntu/maverick/tdebase/debian/changelog b/ubuntu/maverick/tdebase/debian/changelog index b991c3875..f19a0e4e8 100644 --- a/ubuntu/maverick/tdebase/debian/changelog +++ b/ubuntu/maverick/tdebase/debian/changelog @@ -105,7 +105,7 @@ tdebase-trinity (4:3.5.10-0ubuntu12) karmic; urgency=low tdebase-trinity (4:3.5.10-0ubuntu11) karmic; urgency=low - * Repaired startkde script to export DESKTOP_SESSION + * Repaired starttde script to export DESKTOP_SESSION * Depends on libogg-dev-la * Repaired gcc4.4 compilation problems @@ -196,7 +196,7 @@ tdebase-trinity (4:3.5.10-0ubuntu3~intrepid19) intrepid; urgency=low tdebase-trinity (4:3.5.10-0ubuntu3~intrepid18) intrepid; urgency=low - * Added XDG_DATA_DIRS and KDEDIRS to startkde, as suggested by zekica on the Debian forums + * Added XDG_DATA_DIRS and KDEDIRS to starttde, as suggested by zekica on the Debian forums -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 07 Mar 2009 13:18:00 -0600 @@ -240,7 +240,7 @@ tdebase-trinity (4:3.5.10-0ubuntu3~intrepid3) intrepid; urgency=low tdebase-trinity (4:3.5.10-0ubuntu3~intrepid1) intrepid; urgency=low - * Removed link /usr/lib/libkonsolepart.so for python-trinity-trinity and altered startkde script to function properly with the new .trinity home directory + * Removed link /usr/lib/libkonsolepart.so for python-trinity-trinity and altered starttde script to function properly with the new .trinity home directory -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Fri, 05 Dec 2008 16:15:00 -0600 @@ -353,7 +353,7 @@ tdebase (4:3.5.9-0ubuntu5) hardy; urgency=low tdebase (4:3.5.9-0ubuntu4) hardy; urgency=low - * Remove kubuntu_9920_startkde_dash_stupidness.diff, + * Remove kubuntu_9920_starttde_dash_stupidness.diff, Closes LP: #206187 -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 25 Mar 2008 23:05:42 +0000 @@ -428,7 +428,7 @@ tdebase (4:3.5.8-2ubuntu17) hardy; urgency=low tdebase (4:3.5.8-2ubuntu17) hardy; urgency=low - * Added kubuntu_9920_startkde_dash_stupidness.diff: + * Added kubuntu_9920_starttde_dash_stupidness.diff: - For some stupid reasons, env scripts are not parsed correctly due dash. Hard to believe, but this patch fixes the issue... - Closes LP: #189144 @@ -677,7 +677,7 @@ tdebase (4:3.5.7-2) unstable; urgency=low * Add support or back references in klipper. Thanks to Sean Finney. (Closes: #427843) * Updated nb debconf translation. (Closes: #417942) - * Fix typo in startkde manpage. Thanks A. Costa. (Closes: #432062) + * Fix typo in starttde manpage. Thanks A. Costa. (Closes: #432062) * Fix typo in kdmrc. Thanks Greg. (Closes: #422142) * Updated vi debconf translation. Thanks Clytie Siddall (Closes: #426820) * Updated pt_BR debconf translation. Thanks Eder L. Marques. @@ -967,7 +967,7 @@ tdebase (4:3.5.7-1) unstable; urgency=low - Remove patch 21 - applied upstream. - Adapt patch 27 - kfreebsd - minor changes. - Adapt patch 41 - amd64 and nspluginviewer - small changes. - - Remove patch 42 - kwin and 64 bit. applied upstream. + - Remove patch 42 - twin and 64 bit. applied upstream. - Remove patch 44 - opengl logo is fixed. - Remove patch 45 - keyboard handler - applied upstream. @@ -1246,7 +1246,7 @@ tdebase (4:3.5.6-0ubuntu1) feisty; urgency=low * New upstream release * Remove patched applied upstream: - - 02_hal_kwin_fixes_branch.diff + - 02_hal_twin_fixes_branch.diff - 29_halbackend_fstab_improvements.diff - 30_mediamanager_followsymlinks.diff - 32_camera_icon_from_mimetype.diff @@ -1417,7 +1417,7 @@ tdebase (4:3.5.5a.dfsg.1-5) unstable; urgency=high non-linux archs (Closes: 399059) +++ Changes by Modestas Vainius: - * Fix 36_kwin.diff patch. In some cases clients were not properly added to + * Fix 36_twin.diff patch. In some cases clients were not properly added to the group. (Closes: #404226) -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 29 Dec 2006 19:15:23 +0200 @@ -1429,7 +1429,7 @@ tdebase (4:3.5.5a.dfsg.1-4) unstable; urgency=low (Closes: #399823, #384416) +++ Changes by Ana Guerrero: - * Applied patch to avoid kwin crashes when switching desktop + * Applied patch to avoid twin crashes when switching desktop (Closes: #365829). -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 13 Dec 2006 13:09:33 +0100 @@ -2019,7 +2019,7 @@ tdebase (4:3.5.3-2) unstable; urgency=medium tdebase (4:3.5.3-1) unstable; urgency=low * New upstream release. - + fix kwin alt-tab problems. (Closes: #363357, #361421, #361127) + + fix twin alt-tab problems. (Closes: #363357, #361421, #361127) + fix problems with systram. (Closes: #347320) +++ Changes by Christopher Martin: @@ -2132,7 +2132,7 @@ tdebase (4:3.5.1-1) unstable; urgency=low * Enable zeroconf support in ksysguardd; add libavahi-compat-libdnssd-dev to the build-depends. (Closes: #348583) - * Merge startkde manpage (and maintainer script patch to fully integrate it) + * Merge starttde manpage (and maintainer script patch to fully integrate it) from Philipp Grau. Thanks. (Closes: #348501) * Upload to unstable. @@ -2332,7 +2332,7 @@ tdebase (4:3.5.2-0ubuntu9) dapper; urgency=low tdebase (4:3.5.2-0ubuntu8) dapper; urgency=low - * Add kubuntu_58_kwin_branch.diff fixes crash on alt-tab and + * Add kubuntu_58_twin_branch.diff fixes crash on alt-tab and focus policies -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 14 Apr 2006 15:35:56 +0000 @@ -2632,7 +2632,7 @@ tdebase (4:3.5-rc2-0ubuntu1) dapper; urgency=low * kdm depends on xauth not xbase-clients * Update 18_default_fonts.diff * Generate .pot files - * Remove kubuntu_26_startkde.diff, no need to start ivman in 3.5 + * Remove kubuntu_26_starttde.diff, no need to start ivman in 3.5 -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 21 Nov 2005 17:46:39 +0000 @@ -2644,7 +2644,7 @@ tdebase (4:3.5-rc1-1ubuntu1) dapper; urgency=low * Update kubuntu_16_hide_kpager_menu_entry.diff * Update kubuntu_19_kdm_zsh_emulate.diff * Update kubuntu_25_kcontrol_only_in_kde.diff - * Update kubuntu_30_startkde_background_colour.diff + * Update kubuntu_30_starttde_background_colour.diff * Update kubuntu_32_usplash_console_font.diff * konqueror replaces old kcontrol @@ -2762,7 +2762,7 @@ tdebase (4:3.4.2-2) unstable; urgency=low +++ Changes by Christopher Martin: - * For tdebase-data, add conflicts against old versions of kcontrol, kwin, + * For tdebase-data, add conflicts against old versions of kcontrol, twin, and kicker. This should prevent users from unwittingly upgrading tdebase-data to 3.4.x, while the rest of KDE stays at the 3.3.x level. This had resulted in kcontrol breaking and other assorted issues. @@ -2800,7 +2800,7 @@ tdebase (4:3.4.2-1) unstable; urgency=low * Add build-dependencies on libxss-dev, libxxf86misc-dev, libxau-dev, libxdmcp-dev, libxcomposite-dev, libxdamage-dev, and prune the 07_xlibs-static-pic.diff accordingly, for the X.Org transition. kompmgr - is also now built and installed with kwin. + is also now built and installed with twin. * Tightened build dependency on dbus-qt-1-dev to force building against a C++ transitioned version. Can be removed once dbus (>= 0.23.4-5) is @@ -2905,7 +2905,7 @@ tdebase (4:3.4.2-0ubuntu4) breezy; urgency=low on desktop icons * Compile with GCC 3.4 on hppa, m68k, arm to prevent internal compiler error - * Add kubuntu_30_startkde_background_colour.diff to make default + * Add kubuntu_30_starttde_background_colour.diff to make default background colour match default wallpaperchange background colour * Do not install SVG icons to save space * Install simple konqueror.rc into /usr/share/apps/konqueror, workaround @@ -2971,7 +2971,7 @@ tdebase (4:3.4.1-0ubuntu3) breezy; urgency=low * Update kubuntu_23_hal_api.diff * Replace 19_kcontrol_only_in_kde.diff with kubuntu_25_kcontrol_only_in_kde.diff which stops KControl displaying (use System Settings instead) - * Add kubuntu_26_startkde.diff to start ivman + * Add kubuntu_26_starttde.diff to start ivman * Add 25_khelp_htdig.diff from Debian -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 20 Jun 2005 09:15:07 +0000 @@ -3065,7 +3065,7 @@ tdebase (4:3.4.0-0pre4) alioth; urgency=low Debian. (Closes: #246280) * Make ksmserver Recommend kpersonalizer, since it is used when - running KDE for the first time. Also patch startkde so it doesn't + running KDE for the first time. Also patch starttde so it doesn't fail when kpersonalizer is not present. (Closes: #309803) * Add manpages for kdialog (thanks to Bastian Kleineidam for tracking it @@ -3107,7 +3107,7 @@ tdebase (4:3.3.2-1) unstable; urgency=low +++ Changes by Adeodato Simó: * debian/control: - - make tdebase-dev depend on kwin for the libtdecorations.so -> + - make tdebase-dev depend on twin for the libtdecorations.so -> libtdecorations.so.1.0.0 symlink. (Closes: #289544) * Included Czech po-debconf translation by Miroslav Kure. @@ -3276,7 +3276,7 @@ tdebase (4:3.4.0-0pre1ubuntu6) hoary; urgency=low tdebase (4:3.4.0-0pre1ubuntu5) hoary; urgency=low - * Add kwin conflicts with old tdeartwork-theme-window + * Add twin conflicts with old tdeartwork-theme-window -- Jonathan Riddell <jr@jriddell.org> Tue, 8 Mar 2005 22:48:59 +0000 @@ -3312,7 +3312,7 @@ tdebase (4:3.3.2-0pre1) experimental; urgency=low * KDE_3_3_BRANCH update. Includes the tdebase part of the fix for CAN-2004-1158. * Lower tdeprint's dependency on gv to a Suggests. (Closes: #269590) - * kwin is now registered as an x-window-manager. (Closes: #249162) + * twin is now registered as an x-window-manager. (Closes: #249162) * Added /usr/share/xsessions to KDM's default session path, so .desktop files installed there are found. (Closes: #243770, #247365, #247747, #250384) @@ -3855,7 +3855,7 @@ tdebase (4:2.2.1-5) unstable; urgency=low tdebase (4:2.2.1-4) unstable; urgency=low * More upstream fixes - * don't set background in startkde script by default. + * don't set background in starttde script by default. -- Ivan E. Moore II <rkrusty@debian.org> Thu, 27 Sep 2001 12:13:00 -0700 @@ -4056,7 +4056,7 @@ tdebase (4:2.2.0-0beta1-1) unstable; urgency=low * Provide man link from kdm to chooser * More build cleanup..take more of the automation out to make sure things are constant - * Remove custom startkde + * Remove custom starttde * Revert old overrides so we can start from scratch * Add in new python-base dependency * New packages: kate, tdebase-audiolibs (so that those without sound do @@ -4068,7 +4068,7 @@ tdebase (4:2.2.0-0beta1-1) unstable; urgency=low * And let's list the bugs fixed... ctrl-u problems with location bar fixed (Closes: #81425) image transparency fixed for konsole on startup (Closes: #84062) - fixes kwin's conflicting key accelerators (Closes: #86370) + fixes twin's conflicting key accelerators (Closes: #86370) fixes rendering error for www.bluesnews.com (Closes: #79800) fixes button problems for katalog.ub.uni-heidelberg.de (Closes: #88934) now provides the audiocd ioslave bits which allow for ripping audio @@ -4134,7 +4134,7 @@ tdebase (4:2.1.1-3) unstable; urgency=low tdebase (4:2.1.1-2) unstable; urgency=low - * Move startkde script into /etc/kde2 so that it will be a conffile and + * Move starttde script into /etc/kde2 so that it will be a conffile and link it back to /usr/bin/kde2. (Closes: #91787) * Build on older libc * Adding in recommends for klisa @@ -4410,7 +4410,7 @@ tdebase (4:2.1-20001213-1) unstable; urgency=low * Fix whatis typo (Closes: #78178) * Fix segfaults (Closes: #78903) * Adding in a Recommend for kview to konqueror (Closes: #79201) - * Changing x-window-manager alternative from kde2 to kwin + * Changing x-window-manager alternative from kde2 to twin * KDM init.d script cleanup (Closes: #79320) * Fixed default kdmrc script to show new options * Adding in a kwm script for non-session launches @@ -4546,7 +4546,7 @@ tdebase (4:2.0-20001008-0) unstable; urgency=low tdebase (4:2.0-20001006-1) unstable; urgency=low * More upstream fixes - * Applying tdebase-1.94-kwin-nofreeze-20000924.diff patch (Closes: #74051) + * Applying tdebase-1.94-twin-nofreeze-20000924.diff patch (Closes: #74051) -- Ivan E. Moore II <rkrusty@debian.org> Sun, 08 Oct 2000 03:30:00 -0700 @@ -5057,9 +5057,9 @@ tdebase (1:Beta2-2.1) experimental; urgency=low tdebase (1:Beta2-2) unstable; urgency=low - * fixed kde / startkde script. added minimal documentation. + * fixed kde / starttde script. added minimal documentation. * fixed klock permissions. - * removed startkde script. + * removed starttde script. * removed virtual package names. * fixed utmp file location in kvt. diff --git a/ubuntu/maverick/tdebase/debian/control b/ubuntu/maverick/tdebase/debian/control index 13b0f584b..eef9136ec 100644 --- a/ubuntu/maverick/tdebase/debian/control +++ b/ubuntu/maverick/tdebase/debian/control @@ -14,7 +14,7 @@ Section: kde Architecture: all Replaces: tdebase-kde3 (<< 4:3.5.13) Breaks: tdebase-kde3 (<< 4:3.5.13) -Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-kio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), kwin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), hal-trinity | kfreebsd-gnu | hurd, xcalib +Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-kio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), twin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), hal-trinity | kfreebsd-gnu | hurd, xcalib Recommends: kdm-trinity (>= ${Source-Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity Suggests: tdebase-trinity-doc-html (>= ${Source-Version}) Description: base components from the official KDE release @@ -127,7 +127,7 @@ Section: kde Architecture: all Replaces: tdebase-data-kde3 (<< 4:3.5.13) Breaks: tdebase-data-kde3 (<< 4:3.5.13) -Conflicts: kcontrol-trinity (<< 4:3.4.2-1), kwin-trinity (<< 4:3.4.2-1), kicker-trinity (<< 4:3.4.2-1) +Conflicts: kcontrol-trinity (<< 4:3.4.2-1), twin-trinity (<< 4:3.4.2-1), kicker-trinity (<< 4:3.4.2-1) Description: shared data files for the KDE base module This package contains the architecture-independent shared data files needed for a basic KDE desktop installation. @@ -140,7 +140,7 @@ Section: devel Architecture: any Replaces: tdebase-kde3-dev (<< 4:3.5.13) Breaks: tdebase-kde3-dev (<< 4:3.5.13) -Depends: kate-trinity (= ${Source-Version}), kcontrol-trinity (= ${Source-Version}), tdebase-trinity-bin (= ${Source-Version}), tdeprint-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), khelpcenter-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), klipper-trinity (= ${Source-Version}), kmenuedit-trinity (= ${Source-Version}), konqueror-nsplugins-trinity (= ${Source-Version}), konqueror-trinity (= ${Source-Version}), konsole-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version}), ksysguard-trinity (= ${Source-Version}), kwin-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8) +Depends: kate-trinity (= ${Source-Version}), kcontrol-trinity (= ${Source-Version}), tdebase-trinity-bin (= ${Source-Version}), tdeprint-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), khelpcenter-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), klipper-trinity (= ${Source-Version}), kmenuedit-trinity (= ${Source-Version}), konqueror-nsplugins-trinity (= ${Source-Version}), konqueror-trinity (= ${Source-Version}), konsole-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version}), ksysguard-trinity (= ${Source-Version}), twin-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8) Description: development files for the KDE base module This package contains headers and other development files needed to compile software based on the KDE base module. @@ -461,13 +461,13 @@ Architecture: any Replaces: ksmserver-kde3 (<< 4:3.5.13) Breaks: ksmserver-kde3 (<< 4:3.5.13) Provides: x-session-manager -Depends: ${shlibs:Depends}, tdebase-runtime-data-common-trinity, kwin-trinity (= ${Source-Version}) | x-window-manager +Depends: ${shlibs:Depends}, tdebase-runtime-data-common-trinity, twin-trinity (= ${Source-Version}) | x-window-manager Recommends: kpersonalizer-trinity (= ${Source-Version}), tde-ubuntu-integration Description: session manager for KDE This package contains the KDE session manager. It is responsible for restoring your KDE session on login. It is also needed to properly start a KDE session. It registers KDE with X display managers, and - provides the 'startkde' command, for starting an X session with KDE + provides the 'starttde' command, for starting an X session with KDE from the console. . If you are running KDE for the first time for a certain user, @@ -532,11 +532,11 @@ Description: useful tips for KDE This package is part of KDE, and a component of the KDE base module. See the 'kde-trinity' and 'tdebase-trinity' packages for more information. -Package: kwin-trinity +Package: twin-trinity Section: kde Architecture: any -Replaces: kwin-kde3 (<< 4:3.5.13) -Breaks: kwin-kde3 (<< 4:3.5.13) +Replaces: twin-kde3 (<< 4:3.5.13) +Breaks: twin-kde3 (<< 4:3.5.13) Depends: ${shlibs:Depends} Provides: x-window-manager Suggests: tdebase-trinity-bin (= ${Source-Version}), tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3}), kdesktop-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), kpager-trinity (= ${Source-Version}), kpersonalizer-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version}) diff --git a/ubuntu/maverick/tdebase/debian/control.in b/ubuntu/maverick/tdebase/debian/control.in index 107c75b66..58861a14d 100644 --- a/ubuntu/maverick/tdebase/debian/control.in +++ b/ubuntu/maverick/tdebase/debian/control.in @@ -13,7 +13,7 @@ XS-Vcs-Bzr: http://bazaar.launchpad.net/~kubuntu-members/tdebase/debian Package: tdebase Section: kde Architecture: all -Depends: kappfinder (>= ${Source-Version}), kate (>= ${Source-Version}), kcontrol (>= ${Source-Version}), tdebase-bin (>= ${Source-Version}), tdebase-data (>= ${Source-Version}), tdebase-kio-plugins (>= ${Source-Version}), kdepasswd (>= ${Source-Version}), tdeprint (>= ${Source-Version}), kdesktop (>= ${Source-Version}), kfind (>= ${Source-Version}), khelpcenter (>= ${Source-Version}), kicker (>= ${Source-Version}), klipper (>= ${Source-Version}), kmenuedit (>= ${Source-Version}), konqueror-nsplugins (>= ${Source-Version}), konqueror (>= ${Source-Version}), konsole (>= ${Source-Version}), kpager (>= ${Source-Version}), kpersonalizer (>= ${Source-Version}), ksmserver (>= ${Source-Version}), ksplash (>= ${Source-Version}), ksysguard (>= ${Source-Version}), ktip (>= ${Source-Version}), kwin (>= ${Source-Version}), libkonq4 (>= ${Source-Version}), hal | kfreebsd-gnu | hurd, pmount | kfreebsd-gnu | hurd +Depends: kappfinder (>= ${Source-Version}), kate (>= ${Source-Version}), kcontrol (>= ${Source-Version}), tdebase-bin (>= ${Source-Version}), tdebase-data (>= ${Source-Version}), tdebase-kio-plugins (>= ${Source-Version}), kdepasswd (>= ${Source-Version}), tdeprint (>= ${Source-Version}), kdesktop (>= ${Source-Version}), kfind (>= ${Source-Version}), khelpcenter (>= ${Source-Version}), kicker (>= ${Source-Version}), klipper (>= ${Source-Version}), kmenuedit (>= ${Source-Version}), konqueror-nsplugins (>= ${Source-Version}), konqueror (>= ${Source-Version}), konsole (>= ${Source-Version}), kpager (>= ${Source-Version}), kpersonalizer (>= ${Source-Version}), ksmserver (>= ${Source-Version}), ksplash (>= ${Source-Version}), ksysguard (>= ${Source-Version}), ktip (>= ${Source-Version}), twin (>= ${Source-Version}), libkonq4 (>= ${Source-Version}), hal | kfreebsd-gnu | hurd, pmount | kfreebsd-gnu | hurd Recommends: kdm (>= ${Source-Version}) Suggests: tdebase-doc-html (>= ${Source-Version}) Description: base components from the official KDE release @@ -109,7 +109,7 @@ Description: core binaries for the KDE base module Package: tdebase-data Section: kde Architecture: all -Conflicts: kcontrol (<< 4:3.4.2-1), kwin (<< 4:3.4.2-1), kicker (<< 4:3.4.2-1) +Conflicts: kcontrol (<< 4:3.4.2-1), twin (<< 4:3.4.2-1), kicker (<< 4:3.4.2-1) Replaces: tdebase (<< 4:3.0.0), tdeedu-data (<< 4:3.4.0), tdelibs-data (<< 4:3.3.0), kdewallpapers (<< 4:3.0.0), kcontrol (<< 4:3.5.5a.dfsg.1-1ubuntu18) Description: shared data files for the KDE base module This package contains the architecture-independent shared data files @@ -121,7 +121,7 @@ Description: shared data files for the KDE base module Package: tdebase-dev Section: devel Architecture: any -Depends: kate (= ${Source-Version}), kcontrol (= ${Source-Version}), tdebase-bin (= ${Source-Version}), tdeprint (= ${Source-Version}), kdesktop (= ${Source-Version}), khelpcenter (= ${Source-Version}), kicker (= ${Source-Version}), klipper (= ${Source-Version}), kmenuedit (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), konsole (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version}), ksysguard (= ${Source-Version}), kwin (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8) +Depends: kate (= ${Source-Version}), kcontrol (= ${Source-Version}), tdebase-bin (= ${Source-Version}), tdeprint (= ${Source-Version}), kdesktop (= ${Source-Version}), khelpcenter (= ${Source-Version}), kicker (= ${Source-Version}), klipper (= ${Source-Version}), kmenuedit (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), konsole (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version}), ksysguard (= ${Source-Version}), twin (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8) Replaces: kate (<< 4:3.0.0), tdebase (<< 4:3.0.0), konqueror (<< 4:3.0.0) Description: development files for the KDE base module This package contains headers and other development files needed to @@ -421,14 +421,14 @@ Package: ksmserver Section: kde Architecture: any Provides: x-session-manager -Depends: ${shlibs:Depends}, kwin (= ${Source-Version}) | x-window-manager +Depends: ${shlibs:Depends}, twin (= ${Source-Version}) | x-window-manager Recommends: kpersonalizer (= ${Source-Version}) Replaces: tdebase (<< 4:3.0.0) Description: session manager for KDE This package contains the KDE session manager. It is responsible for restoring your KDE session on login. It is also needed to properly start a KDE session. It registers KDE with X display managers, and - provides the 'startkde' command, for starting an X session with KDE + provides the 'starttde' command, for starting an X session with KDE from the console. . If you are running KDE for the first time for a certain user, @@ -489,7 +489,7 @@ Description: useful tips for KDE This package is part of KDE, and a component of the KDE base module. See the 'kde' and 'tdebase' packages for more information. -Package: kwin +Package: twin Section: kde Architecture: any Depends: ${shlibs:Depends} diff --git a/ubuntu/maverick/tdebase/debian/copyright b/ubuntu/maverick/tdebase/debian/copyright index a17edd5c2..3d683d411 100644 --- a/ubuntu/maverick/tdebase/debian/copyright +++ b/ubuntu/maverick/tdebase/debian/copyright @@ -20,7 +20,7 @@ kdcop, tdesu, klipper BSD --- -drkonqi, kaddressbook, kicker, ksmserver, ksplash, kwin, legacyimport +drkonqi, kaddressbook, kicker, ksmserver, ksplash, twin, legacyimport GPL --- diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.install b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.install index 0946d8a57..f8c0aa867 100644 --- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.install +++ b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.install @@ -1,5 +1,5 @@ debian/tmp/opt/trinity/bin/ksmserver -debian/tmp/opt/trinity/bin/startkde +debian/tmp/opt/trinity/bin/starttde debian/tmp/opt/trinity/lib/trinity/ksmserver.la debian/tmp/opt/trinity/lib/trinity/ksmserver.so debian/tmp/opt/trinity/lib/libtdeinit_ksmserver.so diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.manpages b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.manpages index 05b93960e..354e23800 100644 --- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.manpages +++ b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.manpages @@ -1 +1 @@ -debian/man/startkde-trinity.1 +debian/man/starttde-trinity.1 diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.postinst b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.postinst index 6492cbb59..f5d73b934 100644 --- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.postinst +++ b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.postinst @@ -20,9 +20,9 @@ set -e case "$1" in configure) update-alternatives --install /usr/bin/x-session-manager \ - x-session-manager /opt/trinity/bin/startkde 40 \ + x-session-manager /opt/trinity/bin/starttde 40 \ --slave /opt/trinity/share/man/man1/x-session-manager.1.gz \ - x-session-manager.1.gz "/opt/trinity/share/man/man1/startkde-trinity.1.gz" + x-session-manager.1.gz "/opt/trinity/share/man/man1/starttde-trinity.1.gz" ;; diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst index 73ee5043a..884257d03 100644 --- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst +++ b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst @@ -4,7 +4,7 @@ case "$1" in upgrade) rm -f /etc/gdm/Sessions/KDE - rm -f /etc/trinity/debian/startkde + rm -f /etc/trinity/debian/starttde /usr/sbin/update-alternatives --remove x-session-manager /usr/bin/kde2 /usr/sbin/update-alternatives --remove x-session-manager /usr/bin/trinity mkdir -p /usr/share/autostart diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.prerm b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.prerm index 11b4bc08a..e9be94522 100644 --- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.prerm +++ b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.prerm @@ -19,7 +19,7 @@ set -e case "$1" in remove) - /usr/sbin/update-alternatives --remove x-session-manager /usr/trinity/bin/startkde + /usr/sbin/update-alternatives --remove x-session-manager /usr/trinity/bin/starttde dpkg-divert --rename --remove /usr/share/autostart/plasma.desktop ;; diff --git a/ubuntu/maverick/tdebase/debian/kwin-trinity.install b/ubuntu/maverick/tdebase/debian/kwin-trinity.install index a6fde0638..62d42f166 100644 --- a/ubuntu/maverick/tdebase/debian/kwin-trinity.install +++ b/ubuntu/maverick/tdebase/debian/kwin-trinity.install @@ -1,101 +1,101 @@ debian/tmp/opt/trinity/bin/kompmgr -debian/tmp/opt/trinity/bin/kwin -debian/tmp/opt/trinity/bin/kwin_killer_helper -debian/tmp/opt/trinity/bin/kwin_rules_dialog -debian/tmp/opt/trinity/lib/kconf_update_bin/kwin_update_default_rules -debian/tmp/opt/trinity/lib/kconf_update_bin/kwin_update_window_settings -debian/tmp/opt/trinity/lib/trinity/kcm_kwindecoration.la -debian/tmp/opt/trinity/lib/trinity/kcm_kwindecoration.so -debian/tmp/opt/trinity/lib/trinity/kcm_kwinoptions.la -debian/tmp/opt/trinity/lib/trinity/kcm_kwinoptions.so -debian/tmp/opt/trinity/lib/trinity/kcm_kwinrules.la -debian/tmp/opt/trinity/lib/trinity/kcm_kwinrules.so -debian/tmp/opt/trinity/lib/trinity/kwin3_b2.la -debian/tmp/opt/trinity/lib/trinity/kwin3_b2.so -debian/tmp/opt/trinity/lib/trinity/kwin3_default.la -debian/tmp/opt/trinity/lib/trinity/kwin3_default.so -debian/tmp/opt/trinity/lib/trinity/kwin3_keramik.la -debian/tmp/opt/trinity/lib/trinity/kwin3_keramik.so -debian/tmp/opt/trinity/lib/trinity/kwin3_laptop.la -debian/tmp/opt/trinity/lib/trinity/kwin3_laptop.so -debian/tmp/opt/trinity/lib/trinity/kwin3_modernsys.la -debian/tmp/opt/trinity/lib/trinity/kwin3_modernsys.so -debian/tmp/opt/trinity/lib/trinity/kwin3_plastik.la -debian/tmp/opt/trinity/lib/trinity/kwin3_plastik.so -debian/tmp/opt/trinity/lib/trinity/kwin3_quartz.la -debian/tmp/opt/trinity/lib/trinity/kwin3_quartz.so -debian/tmp/opt/trinity/lib/trinity/kwin3_redmond.la -debian/tmp/opt/trinity/lib/trinity/kwin3_redmond.so -debian/tmp/opt/trinity/lib/trinity/kwin3_web.la -debian/tmp/opt/trinity/lib/trinity/kwin3_web.so -debian/tmp/opt/trinity/lib/trinity/kwin_b2_config.la -debian/tmp/opt/trinity/lib/trinity/kwin_b2_config.so -debian/tmp/opt/trinity/lib/trinity/kwin_default_config.la -debian/tmp/opt/trinity/lib/trinity/kwin_default_config.so -debian/tmp/opt/trinity/lib/trinity/kwin_keramik_config.la -debian/tmp/opt/trinity/lib/trinity/kwin_keramik_config.so -debian/tmp/opt/trinity/lib/trinity/kwin.la -debian/tmp/opt/trinity/lib/trinity/kwin_modernsys_config.la -debian/tmp/opt/trinity/lib/trinity/kwin_modernsys_config.so -debian/tmp/opt/trinity/lib/trinity/kwin_plastik_config.la -debian/tmp/opt/trinity/lib/trinity/kwin_plastik_config.so -debian/tmp/opt/trinity/lib/trinity/kwin_quartz_config.la -debian/tmp/opt/trinity/lib/trinity/kwin_quartz_config.so -debian/tmp/opt/trinity/lib/trinity/kwin_rules_dialog.la -debian/tmp/opt/trinity/lib/trinity/kwin_rules_dialog.so -debian/tmp/opt/trinity/lib/trinity/kwin.so +debian/tmp/opt/trinity/bin/twin +debian/tmp/opt/trinity/bin/twin_killer_helper +debian/tmp/opt/trinity/bin/twin_rules_dialog +debian/tmp/opt/trinity/lib/kconf_update_bin/twin_update_default_rules +debian/tmp/opt/trinity/lib/kconf_update_bin/twin_update_window_settings +debian/tmp/opt/trinity/lib/trinity/kcm_twindecoration.la +debian/tmp/opt/trinity/lib/trinity/kcm_twindecoration.so +debian/tmp/opt/trinity/lib/trinity/kcm_twinoptions.la +debian/tmp/opt/trinity/lib/trinity/kcm_twinoptions.so +debian/tmp/opt/trinity/lib/trinity/kcm_twinrules.la +debian/tmp/opt/trinity/lib/trinity/kcm_twinrules.so +debian/tmp/opt/trinity/lib/trinity/twin3_b2.la +debian/tmp/opt/trinity/lib/trinity/twin3_b2.so +debian/tmp/opt/trinity/lib/trinity/twin3_default.la +debian/tmp/opt/trinity/lib/trinity/twin3_default.so +debian/tmp/opt/trinity/lib/trinity/twin3_keramik.la +debian/tmp/opt/trinity/lib/trinity/twin3_keramik.so +debian/tmp/opt/trinity/lib/trinity/twin3_laptop.la +debian/tmp/opt/trinity/lib/trinity/twin3_laptop.so +debian/tmp/opt/trinity/lib/trinity/twin3_modernsys.la +debian/tmp/opt/trinity/lib/trinity/twin3_modernsys.so +debian/tmp/opt/trinity/lib/trinity/twin3_plastik.la +debian/tmp/opt/trinity/lib/trinity/twin3_plastik.so +debian/tmp/opt/trinity/lib/trinity/twin3_quartz.la +debian/tmp/opt/trinity/lib/trinity/twin3_quartz.so +debian/tmp/opt/trinity/lib/trinity/twin3_redmond.la +debian/tmp/opt/trinity/lib/trinity/twin3_redmond.so +debian/tmp/opt/trinity/lib/trinity/twin3_web.la +debian/tmp/opt/trinity/lib/trinity/twin3_web.so +debian/tmp/opt/trinity/lib/trinity/twin_b2_config.la +debian/tmp/opt/trinity/lib/trinity/twin_b2_config.so +debian/tmp/opt/trinity/lib/trinity/twin_default_config.la +debian/tmp/opt/trinity/lib/trinity/twin_default_config.so +debian/tmp/opt/trinity/lib/trinity/twin_keramik_config.la +debian/tmp/opt/trinity/lib/trinity/twin_keramik_config.so +debian/tmp/opt/trinity/lib/trinity/twin.la +debian/tmp/opt/trinity/lib/trinity/twin_modernsys_config.la +debian/tmp/opt/trinity/lib/trinity/twin_modernsys_config.so +debian/tmp/opt/trinity/lib/trinity/twin_plastik_config.la +debian/tmp/opt/trinity/lib/trinity/twin_plastik_config.so +debian/tmp/opt/trinity/lib/trinity/twin_quartz_config.la +debian/tmp/opt/trinity/lib/trinity/twin_quartz_config.so +debian/tmp/opt/trinity/lib/trinity/twin_rules_dialog.la +debian/tmp/opt/trinity/lib/trinity/twin_rules_dialog.so +debian/tmp/opt/trinity/lib/trinity/twin.so debian/tmp/opt/trinity/lib/libtdecorations.so.1 debian/tmp/opt/trinity/lib/libtdecorations.so.1.0.0 -debian/tmp/opt/trinity/lib/libtdeinit_kwin_rules_dialog.so -debian/tmp/opt/trinity/lib/libtdeinit_kwin.so +debian/tmp/opt/trinity/lib/libtdeinit_twin_rules_dialog.so +debian/tmp/opt/trinity/lib/libtdeinit_twin.so debian/tmp/opt/trinity/share/applications/kde/showdesktop.desktop -debian/tmp/opt/trinity/share/applications/kde/kwindecoration.desktop -debian/tmp/opt/trinity/share/applications/kde/kwinoptions.desktop -debian/tmp/opt/trinity/share/applications/kde/kwinrules.desktop -debian/tmp/opt/trinity/share/applnk/.hidden/kwinactions.desktop -debian/tmp/opt/trinity/share/applnk/.hidden/kwinadvanced.desktop -debian/tmp/opt/trinity/share/applnk/.hidden/kwinfocus.desktop -debian/tmp/opt/trinity/share/applnk/.hidden/kwinmoving.desktop -debian/tmp/opt/trinity/share/applnk/.hidden/kwintranslucency.desktop -debian/tmp/opt/trinity/share/apps/kconf_update/kwin3_plugin.pl -debian/tmp/opt/trinity/share/apps/kconf_update/kwin3_plugin.upd -debian/tmp/opt/trinity/share/apps/kconf_update/kwin_focus1.sh -debian/tmp/opt/trinity/share/apps/kconf_update/kwin_focus1.upd -debian/tmp/opt/trinity/share/apps/kconf_update/kwin_focus2.sh -debian/tmp/opt/trinity/share/apps/kconf_update/kwin_focus2.upd -debian/tmp/opt/trinity/share/apps/kconf_update/kwin_fsp_workarounds_1.upd -debian/tmp/opt/trinity/share/apps/kconf_update/kwiniconify.upd -debian/tmp/opt/trinity/share/apps/kconf_update/kwinsticky.upd -debian/tmp/opt/trinity/share/apps/kconf_update/kwin.upd -debian/tmp/opt/trinity/share/apps/kconf_update/kwinupdatewindowsettings.upd +debian/tmp/opt/trinity/share/applications/kde/twindecoration.desktop +debian/tmp/opt/trinity/share/applications/kde/twinoptions.desktop +debian/tmp/opt/trinity/share/applications/kde/twinrules.desktop +debian/tmp/opt/trinity/share/applnk/.hidden/twinactions.desktop +debian/tmp/opt/trinity/share/applnk/.hidden/twinadvanced.desktop +debian/tmp/opt/trinity/share/applnk/.hidden/twinfocus.desktop +debian/tmp/opt/trinity/share/applnk/.hidden/twinmoving.desktop +debian/tmp/opt/trinity/share/applnk/.hidden/twintranslucency.desktop +debian/tmp/opt/trinity/share/apps/kconf_update/twin3_plugin.pl +debian/tmp/opt/trinity/share/apps/kconf_update/twin3_plugin.upd +debian/tmp/opt/trinity/share/apps/kconf_update/twin_focus1.sh +debian/tmp/opt/trinity/share/apps/kconf_update/twin_focus1.upd +debian/tmp/opt/trinity/share/apps/kconf_update/twin_focus2.sh +debian/tmp/opt/trinity/share/apps/kconf_update/twin_focus2.upd +debian/tmp/opt/trinity/share/apps/kconf_update/twin_fsp_workarounds_1.upd +debian/tmp/opt/trinity/share/apps/kconf_update/twiniconify.upd +debian/tmp/opt/trinity/share/apps/kconf_update/twinsticky.upd +debian/tmp/opt/trinity/share/apps/kconf_update/twin.upd +debian/tmp/opt/trinity/share/apps/kconf_update/twinupdatewindowsettings.upd debian/tmp/opt/trinity/share/apps/kconf_update/pluginlibFix.pl -debian/tmp/opt/trinity/share/apps/kwin/b2.desktop -debian/tmp/opt/trinity/share/apps/kwin/eventsrc -debian/tmp/opt/trinity/share/apps/kwin/keramik.desktop -debian/tmp/opt/trinity/share/apps/kwin/laptop.desktop -debian/tmp/opt/trinity/share/apps/kwin/modernsystem.desktop -debian/tmp/opt/trinity/share/apps/kwin/pics/bluesun.png -debian/tmp/opt/trinity/share/apps/kwin/pics/close.png -debian/tmp/opt/trinity/share/apps/kwin/pics/fog-grey.png -debian/tmp/opt/trinity/share/apps/kwin/pics/fog.png -debian/tmp/opt/trinity/share/apps/kwin/pics/greenie.dim.png -debian/tmp/opt/trinity/share/apps/kwin/pics/greenie.light.png -debian/tmp/opt/trinity/share/apps/kwin/pics/iconify.png -debian/tmp/opt/trinity/share/apps/kwin/pics/maximizedown.png -debian/tmp/opt/trinity/share/apps/kwin/pics/maximize.png -debian/tmp/opt/trinity/share/apps/kwin/pics/menu.png -debian/tmp/opt/trinity/share/apps/kwin/pics/pindown.png -debian/tmp/opt/trinity/share/apps/kwin/pics/pinup.png -debian/tmp/opt/trinity/share/apps/kwin/pics/unknown.png -debian/tmp/opt/trinity/share/apps/kwin/plastik.desktop -debian/tmp/opt/trinity/share/apps/kwin/quartz.desktop -debian/tmp/opt/trinity/share/apps/kwin/redmond.desktop -debian/tmp/opt/trinity/share/apps/kwin/web.desktop -debian/tmp/opt/trinity/share/config.kcfg/kwin.kcfg +debian/tmp/opt/trinity/share/apps/twin/b2.desktop +debian/tmp/opt/trinity/share/apps/twin/eventsrc +debian/tmp/opt/trinity/share/apps/twin/keramik.desktop +debian/tmp/opt/trinity/share/apps/twin/laptop.desktop +debian/tmp/opt/trinity/share/apps/twin/modernsystem.desktop +debian/tmp/opt/trinity/share/apps/twin/pics/bluesun.png +debian/tmp/opt/trinity/share/apps/twin/pics/close.png +debian/tmp/opt/trinity/share/apps/twin/pics/fog-grey.png +debian/tmp/opt/trinity/share/apps/twin/pics/fog.png +debian/tmp/opt/trinity/share/apps/twin/pics/greenie.dim.png +debian/tmp/opt/trinity/share/apps/twin/pics/greenie.light.png +debian/tmp/opt/trinity/share/apps/twin/pics/iconify.png +debian/tmp/opt/trinity/share/apps/twin/pics/maximizedown.png +debian/tmp/opt/trinity/share/apps/twin/pics/maximize.png +debian/tmp/opt/trinity/share/apps/twin/pics/menu.png +debian/tmp/opt/trinity/share/apps/twin/pics/pindown.png +debian/tmp/opt/trinity/share/apps/twin/pics/pinup.png +debian/tmp/opt/trinity/share/apps/twin/pics/unknown.png +debian/tmp/opt/trinity/share/apps/twin/plastik.desktop +debian/tmp/opt/trinity/share/apps/twin/quartz.desktop +debian/tmp/opt/trinity/share/apps/twin/redmond.desktop +debian/tmp/opt/trinity/share/apps/twin/web.desktop +debian/tmp/opt/trinity/share/config.kcfg/twin.kcfg debian/tmp/opt/trinity/share/doc/kde/HTML/en/kompmgr/common debian/tmp/opt/trinity/share/doc/kde/HTML/en/kompmgr/index.cache.bz2 debian/tmp/opt/trinity/share/doc/kde/HTML/en/kompmgr/index.docbook -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kwin.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kwin.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kwin.png -debian/tmp/opt/trinity/share/apps/kwin/default_rules/* +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/twin.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/twin.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/twin.png +debian/tmp/opt/trinity/share/apps/twin/default_rules/* diff --git a/ubuntu/maverick/tdebase/debian/kwin-trinity.lintian b/ubuntu/maverick/tdebase/debian/kwin-trinity.lintian index ab81fccc0..b6272e484 100644 --- a/ubuntu/maverick/tdebase/debian/kwin-trinity.lintian +++ b/ubuntu/maverick/tdebase/debian/kwin-trinity.lintian @@ -1,2 +1,2 @@ -kwin: shlib-missing-in-control-file libtdeinit_kwin.so usr/lib/libtdeinit_kwin.so -kwin: shlib-missing-in-control-file libtdeinit_kwin_rules_dialog.so usr/lib/libtdeinit_kwin_rules_dialog.so +twin: shlib-missing-in-control-file libtdeinit_twin.so usr/lib/libtdeinit_twin.so +twin: shlib-missing-in-control-file libtdeinit_twin_rules_dialog.so usr/lib/libtdeinit_twin_rules_dialog.so diff --git a/ubuntu/maverick/tdebase/debian/kwin-trinity.postinst b/ubuntu/maverick/tdebase/debian/kwin-trinity.postinst index 4c2228326..b8273333f 100644 --- a/ubuntu/maverick/tdebase/debian/kwin-trinity.postinst +++ b/ubuntu/maverick/tdebase/debian/kwin-trinity.postinst @@ -19,7 +19,7 @@ set -e case "$1" in configure) - update-alternatives --install /usr/bin/x-window-manager x-window-manager /opt/trinity/bin/kwin 50 + update-alternatives --install /usr/bin/x-window-manager x-window-manager /opt/trinity/bin/twin 50 ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/ubuntu/maverick/tdebase/debian/kwin-trinity.prerm b/ubuntu/maverick/tdebase/debian/kwin-trinity.prerm index fef049114..67c4b2507 100644 --- a/ubuntu/maverick/tdebase/debian/kwin-trinity.prerm +++ b/ubuntu/maverick/tdebase/debian/kwin-trinity.prerm @@ -19,7 +19,7 @@ set -e case "$1" in remove) - /usr/sbin/update-alternatives --remove x-window-manager /usr/trinity/bin/kwin + /usr/sbin/update-alternatives --remove x-window-manager /usr/trinity/bin/twin ;; upgrade|deconfigure) diff --git a/ubuntu/maverick/tdebase/debian/man/startkde-trinity.1 b/ubuntu/maverick/tdebase/debian/man/starttde-trinity.1 index f26b7f128..76c31c9ba 100644 --- a/ubuntu/maverick/tdebase/debian/man/startkde-trinity.1 +++ b/ubuntu/maverick/tdebase/debian/man/starttde-trinity.1 @@ -1,26 +1,26 @@ -.TH startkde 1 "Jan 17, 2005" +.TH starttde 1 "Jan 17, 2005" .SH NAME -startkde \- Starts up the KDE Desktop Environment +starttde \- Starts up the KDE Desktop Environment .SH SYNOPSIS -.B startkde +.B starttde .br .SH DESCRIPTION This manual page documents briefly the -.B startkde +.B starttde command. This manual page was written for the Debian distribution because the original program does not have a manual page. .PP -The \fBstartkde\fP script starts up the K Desktop Environment and +The \fBstarttde\fP script starts up the K Desktop Environment and is typically executed by your login manager (e.g. xdm, gdm, kdm, wdm or from -your X startup scripts). \fBstartkde\fP in turn launches ksmserver, which +your X startup scripts). \fBstarttde\fP in turn launches ksmserver, which will load your last session, or a default session that includes the standard KDE programs if no saved session is available. -\fBstartkde\fP, with ksmserver, is a standard X11R6 session manager that can manage +\fBstarttde\fP, with ksmserver, is a standard X11R6 session manager that can manage any X11R6 SM compliant program. -\fBstartkde\fP and ksmserver use the contents of the ~/.kde directory +\fBstarttde\fP and ksmserver use the contents of the ~/.kde directory for starting previously saved sessions. Source scripts found in ~/.kde/env/*.sh can be used to define environment variables that will be available to all KDE programs. @@ -32,15 +32,15 @@ At the end of a session, the scripts found in ~/.kde/shutdown will be executed. .SH OPTIONS -\fBstartkde\fP takes no command line options. +\fBstarttde\fP takes no command line options. .SH AUTHOR -\fBstartkde\fP is written by the KDE Project. +\fBstarttde\fP is written by the KDE Project. This manual page was written by Philipp Grau. .SH "REPORTING BUGS" -Report bugs of this modified Debian version of startkde to the Bug +Report bugs of this modified Debian version of starttde to the Bug Tracking System at: http://bugs.debian.org .SH COPYRIGHT Copyright \(co 2005 Philipp Grau. diff --git a/ubuntu/maverick/tdebase/debian/patches/disable_startkde_wallpaper.diff b/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff index 838bbec11..0eebed280 100644 --- a/ubuntu/maverick/tdebase/debian/patches/disable_startkde_wallpaper.diff +++ b/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff @@ -1,5 +1,5 @@ ---- startkde -+++ startkde +--- starttde ++++ starttde @@ -184,17 +184,17 @@ . $kdehome/share/config/startupconfig fi diff --git a/ubuntu/maverick/tdebase/debian/rules b/ubuntu/maverick/tdebase/debian/rules index da70cfb66..5fcea6ca0 100755 --- a/ubuntu/maverick/tdebase/debian/rules +++ b/ubuntu/maverick/tdebase/debian/rules @@ -36,7 +36,7 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdebase-trinity-dbg DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter tdesu knetattach kioslave kxkb kdebugdialog kdcop PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \ - ksysguard-trinity kwin-trinity libkonq4-trinity + ksysguard-trinity twin-trinity libkonq4-trinity DEB_DH_MAKESHLIBS_ARGS_kate-trinity := -V'kate-trinity (>= 4:3.5.8-1)' DEB_DH_MAKESHLIBS_ARGS_kcontrol-trinity := -V'kcontrol-trinity (>= 4:3.5.8-1)' @@ -45,7 +45,7 @@ DEB_DH_MAKESHLIBS_ARGS_kicker-trinity := -V'kicker-trinity (>= 4:3.5.8-1)' DEB_DH_MAKESHLIBS_ARGS_konqueror-trinity := -V'konqueror-trinity (>= 4:3.5.8-1)' DEB_DH_MAKESHLIBS_ARGS_ksplash-trinity := -V'ksplash-trinity (>= 4:3.5.8-1)' DEB_DH_MAKESHLIBS_ARGS_ksysguard-trinity := -V'ksysguard-trinity (>= 4:3.5.8-1)' -DEB_DH_MAKESHLIBS_ARGS_kwin-trinity := -V'kwin-trinity (>= 4:3.5.8-1)' +DEB_DH_MAKESHLIBS_ARGS_twin-trinity := -V'twin-trinity (>= 4:3.5.8-1)' DEB_DH_MAKESHLIBS_ARGS_libkonq4-trinity := -V'libkonq4-trinity (>= 4:3.5.8-1)' #shlibs_ver = 4:3.5.0-1 diff --git a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install index 843b55228..68d02cf06 100644 --- a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install +++ b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install @@ -227,9 +227,9 @@ debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/khtml/common debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/khtml/index.cache.bz2 debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/khtml/index.docbook debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/khtml/nsplugin.docbook -debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kwindecoration/common -debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kwindecoration/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kwindecoration/index.docbook +debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/twindecoration/common +debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/twindecoration/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/twindecoration/index.docbook debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/language/common debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/language/index.cache.bz2 debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/language/index.docbook diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-dev.install b/ubuntu/maverick/tdebase/debian/tdebase-trinity-dev.install index 4328f203e..80fe5d689 100644 --- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-dev.install +++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-dev.install @@ -32,11 +32,11 @@ debian/tmp/opt/trinity/include//ksgrd/StyleSettings.h debian/tmp/opt/trinity/include//ksgrd/TimerSettings.h debian/tmp/opt/trinity/include//ksplash/objkstheme.h debian/tmp/opt/trinity/include//ksplash/themeengine.h -debian/tmp/opt/trinity/include//kwin/client.h +debian/tmp/opt/trinity/include//twin/client.h debian/tmp/opt/trinity/include//KWinInterface.h -debian/tmp/opt/trinity/include//kwin/kwinbutton.h -debian/tmp/opt/trinity/include//kwin/options.h -debian/tmp/opt/trinity/include//kwin/workspace.h +debian/tmp/opt/trinity/include//twin/twinbutton.h +debian/tmp/opt/trinity/include//twin/options.h +debian/tmp/opt/trinity/include//twin/workspace.h debian/tmp/opt/trinity/lib/libkasbar.la debian/tmp/opt/trinity/lib/libkasbar.so debian/tmp/opt/trinity/lib/libkateinterfaces.la @@ -65,8 +65,8 @@ debian/tmp/opt/trinity/lib/libtdeinit_konqueror.la debian/tmp/opt/trinity/lib/libtdeinit_konsole.la debian/tmp/opt/trinity/lib/libtdeinit_kprinter.la debian/tmp/opt/trinity/lib/libtdeinit_ksmserver.la -debian/tmp/opt/trinity/lib/libtdeinit_kwin.la -debian/tmp/opt/trinity/lib/libtdeinit_kwin_rules_dialog.la +debian/tmp/opt/trinity/lib/libtdeinit_twin.la +debian/tmp/opt/trinity/lib/libtdeinit_twin_rules_dialog.la debian/tmp/opt/trinity/lib/libtdeinit_kwrite.la debian/tmp/opt/trinity/lib/libtdeinit_kxkb.la debian/tmp/opt/trinity/lib/libkfontinst.la |