diff options
102 files changed, 598 insertions, 598 deletions
diff --git a/debian/lenny/applications/twin-style-crystal/debian/dirs b/debian/lenny/applications/twin-style-crystal/debian/dirs index af39e99b5..93234e6f8 100644 --- a/debian/lenny/applications/twin-style-crystal/debian/dirs +++ b/debian/lenny/applications/twin-style-crystal/debian/dirs @@ -1,2 +1,2 @@ usr/trinity/lib/trinity -usr/share/apps/kwin +usr/share/apps/twin diff --git a/debian/lenny/tdeartwork/debian/changelog b/debian/lenny/tdeartwork/debian/changelog index f0bfe7054..a3043310e 100644 --- a/debian/lenny/tdeartwork/debian/changelog +++ b/debian/lenny/tdeartwork/debian/changelog @@ -486,10 +486,10 @@ tdeartwork (4:3.2.3-1) unstable; urgency=low * Rebuilt against STL-enabled Qt and corresponding tdelibs (closes: #254021). * Patched the autoconf tests for kxsconfig so that xscreensaver configuration works again (closes: #238180, #243150). - * Suggests (kwin | x-window-manager) for kdewallpapers instead of just + * Suggests (twin | x-window-manager) for kdewallpapers instead of just x-window-manager. - * Removed recommends: kwin from tdeartwork-theme-window since this is - already coming in as a depends from the kwin shlibs file. + * Removed recommends: twin from tdeartwork-theme-window since this is + already coming in as a depends from the twin shlibs file. -- Ben Burton <bab@debian.org> Tue, 15 Jun 2004 08:38:18 +1000 diff --git a/debian/lenny/tdeartwork/debian/control b/debian/lenny/tdeartwork/debian/control index 0bda1ed09..a4bb8764b 100644 --- a/debian/lenny/tdeartwork/debian/control +++ b/debian/lenny/tdeartwork/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-trinity-dev, gawk, gettext, sharutils, tdebase-trinity-dev, kwin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-trinity-dev, gawk, gettext, sharutils, tdebase-trinity-dev, twin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev Build-Conflicts: autoconf2.13, nvidia-glx Standards-Version: 3.8.4 @@ -89,7 +89,7 @@ Description: window decoration themes released with Trinity Package: kdewallpapers-trinity Architecture: all Section: kde -Suggests: kwin-trinity | x-window-manager +Suggests: twin-trinity | x-window-manager Replaces: tdebase-data-trinity (<< 4:3.5) Description: wallpapers released with Trinity This package contains additional wallpapers for Trinity. Wallpapers can be @@ -102,7 +102,7 @@ Package: kscreensaver-trinity Architecture: any Section: kde Depends: ${shlibs:Depends}, tdebase-trinity-bin -Recommends: kwin-trinity, kscreensaver-xsavers-trinity (= ${Source-Version}) +Recommends: twin-trinity, kscreensaver-xsavers-trinity (= ${Source-Version}) Description: additional screen savers released with Trinity This package contains the screen savers for Trinity. They can be tested and selected within the Appearance and Themes section of the Trinity Control @@ -119,7 +119,7 @@ Package: kscreensaver-xsavers-trinity Architecture: any Section: kde Depends: ${shlibs:Depends}, tdebase-trinity-bin, xscreensaver-data -Recommends: kwin-trinity, kscreensaver-trinity (= ${Source-Version}), xscreensaver-gl +Recommends: twin-trinity, kscreensaver-trinity (= ${Source-Version}), xscreensaver-gl Suggests: kscreensaver-xsavers-webcollage-trinity Description: Trinity hooks for standard xscreensavers This package allows a smooth integration of the standard xscreensavers @@ -163,7 +163,7 @@ Package: kscreensaver-xsavers-extra-trinity Architecture: all Section: kde Depends: ${shlibs:Depends}, kscreensaver-xsavers-trinity, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies -Recommends: kwin-trinity, kscreensaver-trinity (= ${Source-Version}) +Recommends: twin-trinity, kscreensaver-trinity (= ${Source-Version}) Description: Trinity hooks for standard xscreensavers This package allows a smooth integration of the universe xscreensavers into Trinity. With this package installed you can select and/or configure diff --git a/debian/lenny/tdeartwork/debian/control.in b/debian/lenny/tdeartwork/debian/control.in index e2d1102a3..8979d776d 100644 --- a/debian/lenny/tdeartwork/debian/control.in +++ b/debian/lenny/tdeartwork/debian/control.in @@ -4,7 +4,7 @@ Priority: optional Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com> XSBC-Original-Maintainer: @@@MAINTAINER@@@ Uploaders: @@@UPLOADERS@@@ -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-dev (>= 4:3.5.7), gawk, gettext, sharutils, tdebase-dev (>= 4:3.5.7), kwin, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl +Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-dev (>= 4:3.5.7), gawk, gettext, sharutils, tdebase-dev (>= 4:3.5.7), twin, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl Build-Conflicts: autoconf2.13, nvidia-glx Standards-Version: 3.7.2 @@ -89,7 +89,7 @@ Description: window decoration themes released with KDE Package: kdewallpapers Architecture: all Section: kde -Suggests: kwin | x-window-manager +Suggests: twin | x-window-manager Replaces: tdebase-data (<< 4:3.5) Description: wallpapers released with KDE This package contains additional wallpapers for KDE. Wallpapers can be @@ -102,7 +102,7 @@ Package: kscreensaver Architecture: any Section: kde Depends: ${shlibs:Depends}, tdebase-bin -Recommends: kwin, kscreensaver-xsavers (= ${Source-Version}) +Recommends: twin, kscreensaver-xsavers (= ${Source-Version}) Description: additional screen savers released with KDE This package contains the screen savers for KDE. They can be tested and selected within the Appearance and Themes section of the KDE Control @@ -119,7 +119,7 @@ Package: kscreensaver-xsavers Architecture: any Section: kde Depends: ${shlibs:Depends}, tdebase-bin, xscreensaver -Recommends: kwin, kscreensaver (= ${Source-Version}), xscreensaver-gl +Recommends: twin, kscreensaver (= ${Source-Version}), xscreensaver-gl Suggests: kscreensaver-xsavers-webcollage Description: KDE hooks for standard xscreensavers This package allows a smooth integration of the standard xscreensavers diff --git a/debian/lenny/tdeartwork/debian/copyright b/debian/lenny/tdeartwork/debian/copyright index f98e0b7f5..dbdd37868 100644 --- a/debian/lenny/tdeartwork/debian/copyright +++ b/debian/lenny/tdeartwork/debian/copyright @@ -139,7 +139,7 @@ Copyright: OpenLook window decoration theme: - 'OpenLook' kwin client + 'OpenLook' twin client Porting to trinity.2 API Copyright 2003 Luciano Montanaro <mikelima@cirulla.net> diff --git a/debian/lenny/tdeartwork/debian/tdeartwork-theme-window-trinity.install b/debian/lenny/tdeartwork/debian/tdeartwork-theme-window-trinity.install index 7f688e236..b36062a5c 100644 --- a/debian/lenny/tdeartwork/debian/tdeartwork-theme-window-trinity.install +++ b/debian/lenny/tdeartwork/debian/tdeartwork-theme-window-trinity.install @@ -1,2 +1,2 @@ -debian/tmp/opt/trinity/lib/trinity/kwin* -debian/tmp/opt/trinity/share/apps/kwin +debian/tmp/opt/trinity/lib/trinity/twin* +debian/tmp/opt/trinity/share/apps/twin diff --git a/debian/lenny/tdebase/debian/changelog b/debian/lenny/tdebase/debian/changelog index b991c3875..f015b7298 100644 --- a/debian/lenny/tdebase/debian/changelog +++ b/debian/lenny/tdebase/debian/changelog @@ -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: @@ -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 @@ -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 @@ -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) @@ -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 @@ -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 diff --git a/debian/lenny/tdebase/debian/control b/debian/lenny/tdebase/debian/control index 802953a5f..041c6e22b 100644 --- a/debian/lenny/tdebase/debian/control +++ b/debian/lenny/tdebase/debian/control @@ -12,7 +12,7 @@ Standards-Version: 3.8.4 Package: tdebase-trinity Section: kde Architecture: all -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 @@ -117,7 +117,7 @@ Description: core binaries for the KDE base module Package: tdebase-data-trinity Section: kde Architecture: all -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) Replaces: tdebase-trinity (<< 4:3.0.0), tdeedu-data-trinity (<< 4:3.4.0), tdelibs-data-trinity (<< 4:3.3.0), kdewallpapers-trinity (<< 4:3.0.0), kcontrol-trinity (<< 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 @@ -129,7 +129,7 @@ Description: shared data files for the KDE base module Package: tdebase-trinity-dev Section: devel Architecture: any -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) Replaces: kate-trinity (<< 4:3.0.0), tdebase-trinity (<< 4:3.0.0), konqueror-trinity (<< 4:3.0.0) Description: development files for the KDE base module This package contains headers and other development files needed to @@ -429,7 +429,7 @@ Package: ksmserver-trinity Section: kde Architecture: any 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}) Replaces: tdebase-trinity (<< 4:3.0.0) Description: session manager for KDE @@ -497,7 +497,7 @@ 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 Depends: ${shlibs:Depends} diff --git a/debian/lenny/tdebase/debian/control.in b/debian/lenny/tdebase/debian/control.in index 107c75b66..8073d0665 100644 --- a/debian/lenny/tdebase/debian/control.in +++ b/debian/lenny/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,7 +421,7 @@ 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 @@ -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/debian/lenny/tdebase/debian/copyright b/debian/lenny/tdebase/debian/copyright index a17edd5c2..3d683d411 100644 --- a/debian/lenny/tdebase/debian/copyright +++ b/debian/lenny/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/debian/lenny/tdebase/debian/kwin-trinity.install b/debian/lenny/tdebase/debian/kwin-trinity.install index a6fde0638..62d42f166 100644 --- a/debian/lenny/tdebase/debian/kwin-trinity.install +++ b/debian/lenny/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/debian/lenny/tdebase/debian/kwin-trinity.lintian b/debian/lenny/tdebase/debian/kwin-trinity.lintian index ab81fccc0..b6272e484 100644 --- a/debian/lenny/tdebase/debian/kwin-trinity.lintian +++ b/debian/lenny/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/debian/lenny/tdebase/debian/kwin-trinity.postinst b/debian/lenny/tdebase/debian/kwin-trinity.postinst index 4c2228326..b8273333f 100644 --- a/debian/lenny/tdebase/debian/kwin-trinity.postinst +++ b/debian/lenny/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/debian/lenny/tdebase/debian/kwin-trinity.prerm b/debian/lenny/tdebase/debian/kwin-trinity.prerm index fef049114..67c4b2507 100644 --- a/debian/lenny/tdebase/debian/kwin-trinity.prerm +++ b/debian/lenny/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/debian/lenny/tdebase/debian/rules b/debian/lenny/tdebase/debian/rules index 20a5315f2..c0c81d698 100755 --- a/debian/lenny/tdebase/debian/rules +++ b/debian/lenny/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/debian/lenny/tdebase/debian/tdebase-data-trinity.install b/debian/lenny/tdebase/debian/tdebase-data-trinity.install index 843b55228..68d02cf06 100644 --- a/debian/lenny/tdebase/debian/tdebase-data-trinity.install +++ b/debian/lenny/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/debian/lenny/tdebase/debian/tdebase-trinity-dev.install b/debian/lenny/tdebase/debian/tdebase-trinity-dev.install index 4328f203e..80fe5d689 100644 --- a/debian/lenny/tdebase/debian/tdebase-trinity-dev.install +++ b/debian/lenny/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 diff --git a/debian/lenny/tdegames/debian/changelog b/debian/lenny/tdegames/debian/changelog index 4a2687c2a..17e0e836e 100644 --- a/debian/lenny/tdegames/debian/changelog +++ b/debian/lenny/tdegames/debian/changelog @@ -610,7 +610,7 @@ tdegames (4:3.1.0-1) unstable; urgency=low * Remove cruft no longer necessary when upgrading from Woody or later, as well as obsolete Depends and Enhances on tdebase. * Downgrade gnubg to suggests of kbackgammon. - * Wrote short manual pages for kwin4proc and lskatproc, simply + * Wrote short manual pages for twin4proc and lskatproc, simply telling users not to run them directly. * Change policy to 3.5.8 (no changes needed). diff --git a/debian/lenny/tdegames/debian/control b/debian/lenny/tdegames/debian/control index 14b00bd48..891c3b211 100644 --- a/debian/lenny/tdegames/debian/control +++ b/debian/lenny/tdegames/debian/control @@ -11,7 +11,7 @@ Standards-Version: 3.8.4 Package: tdegames-trinity Architecture: all Section: kde -Depends: atlantik-trinity (>= ${Source-Version}), kasteroids-trinity (>= ${Source-Version}), katomic-trinity (>= ${Source-Version}), kbackgammon-trinity (>= ${Source-Version}), kbattleship-trinity (>= ${Source-Version}), kblackbox-trinity (>= ${Source-Version}), kbounce-trinity (>= ${Source-Version}), kenolaba-trinity (>= ${Source-Version}), kfouleggs-trinity (>= ${Source-Version}), kgoldrunner-trinity (>= ${Source-Version}), kjumpingcube-trinity (>= ${Source-Version}), klickety-trinity (>= ${Source-Version}), klines-trinity (>= ${Source-Version}), kmahjongg-trinity (>= ${Source-Version}), kmines-trinity (>= ${Source-Version}), knetwalk-trinity (>= ${Source-Version}), kolf-trinity (>= ${Source-Version}), konquest-trinity (>= ${Source-Version}), kpat-trinity (>= ${Source-Version}), kpoker-trinity (>= ${Source-Version}), kreversi-trinity (>= ${Source-Version}), ksame-trinity (>= ${Source-Version}), kshisen-trinity (>= ${Source-Version}), ksirtet-trinity (>= ${Source-Version}), ksmiletris-trinity (>= ${Source-Version}), ksnake-trinity (>= ${Source-Version}), ksokoban-trinity (>= ${Source-Version}), kspaceduel-trinity (>= ${Source-Version}), ktron-trinity (>= ${Source-Version}), ktuberling-trinity (>= ${Source-Version}), kwin4-trinity (>= ${Source-Version}), lskat-trinity (>= ${Source-Version}) +Depends: atlantik-trinity (>= ${Source-Version}), kasteroids-trinity (>= ${Source-Version}), katomic-trinity (>= ${Source-Version}), kbackgammon-trinity (>= ${Source-Version}), kbattleship-trinity (>= ${Source-Version}), kblackbox-trinity (>= ${Source-Version}), kbounce-trinity (>= ${Source-Version}), kenolaba-trinity (>= ${Source-Version}), kfouleggs-trinity (>= ${Source-Version}), kgoldrunner-trinity (>= ${Source-Version}), kjumpingcube-trinity (>= ${Source-Version}), klickety-trinity (>= ${Source-Version}), klines-trinity (>= ${Source-Version}), kmahjongg-trinity (>= ${Source-Version}), kmines-trinity (>= ${Source-Version}), knetwalk-trinity (>= ${Source-Version}), kolf-trinity (>= ${Source-Version}), konquest-trinity (>= ${Source-Version}), kpat-trinity (>= ${Source-Version}), kpoker-trinity (>= ${Source-Version}), kreversi-trinity (>= ${Source-Version}), ksame-trinity (>= ${Source-Version}), kshisen-trinity (>= ${Source-Version}), ksirtet-trinity (>= ${Source-Version}), ksmiletris-trinity (>= ${Source-Version}), ksnake-trinity (>= ${Source-Version}), ksokoban-trinity (>= ${Source-Version}), kspaceduel-trinity (>= ${Source-Version}), ktron-trinity (>= ${Source-Version}), ktuberling-trinity (>= ${Source-Version}), twin4-trinity (>= ${Source-Version}), lskat-trinity (>= ${Source-Version}) Suggests: tdegames-trinity-doc-html (>= ${Source-Version}), khelpcenter-trinity Description: games from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -574,7 +574,7 @@ Description: Potato Guy for Trinity This package is part of Trinity, and a component of the KDE games module. See the 'kde-trinity' and 'tdegames-trinity' packages for more information. -Package: kwin4-trinity +Package: twin4-trinity Architecture: any Section: games Depends: ${shlibs:Depends} diff --git a/debian/lenny/tdegames/debian/control.in b/debian/lenny/tdegames/debian/control.in index be2a79ba7..38f0737b9 100644 --- a/debian/lenny/tdegames/debian/control.in +++ b/debian/lenny/tdegames/debian/control.in @@ -11,7 +11,7 @@ Standards-Version: 3.7.2 Package: tdegames Architecture: all Section: kde -Depends: atlantik (>= ${Source-Version}), kasteroids (>= ${Source-Version}), katomic (>= ${Source-Version}), kbackgammon (>= ${Source-Version}), kbattleship (>= ${Source-Version}), kblackbox (>= ${Source-Version}), kbounce (>= ${Source-Version}), kenolaba (>= ${Source-Version}), kfouleggs (>= ${Source-Version}), kgoldrunner (>= ${Source-Version}), kjumpingcube (>= ${Source-Version}), klickety (>= ${Source-Version}), klines (>= ${Source-Version}), kmahjongg (>= ${Source-Version}), kmines (>= ${Source-Version}), knetwalk (>= ${Source-Version}), kolf (>= ${Source-Version}), konquest (>= ${Source-Version}), kpat (>= ${Source-Version}), kpoker (>= ${Source-Version}), kreversi (>= ${Source-Version}), ksame (>= ${Source-Version}), kshisen (>= ${Source-Version}), ksirtet (>= ${Source-Version}), ksmiletris (>= ${Source-Version}), ksnake (>= ${Source-Version}), ksokoban (>= ${Source-Version}), kspaceduel (>= ${Source-Version}), ktron (>= ${Source-Version}), ktuberling (>= ${Source-Version}), kwin4 (>= ${Source-Version}), lskat (>= ${Source-Version}) +Depends: atlantik (>= ${Source-Version}), kasteroids (>= ${Source-Version}), katomic (>= ${Source-Version}), kbackgammon (>= ${Source-Version}), kbattleship (>= ${Source-Version}), kblackbox (>= ${Source-Version}), kbounce (>= ${Source-Version}), kenolaba (>= ${Source-Version}), kfouleggs (>= ${Source-Version}), kgoldrunner (>= ${Source-Version}), kjumpingcube (>= ${Source-Version}), klickety (>= ${Source-Version}), klines (>= ${Source-Version}), kmahjongg (>= ${Source-Version}), kmines (>= ${Source-Version}), knetwalk (>= ${Source-Version}), kolf (>= ${Source-Version}), konquest (>= ${Source-Version}), kpat (>= ${Source-Version}), kpoker (>= ${Source-Version}), kreversi (>= ${Source-Version}), ksame (>= ${Source-Version}), kshisen (>= ${Source-Version}), ksirtet (>= ${Source-Version}), ksmiletris (>= ${Source-Version}), ksnake (>= ${Source-Version}), ksokoban (>= ${Source-Version}), kspaceduel (>= ${Source-Version}), ktron (>= ${Source-Version}), ktuberling (>= ${Source-Version}), twin4 (>= ${Source-Version}), lskat (>= ${Source-Version}) Suggests: tdegames-doc-html (>= ${Source-Version}) Description: games from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -574,7 +574,7 @@ Description: Potato Guy for KDE This package is part of KDE, and a component of the KDE games module. See the 'kde' and 'tdegames' packages for more information. -Package: kwin4 +Package: twin4 Architecture: any Section: games Depends: ${shlibs:Depends} diff --git a/debian/lenny/tdegames/debian/icons/kwin4-16.xpm b/debian/lenny/tdegames/debian/icons/kwin4-16.xpm index 2bad59cf8..fa15f0b8a 100644 --- a/debian/lenny/tdegames/debian/icons/kwin4-16.xpm +++ b/debian/lenny/tdegames/debian/icons/kwin4-16.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char *kwin4-16[] = { +static char *twin4-16[] = { /* columns rows colors chars-per-pixel */ "16 16 213 2", " c black", diff --git a/debian/lenny/tdegames/debian/icons/kwin4.xpm b/debian/lenny/tdegames/debian/icons/kwin4.xpm index 43b466224..9d752d62e 100644 --- a/debian/lenny/tdegames/debian/icons/kwin4.xpm +++ b/debian/lenny/tdegames/debian/icons/kwin4.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char *kwin4[] = { +static char *twin4[] = { /* columns rows colors chars-per-pixel */ "32 32 256 2", " c black", diff --git a/debian/lenny/tdegames/debian/kwin4-trinity.install b/debian/lenny/tdegames/debian/kwin4-trinity.install index f07634b26..143beeac9 100644 --- a/debian/lenny/tdegames/debian/kwin4-trinity.install +++ b/debian/lenny/tdegames/debian/kwin4-trinity.install @@ -1,14 +1,14 @@ -/opt/trinity/games/kwin4 -/opt/trinity/games/kwin4proc -/opt/trinity/share/apps/kwin4/* -/opt/trinity/share/config.kcfg/kwin4.kcfg -/opt/trinity/share/icons/hicolor/128x128/apps/kwin4.png -/opt/trinity/share/icons/hicolor/64x64/apps/kwin4.png -/opt/trinity/share/icons/hicolor/48x48/apps/kwin4.png -/opt/trinity/share/icons/hicolor/32x32/apps/kwin4.png -/opt/trinity/share/icons/hicolor/22x22/apps/kwin4.png -/opt/trinity/share/icons/hicolor/16x16/apps/kwin4.png -/opt/trinity/share/applications/kde/kwin4.desktop -/opt/trinity/share/doc/kde/HTML/en/kwin4/* -../icons/kwin4.xpm /opt/trinity/share/pixmaps -../icons/kwin4-16.xpm /opt/trinity/share/pixmaps +/opt/trinity/games/twin4 +/opt/trinity/games/twin4proc +/opt/trinity/share/apps/twin4/* +/opt/trinity/share/config.kcfg/twin4.kcfg +/opt/trinity/share/icons/hicolor/128x128/apps/twin4.png +/opt/trinity/share/icons/hicolor/64x64/apps/twin4.png +/opt/trinity/share/icons/hicolor/48x48/apps/twin4.png +/opt/trinity/share/icons/hicolor/32x32/apps/twin4.png +/opt/trinity/share/icons/hicolor/22x22/apps/twin4.png +/opt/trinity/share/icons/hicolor/16x16/apps/twin4.png +/opt/trinity/share/applications/kde/twin4.desktop +/opt/trinity/share/doc/kde/HTML/en/twin4/* +../icons/twin4.xpm /opt/trinity/share/pixmaps +../icons/twin4-16.xpm /opt/trinity/share/pixmaps diff --git a/debian/lenny/tdegames/debian/kwin4-trinity.links b/debian/lenny/tdegames/debian/kwin4-trinity.links index 37623f7af..1620ac717 100644 --- a/debian/lenny/tdegames/debian/kwin4-trinity.links +++ b/debian/lenny/tdegames/debian/kwin4-trinity.links @@ -1 +1 @@ -/opt/trinity/share/doc/kde/HTML/en/kwin4 /opt/trinity/share/doc/kwin4/html +/opt/trinity/share/doc/kde/HTML/en/twin4 /opt/trinity/share/doc/twin4/html diff --git a/debian/lenny/tdegames/debian/kwin4-trinity.manpages b/debian/lenny/tdegames/debian/kwin4-trinity.manpages index 610e1c8e9..5486638b1 100644 --- a/debian/lenny/tdegames/debian/kwin4-trinity.manpages +++ b/debian/lenny/tdegames/debian/kwin4-trinity.manpages @@ -1,2 +1,2 @@ -debian/man/out/kwin4-trinity.6 -debian/man/out/kwin4proc-trinity.6 +debian/man/out/twin4-trinity.6 +debian/man/out/twin4proc-trinity.6 diff --git a/debian/lenny/tdegames/debian/kwin4-trinity.menu b/debian/lenny/tdegames/debian/kwin4-trinity.menu index 0dc4d281f..cce23cd01 100644 --- a/debian/lenny/tdegames/debian/kwin4-trinity.menu +++ b/debian/lenny/tdegames/debian/kwin4-trinity.menu @@ -1,9 +1,9 @@ -?package(kwin4):\ +?package(twin4):\ needs="x11"\ section="Games/Board"\ hints="KDE"\ title="KWin4"\ - icon32x32="/usr/share/pixmaps/kwin4.xpm"\ - icon16x16="/usr/share/pixmaps/kwin4-16.xpm"\ - command="/opt/trinity/games/kwin4" + icon32x32="/usr/share/pixmaps/twin4.xpm"\ + icon16x16="/usr/share/pixmaps/twin4-16.xpm"\ + command="/opt/trinity/games/twin4" diff --git a/debian/lenny/tdegames/debian/man/kwin4-trinity.man b/debian/lenny/tdegames/debian/man/kwin4-trinity.man index f1e3a0def..2125170be 100644 --- a/debian/lenny/tdegames/debian/man/kwin4-trinity.man +++ b/debian/lenny/tdegames/debian/man/kwin4-trinity.man @@ -1,8 +1,8 @@ .TH KWIN4 6 .SH NAME -kwin4 \- Connect Four clone for KDE +twin4 \- Connect Four clone for KDE .SH SYNOPSIS -.B kwin4 +.B twin4 .I [Qt-options] [KDE-options] .SH DESCRIPTION Four wins is a game for two players. Each player is represented by a @@ -17,6 +17,6 @@ or diagonal or no more moves are possible because the board is filled. .so kdeopt.part .SH SEE ALSO More detailed user documentation is available from -.BR help:/kwin4 +.BR help:/twin4 (either enter this URL into \fBkonqueror\fP, or run `khelpcenter -help:/kwin4'). +help:/twin4'). diff --git a/debian/lenny/tdegames/debian/man/kwin4proc-trinity.man b/debian/lenny/tdegames/debian/man/kwin4proc-trinity.man index 3a8d08949..5b1856418 100644 --- a/debian/lenny/tdegames/debian/man/kwin4proc-trinity.man +++ b/debian/lenny/tdegames/debian/man/kwin4proc-trinity.man @@ -1,8 +1,8 @@ .TH KWIN4PROC 6 .SH NAME -kwin4proc \- AI backend for kwin4 +twin4proc \- AI backend for twin4 .SH DESCRIPTION -This program is used internally by kwin4. Users should not run it +This program is used internally by twin4. Users should not run it directly. .SH SEE ALSO -.BR kwin4 (6). +.BR twin4 (6). diff --git a/debian/lenny/tdegames/debian/tdegames-doc-html.doc-base.kwin4 b/debian/lenny/tdegames/debian/tdegames-doc-html.doc-base.kwin4 index 8e9d8c8f2..09f2f43f3 100644 --- a/debian/lenny/tdegames/debian/tdegames-doc-html.doc-base.kwin4 +++ b/debian/lenny/tdegames/debian/tdegames-doc-html.doc-base.kwin4 @@ -1,9 +1,9 @@ -Document: tdegames-doc-html-kwin4 +Document: tdegames-doc-html-twin4 Title: KWin4 Manual Author: Martin Heni Abstract: This documentation describes KWin4 version 1.0.0. Section: Games/Board Format: HTML -Index: /usr/share/doc/kde/HTML/en/kwin4/index.html -Files: /usr/share/doc/kde/HTML/en/kwin4/*.html +Index: /usr/share/doc/kde/HTML/en/twin4/index.html +Files: /usr/share/doc/kde/HTML/en/twin4/*.html diff --git a/debian/lenny/tdelibs/debian/man/dcop-trinity.sgml b/debian/lenny/tdelibs/debian/man/dcop-trinity.sgml index 0c80c88a1..7c4342c05 100644 --- a/debian/lenny/tdelibs/debian/man/dcop-trinity.sgml +++ b/debian/lenny/tdelibs/debian/man/dcop-trinity.sgml @@ -141,14 +141,14 @@ manpage.1: manpage.sgml <para><example> <title>Return number of the current desktop, e.g. 2</title> <blockquote><literallayout> -dcop kwin KWinInterface currentDesktop +dcop twin KWinInterface currentDesktop </literallayout></blockquote> </example></para> <para><example> <title>Jump to the next dektop</title> <blockquote><literallayout> -dcop kwin KWinInterface nextDesktop +dcop twin KWinInterface nextDesktop </literallayout></blockquote> </example></para> diff --git a/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install index 76fea81be..eeb111f96 100644 --- a/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install +++ b/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install @@ -668,10 +668,10 @@ debian/tmp/opt/trinity/include/kuserprofile.h debian/tmp/opt/trinity/include/kvmallocator.h debian/tmp/opt/trinity/include/kwallet.h debian/tmp/opt/trinity/include/kwallettypes.h -debian/tmp/opt/trinity/include/kwindowinfo.h -debian/tmp/opt/trinity/include/kwindowlistmenu.h -debian/tmp/opt/trinity/include/kwin.h -debian/tmp/opt/trinity/include/kwinmodule.h +debian/tmp/opt/trinity/include/twindowinfo.h +debian/tmp/opt/trinity/include/twindowlistmenu.h +debian/tmp/opt/trinity/include/twin.h +debian/tmp/opt/trinity/include/twinmodule.h debian/tmp/opt/trinity/include/kwizard.h debian/tmp/opt/trinity/include/kwordwrap.h debian/tmp/opt/trinity/include/kxerrorhandler.h diff --git a/debian/lenny/tdetoys/debian/changelog b/debian/lenny/tdetoys/debian/changelog index 8db640fcb..5406c86c9 100644 --- a/debian/lenny/tdetoys/debian/changelog +++ b/debian/lenny/tdetoys/debian/changelog @@ -511,7 +511,7 @@ tdetoys (4:3.1.4-3) unstable; urgency=low tdetoys (4:3.1.4-2) unstable; urgency=low * Updated amor description and man page to note that it works with window - managers other than kwin (closes: #213488). + managers other than twin (closes: #213488). -- Ben Burton <bab@debian.org> Mon, 13 Oct 2003 00:55:42 +1000 diff --git a/debian/lenny/tdetoys/debian/control b/debian/lenny/tdetoys/debian/control index c1393037d..d6abe3fcc 100644 --- a/debian/lenny/tdetoys/debian/control +++ b/debian/lenny/tdetoys/debian/control @@ -44,7 +44,7 @@ Package: amor-trinity Architecture: any Section: games Depends: ${shlibs:Depends} -Recommends: kwin-trinity +Recommends: twin-trinity Suggests: khelpcenter-trinity Conflicts: task-tdetoys-trinity Replaces: tdetoys-trinity (<< 4:3.0.1-0), task-tdetoys-trinity @@ -140,7 +140,7 @@ Package: ktux-trinity Architecture: any Section: kde Depends: ${shlibs:Depends} -Suggests: kwin-trinity +Suggests: twin-trinity Conflicts: task-tdetoys-trinity Replaces: tdetoys-trinity (<< 4:3.0.1-0), task-tdetoys-trinity Description: Tux screensaver for Trinity diff --git a/debian/lenny/tdetoys/debian/control.in b/debian/lenny/tdetoys/debian/control.in index 0540c794a..df8f74d5d 100644 --- a/debian/lenny/tdetoys/debian/control.in +++ b/debian/lenny/tdetoys/debian/control.in @@ -44,7 +44,7 @@ Package: amor Architecture: any Section: games Depends: ${shlibs:Depends} -Recommends: kwin +Recommends: twin Suggests: khelpcenter Conflicts: task-tdetoys Replaces: tdetoys (<< 4:3.0.1-0), task-tdetoys @@ -140,7 +140,7 @@ Package: ktux Architecture: any Section: kde Depends: ${shlibs:Depends} -Suggests: kwin +Suggests: twin Conflicts: task-tdetoys Replaces: tdetoys (<< 4:3.0.1-0), task-tdetoys Description: Tux screensaver for KDE diff --git a/debian/squeeze/applications/twin-style-crystal/debian/dirs b/debian/squeeze/applications/twin-style-crystal/debian/dirs index af39e99b5..93234e6f8 100644 --- a/debian/squeeze/applications/twin-style-crystal/debian/dirs +++ b/debian/squeeze/applications/twin-style-crystal/debian/dirs @@ -1,2 +1,2 @@ usr/trinity/lib/trinity -usr/share/apps/kwin +usr/share/apps/twin diff --git a/debian/squeeze/tdeartwork/debian/changelog b/debian/squeeze/tdeartwork/debian/changelog index f0bfe7054..a3043310e 100644 --- a/debian/squeeze/tdeartwork/debian/changelog +++ b/debian/squeeze/tdeartwork/debian/changelog @@ -486,10 +486,10 @@ tdeartwork (4:3.2.3-1) unstable; urgency=low * Rebuilt against STL-enabled Qt and corresponding tdelibs (closes: #254021). * Patched the autoconf tests for kxsconfig so that xscreensaver configuration works again (closes: #238180, #243150). - * Suggests (kwin | x-window-manager) for kdewallpapers instead of just + * Suggests (twin | x-window-manager) for kdewallpapers instead of just x-window-manager. - * Removed recommends: kwin from tdeartwork-theme-window since this is - already coming in as a depends from the kwin shlibs file. + * Removed recommends: twin from tdeartwork-theme-window since this is + already coming in as a depends from the twin shlibs file. -- Ben Burton <bab@debian.org> Tue, 15 Jun 2004 08:38:18 +1000 diff --git a/debian/squeeze/tdeartwork/debian/control b/debian/squeeze/tdeartwork/debian/control index 0bda1ed09..a4bb8764b 100644 --- a/debian/squeeze/tdeartwork/debian/control +++ b/debian/squeeze/tdeartwork/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-trinity-dev, gawk, gettext, sharutils, tdebase-trinity-dev, kwin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-trinity-dev, gawk, gettext, sharutils, tdebase-trinity-dev, twin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev Build-Conflicts: autoconf2.13, nvidia-glx Standards-Version: 3.8.4 @@ -89,7 +89,7 @@ Description: window decoration themes released with Trinity Package: kdewallpapers-trinity Architecture: all Section: kde -Suggests: kwin-trinity | x-window-manager +Suggests: twin-trinity | x-window-manager Replaces: tdebase-data-trinity (<< 4:3.5) Description: wallpapers released with Trinity This package contains additional wallpapers for Trinity. Wallpapers can be @@ -102,7 +102,7 @@ Package: kscreensaver-trinity Architecture: any Section: kde Depends: ${shlibs:Depends}, tdebase-trinity-bin -Recommends: kwin-trinity, kscreensaver-xsavers-trinity (= ${Source-Version}) +Recommends: twin-trinity, kscreensaver-xsavers-trinity (= ${Source-Version}) Description: additional screen savers released with Trinity This package contains the screen savers for Trinity. They can be tested and selected within the Appearance and Themes section of the Trinity Control @@ -119,7 +119,7 @@ Package: kscreensaver-xsavers-trinity Architecture: any Section: kde Depends: ${shlibs:Depends}, tdebase-trinity-bin, xscreensaver-data -Recommends: kwin-trinity, kscreensaver-trinity (= ${Source-Version}), xscreensaver-gl +Recommends: twin-trinity, kscreensaver-trinity (= ${Source-Version}), xscreensaver-gl Suggests: kscreensaver-xsavers-webcollage-trinity Description: Trinity hooks for standard xscreensavers This package allows a smooth integration of the standard xscreensavers @@ -163,7 +163,7 @@ Package: kscreensaver-xsavers-extra-trinity Architecture: all Section: kde Depends: ${shlibs:Depends}, kscreensaver-xsavers-trinity, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies -Recommends: kwin-trinity, kscreensaver-trinity (= ${Source-Version}) +Recommends: twin-trinity, kscreensaver-trinity (= ${Source-Version}) Description: Trinity hooks for standard xscreensavers This package allows a smooth integration of the universe xscreensavers into Trinity. With this package installed you can select and/or configure diff --git a/debian/squeeze/tdeartwork/debian/control.in b/debian/squeeze/tdeartwork/debian/control.in index e2d1102a3..8979d776d 100644 --- a/debian/squeeze/tdeartwork/debian/control.in +++ b/debian/squeeze/tdeartwork/debian/control.in @@ -4,7 +4,7 @@ Priority: optional Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com> XSBC-Original-Maintainer: @@@MAINTAINER@@@ Uploaders: @@@UPLOADERS@@@ -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-dev (>= 4:3.5.7), gawk, gettext, sharutils, tdebase-dev (>= 4:3.5.7), kwin, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl +Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-dev (>= 4:3.5.7), gawk, gettext, sharutils, tdebase-dev (>= 4:3.5.7), twin, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl Build-Conflicts: autoconf2.13, nvidia-glx Standards-Version: 3.7.2 @@ -89,7 +89,7 @@ Description: window decoration themes released with KDE Package: kdewallpapers Architecture: all Section: kde -Suggests: kwin | x-window-manager +Suggests: twin | x-window-manager Replaces: tdebase-data (<< 4:3.5) Description: wallpapers released with KDE This package contains additional wallpapers for KDE. Wallpapers can be @@ -102,7 +102,7 @@ Package: kscreensaver Architecture: any Section: kde Depends: ${shlibs:Depends}, tdebase-bin -Recommends: kwin, kscreensaver-xsavers (= ${Source-Version}) +Recommends: twin, kscreensaver-xsavers (= ${Source-Version}) Description: additional screen savers released with KDE This package contains the screen savers for KDE. They can be tested and selected within the Appearance and Themes section of the KDE Control @@ -119,7 +119,7 @@ Package: kscreensaver-xsavers Architecture: any Section: kde Depends: ${shlibs:Depends}, tdebase-bin, xscreensaver -Recommends: kwin, kscreensaver (= ${Source-Version}), xscreensaver-gl +Recommends: twin, kscreensaver (= ${Source-Version}), xscreensaver-gl Suggests: kscreensaver-xsavers-webcollage Description: KDE hooks for standard xscreensavers This package allows a smooth integration of the standard xscreensavers diff --git a/debian/squeeze/tdeartwork/debian/copyright b/debian/squeeze/tdeartwork/debian/copyright index f98e0b7f5..dbdd37868 100644 --- a/debian/squeeze/tdeartwork/debian/copyright +++ b/debian/squeeze/tdeartwork/debian/copyright @@ -139,7 +139,7 @@ Copyright: OpenLook window decoration theme: - 'OpenLook' kwin client + 'OpenLook' twin client Porting to trinity.2 API Copyright 2003 Luciano Montanaro <mikelima@cirulla.net> diff --git a/debian/squeeze/tdeartwork/debian/tdeartwork-theme-window-trinity.install b/debian/squeeze/tdeartwork/debian/tdeartwork-theme-window-trinity.install index 7f688e236..b36062a5c 100644 --- a/debian/squeeze/tdeartwork/debian/tdeartwork-theme-window-trinity.install +++ b/debian/squeeze/tdeartwork/debian/tdeartwork-theme-window-trinity.install @@ -1,2 +1,2 @@ -debian/tmp/opt/trinity/lib/trinity/kwin* -debian/tmp/opt/trinity/share/apps/kwin +debian/tmp/opt/trinity/lib/trinity/twin* +debian/tmp/opt/trinity/share/apps/twin diff --git a/debian/squeeze/tdebase/debian/changelog b/debian/squeeze/tdebase/debian/changelog index b991c3875..f015b7298 100644 --- a/debian/squeeze/tdebase/debian/changelog +++ b/debian/squeeze/tdebase/debian/changelog @@ -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: @@ -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 @@ -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 @@ -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) @@ -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 @@ -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 diff --git a/debian/squeeze/tdebase/debian/control b/debian/squeeze/tdebase/debian/control index dd8d15912..25be7033c 100644 --- a/debian/squeeze/tdebase/debian/control +++ b/debian/squeeze/tdebase/debian/control @@ -12,7 +12,7 @@ Standards-Version: 3.8.4 Package: tdebase-trinity Section: kde Architecture: all -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 @@ -117,7 +117,7 @@ Description: core binaries for the KDE base module Package: tdebase-data-trinity Section: kde Architecture: all -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) Replaces: tdebase-trinity (<< 4:3.0.0), tdeedu-data-trinity (<< 4:3.4.0), tdelibs-data-trinity (<< 4:3.3.0), kdewallpapers-trinity (<< 4:3.0.0), kcontrol-trinity (<< 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 @@ -129,7 +129,7 @@ Description: shared data files for the KDE base module Package: tdebase-trinity-dev Section: devel Architecture: any -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) Replaces: kate-trinity (<< 4:3.0.0), tdebase-trinity (<< 4:3.0.0), konqueror-trinity (<< 4:3.0.0) Description: development files for the KDE base module This package contains headers and other development files needed to @@ -429,7 +429,7 @@ Package: ksmserver-trinity Section: kde Architecture: any 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}) Replaces: tdebase-trinity (<< 4:3.0.0) Description: session manager for KDE @@ -497,7 +497,7 @@ 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 Depends: ${shlibs:Depends} diff --git a/debian/squeeze/tdebase/debian/control.in b/debian/squeeze/tdebase/debian/control.in index 107c75b66..8073d0665 100644 --- a/debian/squeeze/tdebase/debian/control.in +++ b/debian/squeeze/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,7 +421,7 @@ 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 @@ -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/debian/squeeze/tdebase/debian/copyright b/debian/squeeze/tdebase/debian/copyright index a17edd5c2..3d683d411 100644 --- a/debian/squeeze/tdebase/debian/copyright +++ b/debian/squeeze/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/debian/squeeze/tdebase/debian/kwin-trinity.install b/debian/squeeze/tdebase/debian/kwin-trinity.install index a6fde0638..62d42f166 100644 --- a/debian/squeeze/tdebase/debian/kwin-trinity.install +++ b/debian/squeeze/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/debian/squeeze/tdebase/debian/kwin-trinity.lintian b/debian/squeeze/tdebase/debian/kwin-trinity.lintian index ab81fccc0..b6272e484 100644 --- a/debian/squeeze/tdebase/debian/kwin-trinity.lintian +++ b/debian/squeeze/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/debian/squeeze/tdebase/debian/kwin-trinity.postinst b/debian/squeeze/tdebase/debian/kwin-trinity.postinst index 4c2228326..b8273333f 100644 --- a/debian/squeeze/tdebase/debian/kwin-trinity.postinst +++ b/debian/squeeze/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/debian/squeeze/tdebase/debian/kwin-trinity.prerm b/debian/squeeze/tdebase/debian/kwin-trinity.prerm index fef049114..67c4b2507 100644 --- a/debian/squeeze/tdebase/debian/kwin-trinity.prerm +++ b/debian/squeeze/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/debian/squeeze/tdebase/debian/rules b/debian/squeeze/tdebase/debian/rules index 20a5315f2..c0c81d698 100755 --- a/debian/squeeze/tdebase/debian/rules +++ b/debian/squeeze/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/debian/squeeze/tdebase/debian/tdebase-data-trinity.install b/debian/squeeze/tdebase/debian/tdebase-data-trinity.install index 843b55228..68d02cf06 100644 --- a/debian/squeeze/tdebase/debian/tdebase-data-trinity.install +++ b/debian/squeeze/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/debian/squeeze/tdebase/debian/tdebase-trinity-dev.install b/debian/squeeze/tdebase/debian/tdebase-trinity-dev.install index 4328f203e..80fe5d689 100644 --- a/debian/squeeze/tdebase/debian/tdebase-trinity-dev.install +++ b/debian/squeeze/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 diff --git a/debian/squeeze/tdegames/debian/changelog b/debian/squeeze/tdegames/debian/changelog index 4a2687c2a..17e0e836e 100644 --- a/debian/squeeze/tdegames/debian/changelog +++ b/debian/squeeze/tdegames/debian/changelog @@ -610,7 +610,7 @@ tdegames (4:3.1.0-1) unstable; urgency=low * Remove cruft no longer necessary when upgrading from Woody or later, as well as obsolete Depends and Enhances on tdebase. * Downgrade gnubg to suggests of kbackgammon. - * Wrote short manual pages for kwin4proc and lskatproc, simply + * Wrote short manual pages for twin4proc and lskatproc, simply telling users not to run them directly. * Change policy to 3.5.8 (no changes needed). diff --git a/debian/squeeze/tdegames/debian/control b/debian/squeeze/tdegames/debian/control index 14b00bd48..891c3b211 100644 --- a/debian/squeeze/tdegames/debian/control +++ b/debian/squeeze/tdegames/debian/control @@ -11,7 +11,7 @@ Standards-Version: 3.8.4 Package: tdegames-trinity Architecture: all Section: kde -Depends: atlantik-trinity (>= ${Source-Version}), kasteroids-trinity (>= ${Source-Version}), katomic-trinity (>= ${Source-Version}), kbackgammon-trinity (>= ${Source-Version}), kbattleship-trinity (>= ${Source-Version}), kblackbox-trinity (>= ${Source-Version}), kbounce-trinity (>= ${Source-Version}), kenolaba-trinity (>= ${Source-Version}), kfouleggs-trinity (>= ${Source-Version}), kgoldrunner-trinity (>= ${Source-Version}), kjumpingcube-trinity (>= ${Source-Version}), klickety-trinity (>= ${Source-Version}), klines-trinity (>= ${Source-Version}), kmahjongg-trinity (>= ${Source-Version}), kmines-trinity (>= ${Source-Version}), knetwalk-trinity (>= ${Source-Version}), kolf-trinity (>= ${Source-Version}), konquest-trinity (>= ${Source-Version}), kpat-trinity (>= ${Source-Version}), kpoker-trinity (>= ${Source-Version}), kreversi-trinity (>= ${Source-Version}), ksame-trinity (>= ${Source-Version}), kshisen-trinity (>= ${Source-Version}), ksirtet-trinity (>= ${Source-Version}), ksmiletris-trinity (>= ${Source-Version}), ksnake-trinity (>= ${Source-Version}), ksokoban-trinity (>= ${Source-Version}), kspaceduel-trinity (>= ${Source-Version}), ktron-trinity (>= ${Source-Version}), ktuberling-trinity (>= ${Source-Version}), kwin4-trinity (>= ${Source-Version}), lskat-trinity (>= ${Source-Version}) +Depends: atlantik-trinity (>= ${Source-Version}), kasteroids-trinity (>= ${Source-Version}), katomic-trinity (>= ${Source-Version}), kbackgammon-trinity (>= ${Source-Version}), kbattleship-trinity (>= ${Source-Version}), kblackbox-trinity (>= ${Source-Version}), kbounce-trinity (>= ${Source-Version}), kenolaba-trinity (>= ${Source-Version}), kfouleggs-trinity (>= ${Source-Version}), kgoldrunner-trinity (>= ${Source-Version}), kjumpingcube-trinity (>= ${Source-Version}), klickety-trinity (>= ${Source-Version}), klines-trinity (>= ${Source-Version}), kmahjongg-trinity (>= ${Source-Version}), kmines-trinity (>= ${Source-Version}), knetwalk-trinity (>= ${Source-Version}), kolf-trinity (>= ${Source-Version}), konquest-trinity (>= ${Source-Version}), kpat-trinity (>= ${Source-Version}), kpoker-trinity (>= ${Source-Version}), kreversi-trinity (>= ${Source-Version}), ksame-trinity (>= ${Source-Version}), kshisen-trinity (>= ${Source-Version}), ksirtet-trinity (>= ${Source-Version}), ksmiletris-trinity (>= ${Source-Version}), ksnake-trinity (>= ${Source-Version}), ksokoban-trinity (>= ${Source-Version}), kspaceduel-trinity (>= ${Source-Version}), ktron-trinity (>= ${Source-Version}), ktuberling-trinity (>= ${Source-Version}), twin4-trinity (>= ${Source-Version}), lskat-trinity (>= ${Source-Version}) Suggests: tdegames-trinity-doc-html (>= ${Source-Version}), khelpcenter-trinity Description: games from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -574,7 +574,7 @@ Description: Potato Guy for Trinity This package is part of Trinity, and a component of the KDE games module. See the 'kde-trinity' and 'tdegames-trinity' packages for more information. -Package: kwin4-trinity +Package: twin4-trinity Architecture: any Section: games Depends: ${shlibs:Depends} diff --git a/debian/squeeze/tdegames/debian/control.in b/debian/squeeze/tdegames/debian/control.in index be2a79ba7..38f0737b9 100644 --- a/debian/squeeze/tdegames/debian/control.in +++ b/debian/squeeze/tdegames/debian/control.in @@ -11,7 +11,7 @@ Standards-Version: 3.7.2 Package: tdegames Architecture: all Section: kde -Depends: atlantik (>= ${Source-Version}), kasteroids (>= ${Source-Version}), katomic (>= ${Source-Version}), kbackgammon (>= ${Source-Version}), kbattleship (>= ${Source-Version}), kblackbox (>= ${Source-Version}), kbounce (>= ${Source-Version}), kenolaba (>= ${Source-Version}), kfouleggs (>= ${Source-Version}), kgoldrunner (>= ${Source-Version}), kjumpingcube (>= ${Source-Version}), klickety (>= ${Source-Version}), klines (>= ${Source-Version}), kmahjongg (>= ${Source-Version}), kmines (>= ${Source-Version}), knetwalk (>= ${Source-Version}), kolf (>= ${Source-Version}), konquest (>= ${Source-Version}), kpat (>= ${Source-Version}), kpoker (>= ${Source-Version}), kreversi (>= ${Source-Version}), ksame (>= ${Source-Version}), kshisen (>= ${Source-Version}), ksirtet (>= ${Source-Version}), ksmiletris (>= ${Source-Version}), ksnake (>= ${Source-Version}), ksokoban (>= ${Source-Version}), kspaceduel (>= ${Source-Version}), ktron (>= ${Source-Version}), ktuberling (>= ${Source-Version}), kwin4 (>= ${Source-Version}), lskat (>= ${Source-Version}) +Depends: atlantik (>= ${Source-Version}), kasteroids (>= ${Source-Version}), katomic (>= ${Source-Version}), kbackgammon (>= ${Source-Version}), kbattleship (>= ${Source-Version}), kblackbox (>= ${Source-Version}), kbounce (>= ${Source-Version}), kenolaba (>= ${Source-Version}), kfouleggs (>= ${Source-Version}), kgoldrunner (>= ${Source-Version}), kjumpingcube (>= ${Source-Version}), klickety (>= ${Source-Version}), klines (>= ${Source-Version}), kmahjongg (>= ${Source-Version}), kmines (>= ${Source-Version}), knetwalk (>= ${Source-Version}), kolf (>= ${Source-Version}), konquest (>= ${Source-Version}), kpat (>= ${Source-Version}), kpoker (>= ${Source-Version}), kreversi (>= ${Source-Version}), ksame (>= ${Source-Version}), kshisen (>= ${Source-Version}), ksirtet (>= ${Source-Version}), ksmiletris (>= ${Source-Version}), ksnake (>= ${Source-Version}), ksokoban (>= ${Source-Version}), kspaceduel (>= ${Source-Version}), ktron (>= ${Source-Version}), ktuberling (>= ${Source-Version}), twin4 (>= ${Source-Version}), lskat (>= ${Source-Version}) Suggests: tdegames-doc-html (>= ${Source-Version}) Description: games from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -574,7 +574,7 @@ Description: Potato Guy for KDE This package is part of KDE, and a component of the KDE games module. See the 'kde' and 'tdegames' packages for more information. -Package: kwin4 +Package: twin4 Architecture: any Section: games Depends: ${shlibs:Depends} diff --git a/debian/squeeze/tdegames/debian/icons/kwin4-16.xpm b/debian/squeeze/tdegames/debian/icons/kwin4-16.xpm index 2bad59cf8..fa15f0b8a 100644 --- a/debian/squeeze/tdegames/debian/icons/kwin4-16.xpm +++ b/debian/squeeze/tdegames/debian/icons/kwin4-16.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char *kwin4-16[] = { +static char *twin4-16[] = { /* columns rows colors chars-per-pixel */ "16 16 213 2", " c black", diff --git a/debian/squeeze/tdegames/debian/icons/kwin4.xpm b/debian/squeeze/tdegames/debian/icons/kwin4.xpm index 43b466224..9d752d62e 100644 --- a/debian/squeeze/tdegames/debian/icons/kwin4.xpm +++ b/debian/squeeze/tdegames/debian/icons/kwin4.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char *kwin4[] = { +static char *twin4[] = { /* columns rows colors chars-per-pixel */ "32 32 256 2", " c black", diff --git a/debian/squeeze/tdegames/debian/kwin4-trinity.install b/debian/squeeze/tdegames/debian/kwin4-trinity.install index f07634b26..143beeac9 100644 --- a/debian/squeeze/tdegames/debian/kwin4-trinity.install +++ b/debian/squeeze/tdegames/debian/kwin4-trinity.install @@ -1,14 +1,14 @@ -/opt/trinity/games/kwin4 -/opt/trinity/games/kwin4proc -/opt/trinity/share/apps/kwin4/* -/opt/trinity/share/config.kcfg/kwin4.kcfg -/opt/trinity/share/icons/hicolor/128x128/apps/kwin4.png -/opt/trinity/share/icons/hicolor/64x64/apps/kwin4.png -/opt/trinity/share/icons/hicolor/48x48/apps/kwin4.png -/opt/trinity/share/icons/hicolor/32x32/apps/kwin4.png -/opt/trinity/share/icons/hicolor/22x22/apps/kwin4.png -/opt/trinity/share/icons/hicolor/16x16/apps/kwin4.png -/opt/trinity/share/applications/kde/kwin4.desktop -/opt/trinity/share/doc/kde/HTML/en/kwin4/* -../icons/kwin4.xpm /opt/trinity/share/pixmaps -../icons/kwin4-16.xpm /opt/trinity/share/pixmaps +/opt/trinity/games/twin4 +/opt/trinity/games/twin4proc +/opt/trinity/share/apps/twin4/* +/opt/trinity/share/config.kcfg/twin4.kcfg +/opt/trinity/share/icons/hicolor/128x128/apps/twin4.png +/opt/trinity/share/icons/hicolor/64x64/apps/twin4.png +/opt/trinity/share/icons/hicolor/48x48/apps/twin4.png +/opt/trinity/share/icons/hicolor/32x32/apps/twin4.png +/opt/trinity/share/icons/hicolor/22x22/apps/twin4.png +/opt/trinity/share/icons/hicolor/16x16/apps/twin4.png +/opt/trinity/share/applications/kde/twin4.desktop +/opt/trinity/share/doc/kde/HTML/en/twin4/* +../icons/twin4.xpm /opt/trinity/share/pixmaps +../icons/twin4-16.xpm /opt/trinity/share/pixmaps diff --git a/debian/squeeze/tdegames/debian/kwin4-trinity.links b/debian/squeeze/tdegames/debian/kwin4-trinity.links index 37623f7af..1620ac717 100644 --- a/debian/squeeze/tdegames/debian/kwin4-trinity.links +++ b/debian/squeeze/tdegames/debian/kwin4-trinity.links @@ -1 +1 @@ -/opt/trinity/share/doc/kde/HTML/en/kwin4 /opt/trinity/share/doc/kwin4/html +/opt/trinity/share/doc/kde/HTML/en/twin4 /opt/trinity/share/doc/twin4/html diff --git a/debian/squeeze/tdegames/debian/kwin4-trinity.manpages b/debian/squeeze/tdegames/debian/kwin4-trinity.manpages index 610e1c8e9..5486638b1 100644 --- a/debian/squeeze/tdegames/debian/kwin4-trinity.manpages +++ b/debian/squeeze/tdegames/debian/kwin4-trinity.manpages @@ -1,2 +1,2 @@ -debian/man/out/kwin4-trinity.6 -debian/man/out/kwin4proc-trinity.6 +debian/man/out/twin4-trinity.6 +debian/man/out/twin4proc-trinity.6 diff --git a/debian/squeeze/tdegames/debian/kwin4-trinity.menu b/debian/squeeze/tdegames/debian/kwin4-trinity.menu index 0dc4d281f..cce23cd01 100644 --- a/debian/squeeze/tdegames/debian/kwin4-trinity.menu +++ b/debian/squeeze/tdegames/debian/kwin4-trinity.menu @@ -1,9 +1,9 @@ -?package(kwin4):\ +?package(twin4):\ needs="x11"\ section="Games/Board"\ hints="KDE"\ title="KWin4"\ - icon32x32="/usr/share/pixmaps/kwin4.xpm"\ - icon16x16="/usr/share/pixmaps/kwin4-16.xpm"\ - command="/opt/trinity/games/kwin4" + icon32x32="/usr/share/pixmaps/twin4.xpm"\ + icon16x16="/usr/share/pixmaps/twin4-16.xpm"\ + command="/opt/trinity/games/twin4" diff --git a/debian/squeeze/tdegames/debian/man/kwin4-trinity.man b/debian/squeeze/tdegames/debian/man/kwin4-trinity.man index f1e3a0def..2125170be 100644 --- a/debian/squeeze/tdegames/debian/man/kwin4-trinity.man +++ b/debian/squeeze/tdegames/debian/man/kwin4-trinity.man @@ -1,8 +1,8 @@ .TH KWIN4 6 .SH NAME -kwin4 \- Connect Four clone for KDE +twin4 \- Connect Four clone for KDE .SH SYNOPSIS -.B kwin4 +.B twin4 .I [Qt-options] [KDE-options] .SH DESCRIPTION Four wins is a game for two players. Each player is represented by a @@ -17,6 +17,6 @@ or diagonal or no more moves are possible because the board is filled. .so kdeopt.part .SH SEE ALSO More detailed user documentation is available from -.BR help:/kwin4 +.BR help:/twin4 (either enter this URL into \fBkonqueror\fP, or run `khelpcenter -help:/kwin4'). +help:/twin4'). diff --git a/debian/squeeze/tdegames/debian/man/kwin4proc-trinity.man b/debian/squeeze/tdegames/debian/man/kwin4proc-trinity.man index 3a8d08949..5b1856418 100644 --- a/debian/squeeze/tdegames/debian/man/kwin4proc-trinity.man +++ b/debian/squeeze/tdegames/debian/man/kwin4proc-trinity.man @@ -1,8 +1,8 @@ .TH KWIN4PROC 6 .SH NAME -kwin4proc \- AI backend for kwin4 +twin4proc \- AI backend for twin4 .SH DESCRIPTION -This program is used internally by kwin4. Users should not run it +This program is used internally by twin4. Users should not run it directly. .SH SEE ALSO -.BR kwin4 (6). +.BR twin4 (6). diff --git a/debian/squeeze/tdegames/debian/tdegames-doc-html.doc-base.kwin4 b/debian/squeeze/tdegames/debian/tdegames-doc-html.doc-base.kwin4 index 8e9d8c8f2..09f2f43f3 100644 --- a/debian/squeeze/tdegames/debian/tdegames-doc-html.doc-base.kwin4 +++ b/debian/squeeze/tdegames/debian/tdegames-doc-html.doc-base.kwin4 @@ -1,9 +1,9 @@ -Document: tdegames-doc-html-kwin4 +Document: tdegames-doc-html-twin4 Title: KWin4 Manual Author: Martin Heni Abstract: This documentation describes KWin4 version 1.0.0. Section: Games/Board Format: HTML -Index: /usr/share/doc/kde/HTML/en/kwin4/index.html -Files: /usr/share/doc/kde/HTML/en/kwin4/*.html +Index: /usr/share/doc/kde/HTML/en/twin4/index.html +Files: /usr/share/doc/kde/HTML/en/twin4/*.html diff --git a/debian/squeeze/tdelibs/debian/man/dcop-trinity.sgml b/debian/squeeze/tdelibs/debian/man/dcop-trinity.sgml index 0c80c88a1..7c4342c05 100644 --- a/debian/squeeze/tdelibs/debian/man/dcop-trinity.sgml +++ b/debian/squeeze/tdelibs/debian/man/dcop-trinity.sgml @@ -141,14 +141,14 @@ manpage.1: manpage.sgml <para><example> <title>Return number of the current desktop, e.g. 2</title> <blockquote><literallayout> -dcop kwin KWinInterface currentDesktop +dcop twin KWinInterface currentDesktop </literallayout></blockquote> </example></para> <para><example> <title>Jump to the next dektop</title> <blockquote><literallayout> -dcop kwin KWinInterface nextDesktop +dcop twin KWinInterface nextDesktop </literallayout></blockquote> </example></para> diff --git a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install index 76fea81be..eeb111f96 100644 --- a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install +++ b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install @@ -668,10 +668,10 @@ debian/tmp/opt/trinity/include/kuserprofile.h debian/tmp/opt/trinity/include/kvmallocator.h debian/tmp/opt/trinity/include/kwallet.h debian/tmp/opt/trinity/include/kwallettypes.h -debian/tmp/opt/trinity/include/kwindowinfo.h -debian/tmp/opt/trinity/include/kwindowlistmenu.h -debian/tmp/opt/trinity/include/kwin.h -debian/tmp/opt/trinity/include/kwinmodule.h +debian/tmp/opt/trinity/include/twindowinfo.h +debian/tmp/opt/trinity/include/twindowlistmenu.h +debian/tmp/opt/trinity/include/twin.h +debian/tmp/opt/trinity/include/twinmodule.h debian/tmp/opt/trinity/include/kwizard.h debian/tmp/opt/trinity/include/kwordwrap.h debian/tmp/opt/trinity/include/kxerrorhandler.h diff --git a/debian/squeeze/tdetoys/debian/changelog b/debian/squeeze/tdetoys/debian/changelog index 8db640fcb..5406c86c9 100644 --- a/debian/squeeze/tdetoys/debian/changelog +++ b/debian/squeeze/tdetoys/debian/changelog @@ -511,7 +511,7 @@ tdetoys (4:3.1.4-3) unstable; urgency=low tdetoys (4:3.1.4-2) unstable; urgency=low * Updated amor description and man page to note that it works with window - managers other than kwin (closes: #213488). + managers other than twin (closes: #213488). -- Ben Burton <bab@debian.org> Mon, 13 Oct 2003 00:55:42 +1000 diff --git a/debian/squeeze/tdetoys/debian/control b/debian/squeeze/tdetoys/debian/control index c1393037d..d6abe3fcc 100644 --- a/debian/squeeze/tdetoys/debian/control +++ b/debian/squeeze/tdetoys/debian/control @@ -44,7 +44,7 @@ Package: amor-trinity Architecture: any Section: games Depends: ${shlibs:Depends} -Recommends: kwin-trinity +Recommends: twin-trinity Suggests: khelpcenter-trinity Conflicts: task-tdetoys-trinity Replaces: tdetoys-trinity (<< 4:3.0.1-0), task-tdetoys-trinity @@ -140,7 +140,7 @@ Package: ktux-trinity Architecture: any Section: kde Depends: ${shlibs:Depends} -Suggests: kwin-trinity +Suggests: twin-trinity Conflicts: task-tdetoys-trinity Replaces: tdetoys-trinity (<< 4:3.0.1-0), task-tdetoys-trinity Description: Tux screensaver for Trinity diff --git a/debian/squeeze/tdetoys/debian/control.in b/debian/squeeze/tdetoys/debian/control.in index 0540c794a..df8f74d5d 100644 --- a/debian/squeeze/tdetoys/debian/control.in +++ b/debian/squeeze/tdetoys/debian/control.in @@ -44,7 +44,7 @@ Package: amor Architecture: any Section: games Depends: ${shlibs:Depends} -Recommends: kwin +Recommends: twin Suggests: khelpcenter Conflicts: task-tdetoys Replaces: tdetoys (<< 4:3.0.1-0), task-tdetoys @@ -140,7 +140,7 @@ Package: ktux Architecture: any Section: kde Depends: ${shlibs:Depends} -Suggests: kwin +Suggests: twin Conflicts: task-tdetoys Replaces: tdetoys (<< 4:3.0.1-0), task-tdetoys Description: Tux screensaver for KDE diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/dirs b/ubuntu/maverick/applications/twin-style-crystal/debian/dirs index af39e99b5..93234e6f8 100644 --- a/ubuntu/maverick/applications/twin-style-crystal/debian/dirs +++ b/ubuntu/maverick/applications/twin-style-crystal/debian/dirs @@ -1,2 +1,2 @@ usr/trinity/lib/trinity -usr/share/apps/kwin +usr/share/apps/twin diff --git a/ubuntu/maverick/tdeartwork/debian/changelog b/ubuntu/maverick/tdeartwork/debian/changelog index f0bfe7054..a3043310e 100644 --- a/ubuntu/maverick/tdeartwork/debian/changelog +++ b/ubuntu/maverick/tdeartwork/debian/changelog @@ -486,10 +486,10 @@ tdeartwork (4:3.2.3-1) unstable; urgency=low * Rebuilt against STL-enabled Qt and corresponding tdelibs (closes: #254021). * Patched the autoconf tests for kxsconfig so that xscreensaver configuration works again (closes: #238180, #243150). - * Suggests (kwin | x-window-manager) for kdewallpapers instead of just + * Suggests (twin | x-window-manager) for kdewallpapers instead of just x-window-manager. - * Removed recommends: kwin from tdeartwork-theme-window since this is - already coming in as a depends from the kwin shlibs file. + * Removed recommends: twin from tdeartwork-theme-window since this is + already coming in as a depends from the twin shlibs file. -- Ben Burton <bab@debian.org> Tue, 15 Jun 2004 08:38:18 +1000 diff --git a/ubuntu/maverick/tdeartwork/debian/control b/ubuntu/maverick/tdeartwork/debian/control index 34956beb8..7c6774388 100644 --- a/ubuntu/maverick/tdeartwork/debian/control +++ b/ubuntu/maverick/tdeartwork/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-trinity-dev, gawk, gettext, sharutils, tdebase-trinity-dev, kwin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-trinity-dev, gawk, gettext, sharutils, tdebase-trinity-dev, twin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev Build-Conflicts: autoconf2.13, nvidia-glx Standards-Version: 3.8.4 @@ -102,7 +102,7 @@ Architecture: all Section: kde Replaces: kdewallpapers-kde3 (<< 4:3.5.13) Breaks: kdewallpapers-kde3 (<< 4:3.5.13) -Suggests: kwin-trinity | x-window-manager +Suggests: twin-trinity | x-window-manager Description: wallpapers released with Trinity This package contains additional wallpapers for Trinity. Wallpapers can be applied using the background manager in the KDE Control Centre. @@ -116,7 +116,7 @@ Section: kde Replaces: kscreensaver-kde3 (<< 4:3.5.13) Breaks: kscreensaver-kde3 (<< 4:3.5.13) Depends: ${shlibs:Depends}, tdebase-trinity-bin -Recommends: kwin-trinity, kscreensaver-xsavers-trinity (= ${Source-Version}) +Recommends: twin-trinity, kscreensaver-xsavers-trinity (= ${Source-Version}) Description: additional screen savers released with Trinity This package contains the screen savers for Trinity. They can be tested and selected within the Appearance and Themes section of the Trinity Control @@ -135,7 +135,7 @@ Section: kde Replaces: kscreensaver-xsavers-kde3 (<< 4:3.5.13) Breaks: kscreensaver-xsavers-kde3 (<< 4:3.5.13) Depends: ${shlibs:Depends}, tdebase-trinity-bin, xscreensaver-data -Recommends: kwin-trinity, kscreensaver-trinity (= ${Source-Version}), xscreensaver-gl +Recommends: twin-trinity, kscreensaver-trinity (= ${Source-Version}), xscreensaver-gl Suggests: kscreensaver-xsavers-webcollage-trinity Description: Trinity hooks for standard xscreensavers This package allows a smooth integration of the standard xscreensavers @@ -183,7 +183,7 @@ Section: kde Replaces: kscreensaver-xsavers-extra-kde3 (<< 4:3.5.13) Breaks: kscreensaver-xsavers-extra-kde3 (<< 4:3.5.13) Depends: ${shlibs:Depends}, kscreensaver-xsavers-trinity, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies -Recommends: kwin-trinity, kscreensaver-trinity (= ${Source-Version}) +Recommends: twin-trinity, kscreensaver-trinity (= ${Source-Version}) Description: Trinity hooks for standard xscreensavers This package allows a smooth integration of the universe xscreensavers into Trinity. With this package installed you can select and/or configure diff --git a/ubuntu/maverick/tdeartwork/debian/control.in b/ubuntu/maverick/tdeartwork/debian/control.in index e2d1102a3..8979d776d 100644 --- a/ubuntu/maverick/tdeartwork/debian/control.in +++ b/ubuntu/maverick/tdeartwork/debian/control.in @@ -4,7 +4,7 @@ Priority: optional Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com> XSBC-Original-Maintainer: @@@MAINTAINER@@@ Uploaders: @@@UPLOADERS@@@ -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-dev (>= 4:3.5.7), gawk, gettext, sharutils, tdebase-dev (>= 4:3.5.7), kwin, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl +Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-dev (>= 4:3.5.7), gawk, gettext, sharutils, tdebase-dev (>= 4:3.5.7), twin, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl Build-Conflicts: autoconf2.13, nvidia-glx Standards-Version: 3.7.2 @@ -89,7 +89,7 @@ Description: window decoration themes released with KDE Package: kdewallpapers Architecture: all Section: kde -Suggests: kwin | x-window-manager +Suggests: twin | x-window-manager Replaces: tdebase-data (<< 4:3.5) Description: wallpapers released with KDE This package contains additional wallpapers for KDE. Wallpapers can be @@ -102,7 +102,7 @@ Package: kscreensaver Architecture: any Section: kde Depends: ${shlibs:Depends}, tdebase-bin -Recommends: kwin, kscreensaver-xsavers (= ${Source-Version}) +Recommends: twin, kscreensaver-xsavers (= ${Source-Version}) Description: additional screen savers released with KDE This package contains the screen savers for KDE. They can be tested and selected within the Appearance and Themes section of the KDE Control @@ -119,7 +119,7 @@ Package: kscreensaver-xsavers Architecture: any Section: kde Depends: ${shlibs:Depends}, tdebase-bin, xscreensaver -Recommends: kwin, kscreensaver (= ${Source-Version}), xscreensaver-gl +Recommends: twin, kscreensaver (= ${Source-Version}), xscreensaver-gl Suggests: kscreensaver-xsavers-webcollage Description: KDE hooks for standard xscreensavers This package allows a smooth integration of the standard xscreensavers diff --git a/ubuntu/maverick/tdeartwork/debian/copyright b/ubuntu/maverick/tdeartwork/debian/copyright index f98e0b7f5..dbdd37868 100644 --- a/ubuntu/maverick/tdeartwork/debian/copyright +++ b/ubuntu/maverick/tdeartwork/debian/copyright @@ -139,7 +139,7 @@ Copyright: OpenLook window decoration theme: - 'OpenLook' kwin client + 'OpenLook' twin client Porting to trinity.2 API Copyright 2003 Luciano Montanaro <mikelima@cirulla.net> diff --git a/ubuntu/maverick/tdeartwork/debian/tdeartwork-theme-window-trinity.install b/ubuntu/maverick/tdeartwork/debian/tdeartwork-theme-window-trinity.install index 7f688e236..b36062a5c 100644 --- a/ubuntu/maverick/tdeartwork/debian/tdeartwork-theme-window-trinity.install +++ b/ubuntu/maverick/tdeartwork/debian/tdeartwork-theme-window-trinity.install @@ -1,2 +1,2 @@ -debian/tmp/opt/trinity/lib/trinity/kwin* -debian/tmp/opt/trinity/share/apps/kwin +debian/tmp/opt/trinity/lib/trinity/twin* +debian/tmp/opt/trinity/share/apps/twin diff --git a/ubuntu/maverick/tdebase/debian/changelog b/ubuntu/maverick/tdebase/debian/changelog index b991c3875..f015b7298 100644 --- a/ubuntu/maverick/tdebase/debian/changelog +++ b/ubuntu/maverick/tdebase/debian/changelog @@ -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: @@ -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 @@ -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 @@ -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) @@ -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 @@ -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 diff --git a/ubuntu/maverick/tdebase/debian/control b/ubuntu/maverick/tdebase/debian/control index 13b0f584b..93b7e77e0 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,7 +461,7 @@ 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 @@ -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..8073d0665 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,7 +421,7 @@ 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 @@ -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/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/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 diff --git a/ubuntu/maverick/tdegames/debian/changelog b/ubuntu/maverick/tdegames/debian/changelog index 4a2687c2a..17e0e836e 100644 --- a/ubuntu/maverick/tdegames/debian/changelog +++ b/ubuntu/maverick/tdegames/debian/changelog @@ -610,7 +610,7 @@ tdegames (4:3.1.0-1) unstable; urgency=low * Remove cruft no longer necessary when upgrading from Woody or later, as well as obsolete Depends and Enhances on tdebase. * Downgrade gnubg to suggests of kbackgammon. - * Wrote short manual pages for kwin4proc and lskatproc, simply + * Wrote short manual pages for twin4proc and lskatproc, simply telling users not to run them directly. * Change policy to 3.5.8 (no changes needed). diff --git a/ubuntu/maverick/tdegames/debian/control b/ubuntu/maverick/tdegames/debian/control index 8a0e3a68b..b02b88155 100644 --- a/ubuntu/maverick/tdegames/debian/control +++ b/ubuntu/maverick/tdegames/debian/control @@ -13,7 +13,7 @@ Architecture: all Section: kde Replaces: tdegames-kde3 (<< 4:3.5.13) Breaks: tdegames-kde3 (<< 4:3.5.13) -Depends: atlantik-trinity (>= ${Source-Version}), kasteroids-trinity (>= ${Source-Version}), katomic-trinity (>= ${Source-Version}), kbackgammon-trinity (>= ${Source-Version}), kbattleship-trinity (>= ${Source-Version}), kblackbox-trinity (>= ${Source-Version}), kbounce-trinity (>= ${Source-Version}), kenolaba-trinity (>= ${Source-Version}), kfouleggs-trinity (>= ${Source-Version}), kgoldrunner-trinity (>= ${Source-Version}), kjumpingcube-trinity (>= ${Source-Version}), klickety-trinity (>= ${Source-Version}), klines-trinity (>= ${Source-Version}), kmahjongg-trinity (>= ${Source-Version}), kmines-trinity (>= ${Source-Version}), knetwalk-trinity (>= ${Source-Version}), kolf-trinity (>= ${Source-Version}), konquest-trinity (>= ${Source-Version}), kpat-trinity (>= ${Source-Version}), kpoker-trinity (>= ${Source-Version}), kreversi-trinity (>= ${Source-Version}), ksame-trinity (>= ${Source-Version}), kshisen-trinity (>= ${Source-Version}), ksirtet-trinity (>= ${Source-Version}), ksmiletris-trinity (>= ${Source-Version}), ksnake-trinity (>= ${Source-Version}), ksokoban-trinity (>= ${Source-Version}), kspaceduel-trinity (>= ${Source-Version}), ktron-trinity (>= ${Source-Version}), ktuberling-trinity (>= ${Source-Version}), kwin4-trinity (>= ${Source-Version}), lskat-trinity (>= ${Source-Version}) +Depends: atlantik-trinity (>= ${Source-Version}), kasteroids-trinity (>= ${Source-Version}), katomic-trinity (>= ${Source-Version}), kbackgammon-trinity (>= ${Source-Version}), kbattleship-trinity (>= ${Source-Version}), kblackbox-trinity (>= ${Source-Version}), kbounce-trinity (>= ${Source-Version}), kenolaba-trinity (>= ${Source-Version}), kfouleggs-trinity (>= ${Source-Version}), kgoldrunner-trinity (>= ${Source-Version}), kjumpingcube-trinity (>= ${Source-Version}), klickety-trinity (>= ${Source-Version}), klines-trinity (>= ${Source-Version}), kmahjongg-trinity (>= ${Source-Version}), kmines-trinity (>= ${Source-Version}), knetwalk-trinity (>= ${Source-Version}), kolf-trinity (>= ${Source-Version}), konquest-trinity (>= ${Source-Version}), kpat-trinity (>= ${Source-Version}), kpoker-trinity (>= ${Source-Version}), kreversi-trinity (>= ${Source-Version}), ksame-trinity (>= ${Source-Version}), kshisen-trinity (>= ${Source-Version}), ksirtet-trinity (>= ${Source-Version}), ksmiletris-trinity (>= ${Source-Version}), ksnake-trinity (>= ${Source-Version}), ksokoban-trinity (>= ${Source-Version}), kspaceduel-trinity (>= ${Source-Version}), ktron-trinity (>= ${Source-Version}), ktuberling-trinity (>= ${Source-Version}), twin4-trinity (>= ${Source-Version}), lskat-trinity (>= ${Source-Version}) Suggests: tdegames-trinity-doc-html (>= ${Source-Version}), khelpcenter-trinity Description: games from the official Trinity release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -652,11 +652,11 @@ Description: Potato Guy for Trinity This package is part of Trinity, and a component of the KDE games module. See the 'kde-trinity' and 'tdegames-trinity' packages for more information. -Package: kwin4-trinity +Package: twin4-trinity Architecture: any Section: games -Replaces: kwin4-kde3 (<< 4:3.5.13) -Breaks: kwin4-kde3 (<< 4:3.5.13) +Replaces: twin4-kde3 (<< 4:3.5.13) +Breaks: twin4-kde3 (<< 4:3.5.13) Depends: ${shlibs:Depends} Description: Connect Four clone for Trinity Four wins is a game for two players. Each player is represented by a diff --git a/ubuntu/maverick/tdegames/debian/control.in b/ubuntu/maverick/tdegames/debian/control.in index be2a79ba7..38f0737b9 100644 --- a/ubuntu/maverick/tdegames/debian/control.in +++ b/ubuntu/maverick/tdegames/debian/control.in @@ -11,7 +11,7 @@ Standards-Version: 3.7.2 Package: tdegames Architecture: all Section: kde -Depends: atlantik (>= ${Source-Version}), kasteroids (>= ${Source-Version}), katomic (>= ${Source-Version}), kbackgammon (>= ${Source-Version}), kbattleship (>= ${Source-Version}), kblackbox (>= ${Source-Version}), kbounce (>= ${Source-Version}), kenolaba (>= ${Source-Version}), kfouleggs (>= ${Source-Version}), kgoldrunner (>= ${Source-Version}), kjumpingcube (>= ${Source-Version}), klickety (>= ${Source-Version}), klines (>= ${Source-Version}), kmahjongg (>= ${Source-Version}), kmines (>= ${Source-Version}), knetwalk (>= ${Source-Version}), kolf (>= ${Source-Version}), konquest (>= ${Source-Version}), kpat (>= ${Source-Version}), kpoker (>= ${Source-Version}), kreversi (>= ${Source-Version}), ksame (>= ${Source-Version}), kshisen (>= ${Source-Version}), ksirtet (>= ${Source-Version}), ksmiletris (>= ${Source-Version}), ksnake (>= ${Source-Version}), ksokoban (>= ${Source-Version}), kspaceduel (>= ${Source-Version}), ktron (>= ${Source-Version}), ktuberling (>= ${Source-Version}), kwin4 (>= ${Source-Version}), lskat (>= ${Source-Version}) +Depends: atlantik (>= ${Source-Version}), kasteroids (>= ${Source-Version}), katomic (>= ${Source-Version}), kbackgammon (>= ${Source-Version}), kbattleship (>= ${Source-Version}), kblackbox (>= ${Source-Version}), kbounce (>= ${Source-Version}), kenolaba (>= ${Source-Version}), kfouleggs (>= ${Source-Version}), kgoldrunner (>= ${Source-Version}), kjumpingcube (>= ${Source-Version}), klickety (>= ${Source-Version}), klines (>= ${Source-Version}), kmahjongg (>= ${Source-Version}), kmines (>= ${Source-Version}), knetwalk (>= ${Source-Version}), kolf (>= ${Source-Version}), konquest (>= ${Source-Version}), kpat (>= ${Source-Version}), kpoker (>= ${Source-Version}), kreversi (>= ${Source-Version}), ksame (>= ${Source-Version}), kshisen (>= ${Source-Version}), ksirtet (>= ${Source-Version}), ksmiletris (>= ${Source-Version}), ksnake (>= ${Source-Version}), ksokoban (>= ${Source-Version}), kspaceduel (>= ${Source-Version}), ktron (>= ${Source-Version}), ktuberling (>= ${Source-Version}), twin4 (>= ${Source-Version}), lskat (>= ${Source-Version}) Suggests: tdegames-doc-html (>= ${Source-Version}) Description: games from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -574,7 +574,7 @@ Description: Potato Guy for KDE This package is part of KDE, and a component of the KDE games module. See the 'kde' and 'tdegames' packages for more information. -Package: kwin4 +Package: twin4 Architecture: any Section: games Depends: ${shlibs:Depends} diff --git a/ubuntu/maverick/tdegames/debian/icons/kwin4-16.xpm b/ubuntu/maverick/tdegames/debian/icons/kwin4-16.xpm index 2bad59cf8..fa15f0b8a 100644 --- a/ubuntu/maverick/tdegames/debian/icons/kwin4-16.xpm +++ b/ubuntu/maverick/tdegames/debian/icons/kwin4-16.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char *kwin4-16[] = { +static char *twin4-16[] = { /* columns rows colors chars-per-pixel */ "16 16 213 2", " c black", diff --git a/ubuntu/maverick/tdegames/debian/icons/kwin4.xpm b/ubuntu/maverick/tdegames/debian/icons/kwin4.xpm index 43b466224..9d752d62e 100644 --- a/ubuntu/maverick/tdegames/debian/icons/kwin4.xpm +++ b/ubuntu/maverick/tdegames/debian/icons/kwin4.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char *kwin4[] = { +static char *twin4[] = { /* columns rows colors chars-per-pixel */ "32 32 256 2", " c black", diff --git a/ubuntu/maverick/tdegames/debian/kwin4-trinity.install b/ubuntu/maverick/tdegames/debian/kwin4-trinity.install index f07634b26..143beeac9 100644 --- a/ubuntu/maverick/tdegames/debian/kwin4-trinity.install +++ b/ubuntu/maverick/tdegames/debian/kwin4-trinity.install @@ -1,14 +1,14 @@ -/opt/trinity/games/kwin4 -/opt/trinity/games/kwin4proc -/opt/trinity/share/apps/kwin4/* -/opt/trinity/share/config.kcfg/kwin4.kcfg -/opt/trinity/share/icons/hicolor/128x128/apps/kwin4.png -/opt/trinity/share/icons/hicolor/64x64/apps/kwin4.png -/opt/trinity/share/icons/hicolor/48x48/apps/kwin4.png -/opt/trinity/share/icons/hicolor/32x32/apps/kwin4.png -/opt/trinity/share/icons/hicolor/22x22/apps/kwin4.png -/opt/trinity/share/icons/hicolor/16x16/apps/kwin4.png -/opt/trinity/share/applications/kde/kwin4.desktop -/opt/trinity/share/doc/kde/HTML/en/kwin4/* -../icons/kwin4.xpm /opt/trinity/share/pixmaps -../icons/kwin4-16.xpm /opt/trinity/share/pixmaps +/opt/trinity/games/twin4 +/opt/trinity/games/twin4proc +/opt/trinity/share/apps/twin4/* +/opt/trinity/share/config.kcfg/twin4.kcfg +/opt/trinity/share/icons/hicolor/128x128/apps/twin4.png +/opt/trinity/share/icons/hicolor/64x64/apps/twin4.png +/opt/trinity/share/icons/hicolor/48x48/apps/twin4.png +/opt/trinity/share/icons/hicolor/32x32/apps/twin4.png +/opt/trinity/share/icons/hicolor/22x22/apps/twin4.png +/opt/trinity/share/icons/hicolor/16x16/apps/twin4.png +/opt/trinity/share/applications/kde/twin4.desktop +/opt/trinity/share/doc/kde/HTML/en/twin4/* +../icons/twin4.xpm /opt/trinity/share/pixmaps +../icons/twin4-16.xpm /opt/trinity/share/pixmaps diff --git a/ubuntu/maverick/tdegames/debian/kwin4-trinity.links b/ubuntu/maverick/tdegames/debian/kwin4-trinity.links index 37623f7af..1620ac717 100644 --- a/ubuntu/maverick/tdegames/debian/kwin4-trinity.links +++ b/ubuntu/maverick/tdegames/debian/kwin4-trinity.links @@ -1 +1 @@ -/opt/trinity/share/doc/kde/HTML/en/kwin4 /opt/trinity/share/doc/kwin4/html +/opt/trinity/share/doc/kde/HTML/en/twin4 /opt/trinity/share/doc/twin4/html diff --git a/ubuntu/maverick/tdegames/debian/kwin4-trinity.manpages b/ubuntu/maverick/tdegames/debian/kwin4-trinity.manpages index 610e1c8e9..5486638b1 100644 --- a/ubuntu/maverick/tdegames/debian/kwin4-trinity.manpages +++ b/ubuntu/maverick/tdegames/debian/kwin4-trinity.manpages @@ -1,2 +1,2 @@ -debian/man/out/kwin4-trinity.6 -debian/man/out/kwin4proc-trinity.6 +debian/man/out/twin4-trinity.6 +debian/man/out/twin4proc-trinity.6 diff --git a/ubuntu/maverick/tdegames/debian/kwin4-trinity.menu b/ubuntu/maverick/tdegames/debian/kwin4-trinity.menu index 0dc4d281f..cce23cd01 100644 --- a/ubuntu/maverick/tdegames/debian/kwin4-trinity.menu +++ b/ubuntu/maverick/tdegames/debian/kwin4-trinity.menu @@ -1,9 +1,9 @@ -?package(kwin4):\ +?package(twin4):\ needs="x11"\ section="Games/Board"\ hints="KDE"\ title="KWin4"\ - icon32x32="/usr/share/pixmaps/kwin4.xpm"\ - icon16x16="/usr/share/pixmaps/kwin4-16.xpm"\ - command="/opt/trinity/games/kwin4" + icon32x32="/usr/share/pixmaps/twin4.xpm"\ + icon16x16="/usr/share/pixmaps/twin4-16.xpm"\ + command="/opt/trinity/games/twin4" diff --git a/ubuntu/maverick/tdegames/debian/man/kwin4-trinity.man b/ubuntu/maverick/tdegames/debian/man/kwin4-trinity.man index f1e3a0def..2125170be 100644 --- a/ubuntu/maverick/tdegames/debian/man/kwin4-trinity.man +++ b/ubuntu/maverick/tdegames/debian/man/kwin4-trinity.man @@ -1,8 +1,8 @@ .TH KWIN4 6 .SH NAME -kwin4 \- Connect Four clone for KDE +twin4 \- Connect Four clone for KDE .SH SYNOPSIS -.B kwin4 +.B twin4 .I [Qt-options] [KDE-options] .SH DESCRIPTION Four wins is a game for two players. Each player is represented by a @@ -17,6 +17,6 @@ or diagonal or no more moves are possible because the board is filled. .so kdeopt.part .SH SEE ALSO More detailed user documentation is available from -.BR help:/kwin4 +.BR help:/twin4 (either enter this URL into \fBkonqueror\fP, or run `khelpcenter -help:/kwin4'). +help:/twin4'). diff --git a/ubuntu/maverick/tdegames/debian/man/kwin4proc-trinity.man b/ubuntu/maverick/tdegames/debian/man/kwin4proc-trinity.man index 3a8d08949..5b1856418 100644 --- a/ubuntu/maverick/tdegames/debian/man/kwin4proc-trinity.man +++ b/ubuntu/maverick/tdegames/debian/man/kwin4proc-trinity.man @@ -1,8 +1,8 @@ .TH KWIN4PROC 6 .SH NAME -kwin4proc \- AI backend for kwin4 +twin4proc \- AI backend for twin4 .SH DESCRIPTION -This program is used internally by kwin4. Users should not run it +This program is used internally by twin4. Users should not run it directly. .SH SEE ALSO -.BR kwin4 (6). +.BR twin4 (6). diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kwin4 b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kwin4 index 8e9d8c8f2..09f2f43f3 100644 --- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kwin4 +++ b/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kwin4 @@ -1,9 +1,9 @@ -Document: tdegames-doc-html-kwin4 +Document: tdegames-doc-html-twin4 Title: KWin4 Manual Author: Martin Heni Abstract: This documentation describes KWin4 version 1.0.0. Section: Games/Board Format: HTML -Index: /usr/share/doc/kde/HTML/en/kwin4/index.html -Files: /usr/share/doc/kde/HTML/en/kwin4/*.html +Index: /usr/share/doc/kde/HTML/en/twin4/index.html +Files: /usr/share/doc/kde/HTML/en/twin4/*.html diff --git a/ubuntu/maverick/tdelibs/debian/man/dcop-trinity.sgml b/ubuntu/maverick/tdelibs/debian/man/dcop-trinity.sgml index 0c80c88a1..7c4342c05 100644 --- a/ubuntu/maverick/tdelibs/debian/man/dcop-trinity.sgml +++ b/ubuntu/maverick/tdelibs/debian/man/dcop-trinity.sgml @@ -141,14 +141,14 @@ manpage.1: manpage.sgml <para><example> <title>Return number of the current desktop, e.g. 2</title> <blockquote><literallayout> -dcop kwin KWinInterface currentDesktop +dcop twin KWinInterface currentDesktop </literallayout></blockquote> </example></para> <para><example> <title>Jump to the next dektop</title> <blockquote><literallayout> -dcop kwin KWinInterface nextDesktop +dcop twin KWinInterface nextDesktop </literallayout></blockquote> </example></para> diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install index 76fea81be..eeb111f96 100644 --- a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install +++ b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install @@ -668,10 +668,10 @@ debian/tmp/opt/trinity/include/kuserprofile.h debian/tmp/opt/trinity/include/kvmallocator.h debian/tmp/opt/trinity/include/kwallet.h debian/tmp/opt/trinity/include/kwallettypes.h -debian/tmp/opt/trinity/include/kwindowinfo.h -debian/tmp/opt/trinity/include/kwindowlistmenu.h -debian/tmp/opt/trinity/include/kwin.h -debian/tmp/opt/trinity/include/kwinmodule.h +debian/tmp/opt/trinity/include/twindowinfo.h +debian/tmp/opt/trinity/include/twindowlistmenu.h +debian/tmp/opt/trinity/include/twin.h +debian/tmp/opt/trinity/include/twinmodule.h debian/tmp/opt/trinity/include/kwizard.h debian/tmp/opt/trinity/include/kwordwrap.h debian/tmp/opt/trinity/include/kxerrorhandler.h diff --git a/ubuntu/maverick/tdetoys/debian/changelog b/ubuntu/maverick/tdetoys/debian/changelog index 8db640fcb..5406c86c9 100644 --- a/ubuntu/maverick/tdetoys/debian/changelog +++ b/ubuntu/maverick/tdetoys/debian/changelog @@ -511,7 +511,7 @@ tdetoys (4:3.1.4-3) unstable; urgency=low tdetoys (4:3.1.4-2) unstable; urgency=low * Updated amor description and man page to note that it works with window - managers other than kwin (closes: #213488). + managers other than twin (closes: #213488). -- Ben Burton <bab@debian.org> Mon, 13 Oct 2003 00:55:42 +1000 diff --git a/ubuntu/maverick/tdetoys/debian/control b/ubuntu/maverick/tdetoys/debian/control index 7255a132c..c3fa967b7 100644 --- a/ubuntu/maverick/tdetoys/debian/control +++ b/ubuntu/maverick/tdetoys/debian/control @@ -49,7 +49,7 @@ Section: games Replaces: amor-kde3 (<< 4:3.5.13) Breaks: amor-kde3 (<< 4:3.5.13) Depends: ${shlibs:Depends} -Recommends: kwin-trinity +Recommends: twin-trinity Suggests: khelpcenter-trinity Conflicts: task-tdetoys-trinity Description: a Trinity creature for your desktop @@ -152,7 +152,7 @@ Section: kde Replaces: ktux-kde3 (<< 4:3.5.13) Breaks: ktux-kde3 (<< 4:3.5.13) Depends: ${shlibs:Depends} -Suggests: kwin-trinity +Suggests: twin-trinity Conflicts: task-tdetoys-trinity Description: Tux screensaver for Trinity A neat Tux-in-a-spaceship screensaver for the K Desktop Environment (KDE). diff --git a/ubuntu/maverick/tdetoys/debian/control.in b/ubuntu/maverick/tdetoys/debian/control.in index 0540c794a..df8f74d5d 100644 --- a/ubuntu/maverick/tdetoys/debian/control.in +++ b/ubuntu/maverick/tdetoys/debian/control.in @@ -44,7 +44,7 @@ Package: amor Architecture: any Section: games Depends: ${shlibs:Depends} -Recommends: kwin +Recommends: twin Suggests: khelpcenter Conflicts: task-tdetoys Replaces: tdetoys (<< 4:3.0.1-0), task-tdetoys @@ -140,7 +140,7 @@ Package: ktux Architecture: any Section: kde Depends: ${shlibs:Depends} -Suggests: kwin +Suggests: twin Conflicts: task-tdetoys Replaces: tdetoys (<< 4:3.0.1-0), task-tdetoys Description: Tux screensaver for KDE |