summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCalvin Morrison <mutantturke@gmail.com>2011-11-17 10:19:05 -0500
committerCalvin Morrison <mutantturke@gmail.com>2011-11-17 10:19:05 -0500
commitdd732c3ab115248d1d3933b1a9d66e7379d19faa (patch)
tree3dfa2456365469752b252310c43fe965a6395b42
parent2481bbb885776059bcc0f4eb7403b59a24174d98 (diff)
parent7b559c86e36626039e08503d22a8d799f208647c (diff)
downloadtde-packaging-dd732c3ab115248d1d3933b1a9d66e7379d19faa.tar.gz
tde-packaging-dd732c3ab115248d1d3933b1a9d66e7379d19faa.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
-rw-r--r--debian/lenny/applications/twin-style-crystal/debian/dirs2
-rw-r--r--debian/lenny/tdeartwork/debian/changelog6
-rw-r--r--debian/lenny/tdeartwork/debian/control10
-rw-r--r--debian/lenny/tdeartwork/debian/control.in8
-rw-r--r--debian/lenny/tdeartwork/debian/copyright2
-rw-r--r--debian/lenny/tdeartwork/debian/tdeartwork-theme-window-trinity.install4
-rw-r--r--debian/lenny/tdebase/debian/changelog62
-rw-r--r--debian/lenny/tdebase/debian/control12
-rw-r--r--debian/lenny/tdebase/debian/control.in12
-rw-r--r--debian/lenny/tdebase/debian/copyright2
-rw-r--r--debian/lenny/tdebase/debian/ksmserver-trinity.install2
-rw-r--r--debian/lenny/tdebase/debian/ksmserver-trinity.manpages2
-rw-r--r--debian/lenny/tdebase/debian/ksmserver-trinity.postinst4
-rw-r--r--debian/lenny/tdebase/debian/ksmserver-trinity.preinst2
-rw-r--r--debian/lenny/tdebase/debian/ksmserver-trinity.prerm2
-rw-r--r--debian/lenny/tdebase/debian/kwin-trinity.install186
-rw-r--r--debian/lenny/tdebase/debian/kwin-trinity.lintian4
-rw-r--r--debian/lenny/tdebase/debian/kwin-trinity.postinst2
-rw-r--r--debian/lenny/tdebase/debian/kwin-trinity.prerm2
-rw-r--r--debian/lenny/tdebase/debian/man/starttde-trinity.1 (renamed from debian/lenny/tdebase/debian/man/startkde-trinity.1)22
-rw-r--r--debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff (renamed from ubuntu/maverick/tdebase/debian/patches/disable_startkde_wallpaper.diff)4
-rwxr-xr-xdebian/lenny/tdebase/debian/rules4
-rw-r--r--debian/lenny/tdebase/debian/tdebase-data-trinity.install6
-rw-r--r--debian/lenny/tdebase/debian/tdebase-trinity-dev.install12
-rw-r--r--debian/lenny/tdegames/debian/changelog2
-rw-r--r--debian/lenny/tdegames/debian/control4
-rw-r--r--debian/lenny/tdegames/debian/control.in4
-rw-r--r--debian/lenny/tdegames/debian/icons/kwin4-16.xpm2
-rw-r--r--debian/lenny/tdegames/debian/icons/kwin4.xpm2
-rw-r--r--debian/lenny/tdegames/debian/kwin4-trinity.install28
-rw-r--r--debian/lenny/tdegames/debian/kwin4-trinity.links2
-rw-r--r--debian/lenny/tdegames/debian/kwin4-trinity.manpages4
-rw-r--r--debian/lenny/tdegames/debian/kwin4-trinity.menu8
-rw-r--r--debian/lenny/tdegames/debian/man/kwin4-trinity.man8
-rw-r--r--debian/lenny/tdegames/debian/man/kwin4proc-trinity.man6
-rw-r--r--debian/lenny/tdegames/debian/tdegames-doc-html.doc-base.kwin46
-rw-r--r--debian/lenny/tdelibs/debian/man/dcop-trinity.sgml4
-rw-r--r--debian/lenny/tdelibs/debian/man/kstartupconfig-trinity.14
-rw-r--r--debian/lenny/tdelibs/debian/man/lnusertemp-trinity.sgml2
-rw-r--r--debian/lenny/tdelibs/debian/man/tdeinit-trinity.14
-rw-r--r--debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install10
-rw-r--r--debian/lenny/tdetoys/debian/changelog2
-rw-r--r--debian/lenny/tdetoys/debian/control4
-rw-r--r--debian/lenny/tdetoys/debian/control.in4
-rw-r--r--debian/squeeze/applications/twin-style-crystal/debian/dirs2
-rw-r--r--debian/squeeze/tdeartwork/debian/changelog6
-rw-r--r--debian/squeeze/tdeartwork/debian/control10
-rw-r--r--debian/squeeze/tdeartwork/debian/control.in8
-rw-r--r--debian/squeeze/tdeartwork/debian/copyright2
-rw-r--r--debian/squeeze/tdeartwork/debian/tdeartwork-theme-window-trinity.install4
-rw-r--r--debian/squeeze/tdebase/debian/changelog62
-rw-r--r--debian/squeeze/tdebase/debian/control12
-rw-r--r--debian/squeeze/tdebase/debian/control.in12
-rw-r--r--debian/squeeze/tdebase/debian/copyright2
-rw-r--r--debian/squeeze/tdebase/debian/ksmserver-trinity.install2
-rw-r--r--debian/squeeze/tdebase/debian/ksmserver-trinity.manpages2
-rw-r--r--debian/squeeze/tdebase/debian/ksmserver-trinity.postinst4
-rw-r--r--debian/squeeze/tdebase/debian/ksmserver-trinity.preinst2
-rw-r--r--debian/squeeze/tdebase/debian/ksmserver-trinity.prerm2
-rw-r--r--debian/squeeze/tdebase/debian/kwin-trinity.install186
-rw-r--r--debian/squeeze/tdebase/debian/kwin-trinity.lintian4
-rw-r--r--debian/squeeze/tdebase/debian/kwin-trinity.postinst2
-rw-r--r--debian/squeeze/tdebase/debian/kwin-trinity.prerm2
-rw-r--r--debian/squeeze/tdebase/debian/man/starttde-trinity.1 (renamed from ubuntu/maverick/tdebase/debian/man/startkde-trinity.1)22
-rw-r--r--debian/squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff (renamed from debian/lenny/tdebase/debian/patches/disable_startkde_wallpaper.diff)4
-rwxr-xr-xdebian/squeeze/tdebase/debian/rules4
-rw-r--r--debian/squeeze/tdebase/debian/tdebase-data-trinity.install6
-rw-r--r--debian/squeeze/tdebase/debian/tdebase-trinity-dev.install12
-rw-r--r--debian/squeeze/tdegames/debian/changelog2
-rw-r--r--debian/squeeze/tdegames/debian/control4
-rw-r--r--debian/squeeze/tdegames/debian/control.in4
-rw-r--r--debian/squeeze/tdegames/debian/icons/kwin4-16.xpm2
-rw-r--r--debian/squeeze/tdegames/debian/icons/kwin4.xpm2
-rw-r--r--debian/squeeze/tdegames/debian/kwin4-trinity.install28
-rw-r--r--debian/squeeze/tdegames/debian/kwin4-trinity.links2
-rw-r--r--debian/squeeze/tdegames/debian/kwin4-trinity.manpages4
-rw-r--r--debian/squeeze/tdegames/debian/kwin4-trinity.menu8
-rw-r--r--debian/squeeze/tdegames/debian/man/kwin4-trinity.man8
-rw-r--r--debian/squeeze/tdegames/debian/man/kwin4proc-trinity.man6
-rw-r--r--debian/squeeze/tdegames/debian/tdegames-doc-html.doc-base.kwin46
-rw-r--r--debian/squeeze/tdelibs/debian/man/dcop-trinity.sgml4
-rw-r--r--debian/squeeze/tdelibs/debian/man/kstartupconfig-trinity.14
-rw-r--r--debian/squeeze/tdelibs/debian/man/lnusertemp-trinity.sgml2
-rw-r--r--debian/squeeze/tdelibs/debian/man/tdeinit-trinity.14
-rw-r--r--debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install10
-rw-r--r--debian/squeeze/tdetoys/debian/changelog2
-rw-r--r--debian/squeeze/tdetoys/debian/control4
-rw-r--r--debian/squeeze/tdetoys/debian/control.in4
-rw-r--r--redhat/applications/knetworkmanager/trinity-knetworkmanager.spec9
-rw-r--r--redhat/dependencies/arts/arts-3.5.13-enable_oss.patch121
-rwxr-xr-xredhat/dependencies/arts/trinity-arts-3.5.13.spec9
-rw-r--r--redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec4
-rwxr-xr-xredhat/genrpm.sh33
-rw-r--r--redhat/kdebase/trinity-kdebase-3.5.13.spec27
-rwxr-xr-xredhat/kdelibs/trinity-kdelibs-3.5.13.spec16
-rw-r--r--redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec14
-rw-r--r--redhat/trinity-desktop/trinity-desktop.spec1
-rw-r--r--redhat/trinity-live/fedora-live-tde-base.ks21
-rw-r--r--redhat/trinity-live/fedora-livecd-tde.ks16
-rw-r--r--ubuntu/maverick/applications/twin-style-crystal/debian/dirs2
-rw-r--r--ubuntu/maverick/tdeartwork/debian/changelog6
-rw-r--r--ubuntu/maverick/tdeartwork/debian/control10
-rw-r--r--ubuntu/maverick/tdeartwork/debian/control.in8
-rw-r--r--ubuntu/maverick/tdeartwork/debian/copyright2
-rw-r--r--ubuntu/maverick/tdeartwork/debian/tdeartwork-theme-window-trinity.install4
-rw-r--r--ubuntu/maverick/tdebase/debian/changelog62
-rw-r--r--ubuntu/maverick/tdebase/debian/control16
-rw-r--r--ubuntu/maverick/tdebase/debian/control.in12
-rw-r--r--ubuntu/maverick/tdebase/debian/copyright2
-rw-r--r--ubuntu/maverick/tdebase/debian/ksmserver-trinity.install2
-rw-r--r--ubuntu/maverick/tdebase/debian/ksmserver-trinity.manpages2
-rw-r--r--ubuntu/maverick/tdebase/debian/ksmserver-trinity.postinst4
-rw-r--r--ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst2
-rw-r--r--ubuntu/maverick/tdebase/debian/ksmserver-trinity.prerm2
-rw-r--r--ubuntu/maverick/tdebase/debian/kwin-trinity.install186
-rw-r--r--ubuntu/maverick/tdebase/debian/kwin-trinity.lintian4
-rw-r--r--ubuntu/maverick/tdebase/debian/kwin-trinity.postinst2
-rw-r--r--ubuntu/maverick/tdebase/debian/kwin-trinity.prerm2
-rw-r--r--ubuntu/maverick/tdebase/debian/man/starttde-trinity.1 (renamed from debian/squeeze/tdebase/debian/man/startkde-trinity.1)22
-rw-r--r--ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff (renamed from debian/squeeze/tdebase/debian/patches/disable_startkde_wallpaper.diff)4
-rwxr-xr-xubuntu/maverick/tdebase/debian/rules4
-rw-r--r--ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install6
-rw-r--r--ubuntu/maverick/tdebase/debian/tdebase-trinity-dev.install12
-rw-r--r--ubuntu/maverick/tdegames/debian/changelog2
-rw-r--r--ubuntu/maverick/tdegames/debian/control8
-rw-r--r--ubuntu/maverick/tdegames/debian/control.in4
-rw-r--r--ubuntu/maverick/tdegames/debian/icons/kwin4-16.xpm2
-rw-r--r--ubuntu/maverick/tdegames/debian/icons/kwin4.xpm2
-rw-r--r--ubuntu/maverick/tdegames/debian/kwin4-trinity.install28
-rw-r--r--ubuntu/maverick/tdegames/debian/kwin4-trinity.links2
-rw-r--r--ubuntu/maverick/tdegames/debian/kwin4-trinity.manpages4
-rw-r--r--ubuntu/maverick/tdegames/debian/kwin4-trinity.menu8
-rw-r--r--ubuntu/maverick/tdegames/debian/man/kwin4-trinity.man8
-rw-r--r--ubuntu/maverick/tdegames/debian/man/kwin4proc-trinity.man6
-rw-r--r--ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kwin46
-rw-r--r--ubuntu/maverick/tdelibs/debian/man/dcop-trinity.sgml4
-rw-r--r--ubuntu/maverick/tdelibs/debian/man/kstartupconfig-trinity.14
-rw-r--r--ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml2
-rw-r--r--ubuntu/maverick/tdelibs/debian/man/tdeinit-trinity.14
-rw-r--r--ubuntu/maverick/tdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff14
-rw-r--r--ubuntu/maverick/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff2
-rw-r--r--ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install10
-rw-r--r--ubuntu/maverick/tdetoys/debian/changelog2
-rw-r--r--ubuntu/maverick/tdetoys/debian/control4
-rw-r--r--ubuntu/maverick/tdetoys/debian/control.in4
145 files changed, 946 insertions, 801 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..f19a0e4e8 100644
--- a/debian/lenny/tdebase/debian/changelog
+++ b/debian/lenny/tdebase/debian/changelog
@@ -105,7 +105,7 @@ tdebase-trinity (4:3.5.10-0ubuntu12) karmic; urgency=low
tdebase-trinity (4:3.5.10-0ubuntu11) karmic; urgency=low
- * Repaired startkde script to export DESKTOP_SESSION
+ * Repaired starttde script to export DESKTOP_SESSION
* Depends on libogg-dev-la
* Repaired gcc4.4 compilation problems
@@ -196,7 +196,7 @@ tdebase-trinity (4:3.5.10-0ubuntu3~intrepid19) intrepid; urgency=low
tdebase-trinity (4:3.5.10-0ubuntu3~intrepid18) intrepid; urgency=low
- * Added XDG_DATA_DIRS and KDEDIRS to startkde, as suggested by zekica on the Debian forums
+ * Added XDG_DATA_DIRS and KDEDIRS to starttde, as suggested by zekica on the Debian forums
-- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 07 Mar 2009 13:18:00 -0600
@@ -240,7 +240,7 @@ tdebase-trinity (4:3.5.10-0ubuntu3~intrepid3) intrepid; urgency=low
tdebase-trinity (4:3.5.10-0ubuntu3~intrepid1) intrepid; urgency=low
- * Removed link /usr/lib/libkonsolepart.so for python-trinity-trinity and altered startkde script to function properly with the new .trinity home directory
+ * Removed link /usr/lib/libkonsolepart.so for python-trinity-trinity and altered starttde script to function properly with the new .trinity home directory
-- Timothy Pearson <kb9vqf@pearsoncomputing.net> Fri, 05 Dec 2008 16:15:00 -0600
@@ -353,7 +353,7 @@ tdebase (4:3.5.9-0ubuntu5) hardy; urgency=low
tdebase (4:3.5.9-0ubuntu4) hardy; urgency=low
- * Remove kubuntu_9920_startkde_dash_stupidness.diff,
+ * Remove kubuntu_9920_starttde_dash_stupidness.diff,
Closes LP: #206187
-- Jonathan Riddell <jriddell@ubuntu.com> Tue, 25 Mar 2008 23:05:42 +0000
@@ -428,7 +428,7 @@ tdebase (4:3.5.8-2ubuntu17) hardy; urgency=low
tdebase (4:3.5.8-2ubuntu17) hardy; urgency=low
- * Added kubuntu_9920_startkde_dash_stupidness.diff:
+ * Added kubuntu_9920_starttde_dash_stupidness.diff:
- For some stupid reasons, env scripts are not parsed correctly
due dash. Hard to believe, but this patch fixes the issue...
- Closes LP: #189144
@@ -677,7 +677,7 @@ tdebase (4:3.5.7-2) unstable; urgency=low
* Add support or back references in klipper. Thanks to Sean Finney.
(Closes: #427843)
* Updated nb debconf translation. (Closes: #417942)
- * Fix typo in startkde manpage. Thanks A. Costa. (Closes: #432062)
+ * Fix typo in starttde manpage. Thanks A. Costa. (Closes: #432062)
* Fix typo in kdmrc. Thanks Greg. (Closes: #422142)
* Updated vi debconf translation. Thanks Clytie Siddall (Closes: #426820)
* Updated pt_BR debconf translation. Thanks Eder L. Marques.
@@ -967,7 +967,7 @@ tdebase (4:3.5.7-1) unstable; urgency=low
- Remove patch 21 - applied upstream.
- Adapt patch 27 - kfreebsd - minor changes.
- Adapt patch 41 - amd64 and nspluginviewer - small changes.
- - Remove patch 42 - kwin and 64 bit. applied upstream.
+ - Remove patch 42 - twin and 64 bit. applied upstream.
- Remove patch 44 - opengl logo is fixed.
- Remove patch 45 - keyboard handler - applied upstream.
@@ -1246,7 +1246,7 @@ tdebase (4:3.5.6-0ubuntu1) feisty; urgency=low
* New upstream release
* Remove patched applied upstream:
- - 02_hal_kwin_fixes_branch.diff
+ - 02_hal_twin_fixes_branch.diff
- 29_halbackend_fstab_improvements.diff
- 30_mediamanager_followsymlinks.diff
- 32_camera_icon_from_mimetype.diff
@@ -1417,7 +1417,7 @@ tdebase (4:3.5.5a.dfsg.1-5) unstable; urgency=high
non-linux archs (Closes: 399059)
+++ Changes by Modestas Vainius:
- * Fix 36_kwin.diff patch. In some cases clients were not properly added to
+ * Fix 36_twin.diff patch. In some cases clients were not properly added to
the group. (Closes: #404226)
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 29 Dec 2006 19:15:23 +0200
@@ -1429,7 +1429,7 @@ tdebase (4:3.5.5a.dfsg.1-4) unstable; urgency=low
(Closes: #399823, #384416)
+++ Changes by Ana Guerrero:
- * Applied patch to avoid kwin crashes when switching desktop
+ * Applied patch to avoid twin crashes when switching desktop
(Closes: #365829).
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 13 Dec 2006 13:09:33 +0100
@@ -2019,7 +2019,7 @@ tdebase (4:3.5.3-2) unstable; urgency=medium
tdebase (4:3.5.3-1) unstable; urgency=low
* New upstream release.
- + fix kwin alt-tab problems. (Closes: #363357, #361421, #361127)
+ + fix twin alt-tab problems. (Closes: #363357, #361421, #361127)
+ fix problems with systram. (Closes: #347320)
+++ Changes by Christopher Martin:
@@ -2132,7 +2132,7 @@ tdebase (4:3.5.1-1) unstable; urgency=low
* Enable zeroconf support in ksysguardd; add libavahi-compat-libdnssd-dev to
the build-depends. (Closes: #348583)
- * Merge startkde manpage (and maintainer script patch to fully integrate it)
+ * Merge starttde manpage (and maintainer script patch to fully integrate it)
from Philipp Grau. Thanks. (Closes: #348501)
* Upload to unstable.
@@ -2332,7 +2332,7 @@ tdebase (4:3.5.2-0ubuntu9) dapper; urgency=low
tdebase (4:3.5.2-0ubuntu8) dapper; urgency=low
- * Add kubuntu_58_kwin_branch.diff fixes crash on alt-tab and
+ * Add kubuntu_58_twin_branch.diff fixes crash on alt-tab and
focus policies
-- Jonathan Riddell <jriddell@ubuntu.com> Fri, 14 Apr 2006 15:35:56 +0000
@@ -2632,7 +2632,7 @@ tdebase (4:3.5-rc2-0ubuntu1) dapper; urgency=low
* kdm depends on xauth not xbase-clients
* Update 18_default_fonts.diff
* Generate .pot files
- * Remove kubuntu_26_startkde.diff, no need to start ivman in 3.5
+ * Remove kubuntu_26_starttde.diff, no need to start ivman in 3.5
-- Jonathan Riddell <jriddell@ubuntu.com> Mon, 21 Nov 2005 17:46:39 +0000
@@ -2644,7 +2644,7 @@ tdebase (4:3.5-rc1-1ubuntu1) dapper; urgency=low
* Update kubuntu_16_hide_kpager_menu_entry.diff
* Update kubuntu_19_kdm_zsh_emulate.diff
* Update kubuntu_25_kcontrol_only_in_kde.diff
- * Update kubuntu_30_startkde_background_colour.diff
+ * Update kubuntu_30_starttde_background_colour.diff
* Update kubuntu_32_usplash_console_font.diff
* konqueror replaces old kcontrol
@@ -2762,7 +2762,7 @@ tdebase (4:3.4.2-2) unstable; urgency=low
+++ Changes by Christopher Martin:
- * For tdebase-data, add conflicts against old versions of kcontrol, kwin,
+ * For tdebase-data, add conflicts against old versions of kcontrol, twin,
and kicker. This should prevent users from unwittingly upgrading
tdebase-data to 3.4.x, while the rest of KDE stays at the 3.3.x level.
This had resulted in kcontrol breaking and other assorted issues.
@@ -2800,7 +2800,7 @@ tdebase (4:3.4.2-1) unstable; urgency=low
* Add build-dependencies on libxss-dev, libxxf86misc-dev, libxau-dev,
libxdmcp-dev, libxcomposite-dev, libxdamage-dev, and prune the
07_xlibs-static-pic.diff accordingly, for the X.Org transition. kompmgr
- is also now built and installed with kwin.
+ is also now built and installed with twin.
* Tightened build dependency on dbus-qt-1-dev to force building against a
C++ transitioned version. Can be removed once dbus (>= 0.23.4-5) is
@@ -2905,7 +2905,7 @@ tdebase (4:3.4.2-0ubuntu4) breezy; urgency=low
on desktop icons
* Compile with GCC 3.4 on hppa, m68k, arm to prevent
internal compiler error
- * Add kubuntu_30_startkde_background_colour.diff to make default
+ * Add kubuntu_30_starttde_background_colour.diff to make default
background colour match default wallpaperchange background colour
* Do not install SVG icons to save space
* Install simple konqueror.rc into /usr/share/apps/konqueror, workaround
@@ -2971,7 +2971,7 @@ tdebase (4:3.4.1-0ubuntu3) breezy; urgency=low
* Update kubuntu_23_hal_api.diff
* Replace 19_kcontrol_only_in_kde.diff with kubuntu_25_kcontrol_only_in_kde.diff
which stops KControl displaying (use System Settings instead)
- * Add kubuntu_26_startkde.diff to start ivman
+ * Add kubuntu_26_starttde.diff to start ivman
* Add 25_khelp_htdig.diff from Debian
-- Jonathan Riddell <jriddell@ubuntu.com> Mon, 20 Jun 2005 09:15:07 +0000
@@ -3065,7 +3065,7 @@ tdebase (4:3.4.0-0pre4) alioth; urgency=low
Debian. (Closes: #246280)
* Make ksmserver Recommend kpersonalizer, since it is used when
- running KDE for the first time. Also patch startkde so it doesn't
+ running KDE for the first time. Also patch starttde so it doesn't
fail when kpersonalizer is not present. (Closes: #309803)
* Add manpages for kdialog (thanks to Bastian Kleineidam for tracking it
@@ -3107,7 +3107,7 @@ tdebase (4:3.3.2-1) unstable; urgency=low
+++ Changes by Adeodato Simó:
* debian/control:
- - make tdebase-dev depend on kwin for the libtdecorations.so ->
+ - make tdebase-dev depend on twin for the libtdecorations.so ->
libtdecorations.so.1.0.0 symlink. (Closes: #289544)
* Included Czech po-debconf translation by Miroslav Kure.
@@ -3276,7 +3276,7 @@ tdebase (4:3.4.0-0pre1ubuntu6) hoary; urgency=low
tdebase (4:3.4.0-0pre1ubuntu5) hoary; urgency=low
- * Add kwin conflicts with old tdeartwork-theme-window
+ * Add twin conflicts with old tdeartwork-theme-window
-- Jonathan Riddell <jr@jriddell.org> Tue, 8 Mar 2005 22:48:59 +0000
@@ -3312,7 +3312,7 @@ tdebase (4:3.3.2-0pre1) experimental; urgency=low
* KDE_3_3_BRANCH update. Includes the tdebase part of the fix
for CAN-2004-1158.
* Lower tdeprint's dependency on gv to a Suggests. (Closes: #269590)
- * kwin is now registered as an x-window-manager. (Closes: #249162)
+ * twin is now registered as an x-window-manager. (Closes: #249162)
* Added /usr/share/xsessions to KDM's default session path, so
.desktop files installed there are found.
(Closes: #243770, #247365, #247747, #250384)
@@ -3855,7 +3855,7 @@ tdebase (4:2.2.1-5) unstable; urgency=low
tdebase (4:2.2.1-4) unstable; urgency=low
* More upstream fixes
- * don't set background in startkde script by default.
+ * don't set background in starttde script by default.
-- Ivan E. Moore II <rkrusty@debian.org> Thu, 27 Sep 2001 12:13:00 -0700
@@ -4056,7 +4056,7 @@ tdebase (4:2.2.0-0beta1-1) unstable; urgency=low
* Provide man link from kdm to chooser
* More build cleanup..take more of the automation out to make sure things
are constant
- * Remove custom startkde
+ * Remove custom starttde
* Revert old overrides so we can start from scratch
* Add in new python-base dependency
* New packages: kate, tdebase-audiolibs (so that those without sound do
@@ -4068,7 +4068,7 @@ tdebase (4:2.2.0-0beta1-1) unstable; urgency=low
* And let's list the bugs fixed...
ctrl-u problems with location bar fixed (Closes: #81425)
image transparency fixed for konsole on startup (Closes: #84062)
- fixes kwin's conflicting key accelerators (Closes: #86370)
+ fixes twin's conflicting key accelerators (Closes: #86370)
fixes rendering error for www.bluesnews.com (Closes: #79800)
fixes button problems for katalog.ub.uni-heidelberg.de (Closes: #88934)
now provides the audiocd ioslave bits which allow for ripping audio
@@ -4134,7 +4134,7 @@ tdebase (4:2.1.1-3) unstable; urgency=low
tdebase (4:2.1.1-2) unstable; urgency=low
- * Move startkde script into /etc/kde2 so that it will be a conffile and
+ * Move starttde script into /etc/kde2 so that it will be a conffile and
link it back to /usr/bin/kde2. (Closes: #91787)
* Build on older libc
* Adding in recommends for klisa
@@ -4410,7 +4410,7 @@ tdebase (4:2.1-20001213-1) unstable; urgency=low
* Fix whatis typo (Closes: #78178)
* Fix segfaults (Closes: #78903)
* Adding in a Recommend for kview to konqueror (Closes: #79201)
- * Changing x-window-manager alternative from kde2 to kwin
+ * Changing x-window-manager alternative from kde2 to twin
* KDM init.d script cleanup (Closes: #79320)
* Fixed default kdmrc script to show new options
* Adding in a kwm script for non-session launches
@@ -4546,7 +4546,7 @@ tdebase (4:2.0-20001008-0) unstable; urgency=low
tdebase (4:2.0-20001006-1) unstable; urgency=low
* More upstream fixes
- * Applying tdebase-1.94-kwin-nofreeze-20000924.diff patch (Closes: #74051)
+ * Applying tdebase-1.94-twin-nofreeze-20000924.diff patch (Closes: #74051)
-- Ivan E. Moore II <rkrusty@debian.org> Sun, 08 Oct 2000 03:30:00 -0700
@@ -5057,9 +5057,9 @@ tdebase (1:Beta2-2.1) experimental; urgency=low
tdebase (1:Beta2-2) unstable; urgency=low
- * fixed kde / startkde script. added minimal documentation.
+ * fixed kde / starttde script. added minimal documentation.
* fixed klock permissions.
- * removed startkde script.
+ * removed starttde script.
* removed virtual package names.
* fixed utmp file location in kvt.
diff --git a/debian/lenny/tdebase/debian/control b/debian/lenny/tdebase/debian/control
index 802953a5f..41fb6f9be 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,14 +429,14 @@ 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
This package contains the KDE session manager. It is responsible for
restoring your KDE session on login. It is also needed to properly
start a KDE session. It registers KDE with X display managers, and
- provides the 'startkde' command, for starting an X session with KDE
+ provides the 'starttde' command, for starting an X session with KDE
from the console.
.
If you are running KDE for the first time for a certain user,
@@ -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..58861a14d 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,14 +421,14 @@ Package: ksmserver
Section: kde
Architecture: any
Provides: x-session-manager
-Depends: ${shlibs:Depends}, kwin (= ${Source-Version}) | x-window-manager
+Depends: ${shlibs:Depends}, twin (= ${Source-Version}) | x-window-manager
Recommends: kpersonalizer (= ${Source-Version})
Replaces: tdebase (<< 4:3.0.0)
Description: session manager for KDE
This package contains the KDE session manager. It is responsible for
restoring your KDE session on login. It is also needed to properly
start a KDE session. It registers KDE with X display managers, and
- provides the 'startkde' command, for starting an X session with KDE
+ provides the 'starttde' command, for starting an X session with KDE
from the console.
.
If you are running KDE for the first time for a certain user,
@@ -489,7 +489,7 @@ Description: useful tips for KDE
This package is part of KDE, and a component of the KDE base module.
See the 'kde' and 'tdebase' packages for more information.
-Package: kwin
+Package: twin
Section: kde
Architecture: any
Depends: ${shlibs:Depends}
diff --git a/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/ksmserver-trinity.install b/debian/lenny/tdebase/debian/ksmserver-trinity.install
index 0946d8a57..f8c0aa867 100644
--- a/debian/lenny/tdebase/debian/ksmserver-trinity.install
+++ b/debian/lenny/tdebase/debian/ksmserver-trinity.install
@@ -1,5 +1,5 @@
debian/tmp/opt/trinity/bin/ksmserver
-debian/tmp/opt/trinity/bin/startkde
+debian/tmp/opt/trinity/bin/starttde
debian/tmp/opt/trinity/lib/trinity/ksmserver.la
debian/tmp/opt/trinity/lib/trinity/ksmserver.so
debian/tmp/opt/trinity/lib/libtdeinit_ksmserver.so
diff --git a/debian/lenny/tdebase/debian/ksmserver-trinity.manpages b/debian/lenny/tdebase/debian/ksmserver-trinity.manpages
index 05b93960e..354e23800 100644
--- a/debian/lenny/tdebase/debian/ksmserver-trinity.manpages
+++ b/debian/lenny/tdebase/debian/ksmserver-trinity.manpages
@@ -1 +1 @@
-debian/man/startkde-trinity.1
+debian/man/starttde-trinity.1
diff --git a/debian/lenny/tdebase/debian/ksmserver-trinity.postinst b/debian/lenny/tdebase/debian/ksmserver-trinity.postinst
index 6492cbb59..f5d73b934 100644
--- a/debian/lenny/tdebase/debian/ksmserver-trinity.postinst
+++ b/debian/lenny/tdebase/debian/ksmserver-trinity.postinst
@@ -20,9 +20,9 @@ set -e
case "$1" in
configure)
update-alternatives --install /usr/bin/x-session-manager \
- x-session-manager /opt/trinity/bin/startkde 40 \
+ x-session-manager /opt/trinity/bin/starttde 40 \
--slave /opt/trinity/share/man/man1/x-session-manager.1.gz \
- x-session-manager.1.gz "/opt/trinity/share/man/man1/startkde-trinity.1.gz"
+ x-session-manager.1.gz "/opt/trinity/share/man/man1/starttde-trinity.1.gz"
;;
diff --git a/debian/lenny/tdebase/debian/ksmserver-trinity.preinst b/debian/lenny/tdebase/debian/ksmserver-trinity.preinst
index 73ee5043a..884257d03 100644
--- a/debian/lenny/tdebase/debian/ksmserver-trinity.preinst
+++ b/debian/lenny/tdebase/debian/ksmserver-trinity.preinst
@@ -4,7 +4,7 @@ case "$1" in
upgrade)
rm -f /etc/gdm/Sessions/KDE
- rm -f /etc/trinity/debian/startkde
+ rm -f /etc/trinity/debian/starttde
/usr/sbin/update-alternatives --remove x-session-manager /usr/bin/kde2
/usr/sbin/update-alternatives --remove x-session-manager /usr/bin/trinity
mkdir -p /usr/share/autostart
diff --git a/debian/lenny/tdebase/debian/ksmserver-trinity.prerm b/debian/lenny/tdebase/debian/ksmserver-trinity.prerm
index 11b4bc08a..e9be94522 100644
--- a/debian/lenny/tdebase/debian/ksmserver-trinity.prerm
+++ b/debian/lenny/tdebase/debian/ksmserver-trinity.prerm
@@ -19,7 +19,7 @@ set -e
case "$1" in
remove)
- /usr/sbin/update-alternatives --remove x-session-manager /usr/trinity/bin/startkde
+ /usr/sbin/update-alternatives --remove x-session-manager /usr/trinity/bin/starttde
dpkg-divert --rename --remove /usr/share/autostart/plasma.desktop
;;
diff --git a/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/man/startkde-trinity.1 b/debian/lenny/tdebase/debian/man/starttde-trinity.1
index f26b7f128..76c31c9ba 100644
--- a/debian/lenny/tdebase/debian/man/startkde-trinity.1
+++ b/debian/lenny/tdebase/debian/man/starttde-trinity.1
@@ -1,26 +1,26 @@
-.TH startkde 1 "Jan 17, 2005"
+.TH starttde 1 "Jan 17, 2005"
.SH NAME
-startkde \- Starts up the KDE Desktop Environment
+starttde \- Starts up the KDE Desktop Environment
.SH SYNOPSIS
-.B startkde
+.B starttde
.br
.SH DESCRIPTION
This manual page documents briefly the
-.B startkde
+.B starttde
command.
This manual page was written for the Debian distribution
because the original program does not have a manual page.
.PP
-The \fBstartkde\fP script starts up the K Desktop Environment and
+The \fBstarttde\fP script starts up the K Desktop Environment and
is typically executed by your login manager (e.g. xdm, gdm, kdm, wdm or from
-your X startup scripts). \fBstartkde\fP in turn launches ksmserver, which
+your X startup scripts). \fBstarttde\fP in turn launches ksmserver, which
will load your last session, or a default session that includes the standard
KDE programs if no saved session is available.
-\fBstartkde\fP, with ksmserver, is a standard X11R6 session manager that can manage
+\fBstarttde\fP, with ksmserver, is a standard X11R6 session manager that can manage
any X11R6 SM compliant program.
-\fBstartkde\fP and ksmserver use the contents of the ~/.kde directory
+\fBstarttde\fP and ksmserver use the contents of the ~/.kde directory
for starting previously saved sessions. Source scripts found in ~/.kde/env/*.sh
can be used to define environment variables that will be available to all KDE
programs.
@@ -32,15 +32,15 @@ At the end of a session, the scripts found in ~/.kde/shutdown will be executed.
.SH OPTIONS
-\fBstartkde\fP takes no command line options.
+\fBstarttde\fP takes no command line options.
.SH AUTHOR
-\fBstartkde\fP is written by the KDE Project.
+\fBstarttde\fP is written by the KDE Project.
This manual page was written by Philipp Grau.
.SH "REPORTING BUGS"
-Report bugs of this modified Debian version of startkde to the Bug
+Report bugs of this modified Debian version of starttde to the Bug
Tracking System at: http://bugs.debian.org
.SH COPYRIGHT
Copyright \(co 2005 Philipp Grau.
diff --git a/ubuntu/maverick/tdebase/debian/patches/disable_startkde_wallpaper.diff b/debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff
index 838bbec11..0eebed280 100644
--- a/ubuntu/maverick/tdebase/debian/patches/disable_startkde_wallpaper.diff
+++ b/debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff
@@ -1,5 +1,5 @@
---- startkde
-+++ startkde
+--- starttde
++++ starttde
@@ -184,17 +184,17 @@
. $kdehome/share/config/startupconfig
fi
diff --git a/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/man/kstartupconfig-trinity.1 b/debian/lenny/tdelibs/debian/man/kstartupconfig-trinity.1
index dca82fb5e..57ae12c1d 100644
--- a/debian/lenny/tdelibs/debian/man/kstartupconfig-trinity.1
+++ b/debian/lenny/tdelibs/debian/man/kstartupconfig-trinity.1
@@ -8,7 +8,7 @@ kstartupconfig, kdostartupconfig
.sp 1
\fBkdostartupconfig\fP
.SH DESCRIPTION
-\fBkstartupconfig\fP loads configuration options for use in \fBstartkde\fP. It saves loading time as there is no need to launch programs linked to KDE libraries. \fBstartupconfig\fP uses a cache of some Kconfig options that are updated by \fBkdostartupconfig\fP. The cache is implemented as script file that is sourced and provides the options as shell variables.
+\fBkstartupconfig\fP loads configuration options for use in \fBstarttde\fP. It saves loading time as there is no need to launch programs linked to KDE libraries. \fBstartupconfig\fP uses a cache of some Kconfig options that are updated by \fBkdostartupconfig\fP. The cache is implemented as script file that is sourced and provides the options as shell variables.
.sp 1
The configuration options to load are stored in \fIstartupconfigkeys\fP as one option per line. They follow the format <file> <group> <key> <default>. A complete group is addressed as <file> [<group>]. The configuration options are processed in the specified order so the missing default values for groups can be specified as single options after the group option.
.sp 1
@@ -42,7 +42,7 @@ configuration options and files they belong to
.I $KDEHOME/share/config/startupconfigkeys
configuration options to load
.SH SEE ALSO
-.BR kconf_update (1),\ startkde (1)
+.BR kconf_update (1),\ starttde (1)
.SH AUTHORS
.nf
Lubos Lunak <l.lunak@kde.org>
diff --git a/debian/lenny/tdelibs/debian/man/lnusertemp-trinity.sgml b/debian/lenny/tdelibs/debian/man/lnusertemp-trinity.sgml
index c40c64520..d4a7162d1 100644
--- a/debian/lenny/tdelibs/debian/man/lnusertemp-trinity.sgml
+++ b/debian/lenny/tdelibs/debian/man/lnusertemp-trinity.sgml
@@ -105,7 +105,7 @@ manpage.1: manpage.sgml
attacks. </para>
<para><command>&dhpackage;</command> is usually called by the
- <command>startkde</command> script.</para>
+ <command>starttde</command> script.</para>
</refsect1>
<refsect1>
diff --git a/debian/lenny/tdelibs/debian/man/tdeinit-trinity.1 b/debian/lenny/tdelibs/debian/man/tdeinit-trinity.1
index 1c3861783..63c5935b6 100644
--- a/debian/lenny/tdelibs/debian/man/tdeinit-trinity.1
+++ b/debian/lenny/tdelibs/debian/man/tdeinit-trinity.1
@@ -10,7 +10,7 @@ tdeinit
.sp 1
\fBtdeinit\fP is used to start all other KDE programs. It can start binary program files as well as tdeinit loadable modules (KLMs).
.sp 1
-When \fBtdeinit\fP starts for the first time it launches \fBdcopserver\fP, \fBklauncher\fP, \fBkded\fP and some additional programs specified on its command line in the \fBstartkde\fP script (normally \fBkcminit\fP and \fBknotify\fP).
+When \fBtdeinit\fP starts for the first time it launches \fBdcopserver\fP, \fBklauncher\fP, \fBkded\fP and some additional programs specified on its command line in the \fBstarttde\fP script (normally \fBkcminit\fP and \fBknotify\fP).
.sp 1
The \fBtdeinit\fP master process can be used to start additional KDE programs via \fBtdeinit_wrapper\fP, \fBkshell\fP and \fBkwrapper\fP.
.sp 1
@@ -29,7 +29,7 @@ Terminate when no KDE applications are left running
.I /usr/lib/trinity
directory with KLMs (tdeinit loadable modules)
.SH SEE ALSO
-.BR dcopserver (1),\ kded (1),\ kcminit (1),\ tdeinit_wrapper (1),\ klauncher (1),\ kshell (1),\ kwrapper (1),\ startkde (1)
+.BR dcopserver (1),\ kded (1),\ kcminit (1),\ tdeinit_wrapper (1),\ klauncher (1),\ kshell (1),\ kwrapper (1),\ starttde (1)
.SH AUTHORS
.nf
Waldo Bastian <bastian@kde.org>
diff --git a/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install
index 8f84589d6..eeb111f96 100644
--- a/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/debian/lenny/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -232,7 +232,7 @@ debian/tmp/opt/trinity/include/tdesu/ssh.h
debian/tmp/opt/trinity/include/tdesu/stub.h
debian/tmp/opt/trinity/include/tdesu/su.h
debian/tmp/opt/trinity/include/kde_terminal_interface.h
-debian/tmp/opt/trinity/include/kdeversion.h
+debian/tmp/opt/trinity/include/tdeversion.h
debian/tmp/opt/trinity/include/kdialogbase.h
debian/tmp/opt/trinity/include/kdialog.h
debian/tmp/opt/trinity/include/kdirlister.h
@@ -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..f19a0e4e8 100644
--- a/debian/squeeze/tdebase/debian/changelog
+++ b/debian/squeeze/tdebase/debian/changelog
@@ -105,7 +105,7 @@ tdebase-trinity (4:3.5.10-0ubuntu12) karmic; urgency=low
tdebase-trinity (4:3.5.10-0ubuntu11) karmic; urgency=low
- * Repaired startkde script to export DESKTOP_SESSION
+ * Repaired starttde script to export DESKTOP_SESSION
* Depends on libogg-dev-la
* Repaired gcc4.4 compilation problems
@@ -196,7 +196,7 @@ tdebase-trinity (4:3.5.10-0ubuntu3~intrepid19) intrepid; urgency=low
tdebase-trinity (4:3.5.10-0ubuntu3~intrepid18) intrepid; urgency=low
- * Added XDG_DATA_DIRS and KDEDIRS to startkde, as suggested by zekica on the Debian forums
+ * Added XDG_DATA_DIRS and KDEDIRS to starttde, as suggested by zekica on the Debian forums
-- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 07 Mar 2009 13:18:00 -0600
@@ -240,7 +240,7 @@ tdebase-trinity (4:3.5.10-0ubuntu3~intrepid3) intrepid; urgency=low
tdebase-trinity (4:3.5.10-0ubuntu3~intrepid1) intrepid; urgency=low
- * Removed link /usr/lib/libkonsolepart.so for python-trinity-trinity and altered startkde script to function properly with the new .trinity home directory
+ * Removed link /usr/lib/libkonsolepart.so for python-trinity-trinity and altered starttde script to function properly with the new .trinity home directory
-- Timothy Pearson <kb9vqf@pearsoncomputing.net> Fri, 05 Dec 2008 16:15:00 -0600
@@ -353,7 +353,7 @@ tdebase (4:3.5.9-0ubuntu5) hardy; urgency=low
tdebase (4:3.5.9-0ubuntu4) hardy; urgency=low
- * Remove kubuntu_9920_startkde_dash_stupidness.diff,
+ * Remove kubuntu_9920_starttde_dash_stupidness.diff,
Closes LP: #206187
-- Jonathan Riddell <jriddell@ubuntu.com> Tue, 25 Mar 2008 23:05:42 +0000
@@ -428,7 +428,7 @@ tdebase (4:3.5.8-2ubuntu17) hardy; urgency=low
tdebase (4:3.5.8-2ubuntu17) hardy; urgency=low
- * Added kubuntu_9920_startkde_dash_stupidness.diff:
+ * Added kubuntu_9920_starttde_dash_stupidness.diff:
- For some stupid reasons, env scripts are not parsed correctly
due dash. Hard to believe, but this patch fixes the issue...
- Closes LP: #189144
@@ -677,7 +677,7 @@ tdebase (4:3.5.7-2) unstable; urgency=low
* Add support or back references in klipper. Thanks to Sean Finney.
(Closes: #427843)
* Updated nb debconf translation. (Closes: #417942)
- * Fix typo in startkde manpage. Thanks A. Costa. (Closes: #432062)
+ * Fix typo in starttde manpage. Thanks A. Costa. (Closes: #432062)
* Fix typo in kdmrc. Thanks Greg. (Closes: #422142)
* Updated vi debconf translation. Thanks Clytie Siddall (Closes: #426820)
* Updated pt_BR debconf translation. Thanks Eder L. Marques.
@@ -967,7 +967,7 @@ tdebase (4:3.5.7-1) unstable; urgency=low
- Remove patch 21 - applied upstream.
- Adapt patch 27 - kfreebsd - minor changes.
- Adapt patch 41 - amd64 and nspluginviewer - small changes.
- - Remove patch 42 - kwin and 64 bit. applied upstream.
+ - Remove patch 42 - twin and 64 bit. applied upstream.
- Remove patch 44 - opengl logo is fixed.
- Remove patch 45 - keyboard handler - applied upstream.
@@ -1246,7 +1246,7 @@ tdebase (4:3.5.6-0ubuntu1) feisty; urgency=low
* New upstream release
* Remove patched applied upstream:
- - 02_hal_kwin_fixes_branch.diff
+ - 02_hal_twin_fixes_branch.diff
- 29_halbackend_fstab_improvements.diff
- 30_mediamanager_followsymlinks.diff
- 32_camera_icon_from_mimetype.diff
@@ -1417,7 +1417,7 @@ tdebase (4:3.5.5a.dfsg.1-5) unstable; urgency=high
non-linux archs (Closes: 399059)
+++ Changes by Modestas Vainius:
- * Fix 36_kwin.diff patch. In some cases clients were not properly added to
+ * Fix 36_twin.diff patch. In some cases clients were not properly added to
the group. (Closes: #404226)
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 29 Dec 2006 19:15:23 +0200
@@ -1429,7 +1429,7 @@ tdebase (4:3.5.5a.dfsg.1-4) unstable; urgency=low
(Closes: #399823, #384416)
+++ Changes by Ana Guerrero:
- * Applied patch to avoid kwin crashes when switching desktop
+ * Applied patch to avoid twin crashes when switching desktop
(Closes: #365829).
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 13 Dec 2006 13:09:33 +0100
@@ -2019,7 +2019,7 @@ tdebase (4:3.5.3-2) unstable; urgency=medium
tdebase (4:3.5.3-1) unstable; urgency=low
* New upstream release.
- + fix kwin alt-tab problems. (Closes: #363357, #361421, #361127)
+ + fix twin alt-tab problems. (Closes: #363357, #361421, #361127)
+ fix problems with systram. (Closes: #347320)
+++ Changes by Christopher Martin:
@@ -2132,7 +2132,7 @@ tdebase (4:3.5.1-1) unstable; urgency=low
* Enable zeroconf support in ksysguardd; add libavahi-compat-libdnssd-dev to
the build-depends. (Closes: #348583)
- * Merge startkde manpage (and maintainer script patch to fully integrate it)
+ * Merge starttde manpage (and maintainer script patch to fully integrate it)
from Philipp Grau. Thanks. (Closes: #348501)
* Upload to unstable.
@@ -2332,7 +2332,7 @@ tdebase (4:3.5.2-0ubuntu9) dapper; urgency=low
tdebase (4:3.5.2-0ubuntu8) dapper; urgency=low
- * Add kubuntu_58_kwin_branch.diff fixes crash on alt-tab and
+ * Add kubuntu_58_twin_branch.diff fixes crash on alt-tab and
focus policies
-- Jonathan Riddell <jriddell@ubuntu.com> Fri, 14 Apr 2006 15:35:56 +0000
@@ -2632,7 +2632,7 @@ tdebase (4:3.5-rc2-0ubuntu1) dapper; urgency=low
* kdm depends on xauth not xbase-clients
* Update 18_default_fonts.diff
* Generate .pot files
- * Remove kubuntu_26_startkde.diff, no need to start ivman in 3.5
+ * Remove kubuntu_26_starttde.diff, no need to start ivman in 3.5
-- Jonathan Riddell <jriddell@ubuntu.com> Mon, 21 Nov 2005 17:46:39 +0000
@@ -2644,7 +2644,7 @@ tdebase (4:3.5-rc1-1ubuntu1) dapper; urgency=low
* Update kubuntu_16_hide_kpager_menu_entry.diff
* Update kubuntu_19_kdm_zsh_emulate.diff
* Update kubuntu_25_kcontrol_only_in_kde.diff
- * Update kubuntu_30_startkde_background_colour.diff
+ * Update kubuntu_30_starttde_background_colour.diff
* Update kubuntu_32_usplash_console_font.diff
* konqueror replaces old kcontrol
@@ -2762,7 +2762,7 @@ tdebase (4:3.4.2-2) unstable; urgency=low
+++ Changes by Christopher Martin:
- * For tdebase-data, add conflicts against old versions of kcontrol, kwin,
+ * For tdebase-data, add conflicts against old versions of kcontrol, twin,
and kicker. This should prevent users from unwittingly upgrading
tdebase-data to 3.4.x, while the rest of KDE stays at the 3.3.x level.
This had resulted in kcontrol breaking and other assorted issues.
@@ -2800,7 +2800,7 @@ tdebase (4:3.4.2-1) unstable; urgency=low
* Add build-dependencies on libxss-dev, libxxf86misc-dev, libxau-dev,
libxdmcp-dev, libxcomposite-dev, libxdamage-dev, and prune the
07_xlibs-static-pic.diff accordingly, for the X.Org transition. kompmgr
- is also now built and installed with kwin.
+ is also now built and installed with twin.
* Tightened build dependency on dbus-qt-1-dev to force building against a
C++ transitioned version. Can be removed once dbus (>= 0.23.4-5) is
@@ -2905,7 +2905,7 @@ tdebase (4:3.4.2-0ubuntu4) breezy; urgency=low
on desktop icons
* Compile with GCC 3.4 on hppa, m68k, arm to prevent
internal compiler error
- * Add kubuntu_30_startkde_background_colour.diff to make default
+ * Add kubuntu_30_starttde_background_colour.diff to make default
background colour match default wallpaperchange background colour
* Do not install SVG icons to save space
* Install simple konqueror.rc into /usr/share/apps/konqueror, workaround
@@ -2971,7 +2971,7 @@ tdebase (4:3.4.1-0ubuntu3) breezy; urgency=low
* Update kubuntu_23_hal_api.diff
* Replace 19_kcontrol_only_in_kde.diff with kubuntu_25_kcontrol_only_in_kde.diff
which stops KControl displaying (use System Settings instead)
- * Add kubuntu_26_startkde.diff to start ivman
+ * Add kubuntu_26_starttde.diff to start ivman
* Add 25_khelp_htdig.diff from Debian
-- Jonathan Riddell <jriddell@ubuntu.com> Mon, 20 Jun 2005 09:15:07 +0000
@@ -3065,7 +3065,7 @@ tdebase (4:3.4.0-0pre4) alioth; urgency=low
Debian. (Closes: #246280)
* Make ksmserver Recommend kpersonalizer, since it is used when
- running KDE for the first time. Also patch startkde so it doesn't
+ running KDE for the first time. Also patch starttde so it doesn't
fail when kpersonalizer is not present. (Closes: #309803)
* Add manpages for kdialog (thanks to Bastian Kleineidam for tracking it
@@ -3107,7 +3107,7 @@ tdebase (4:3.3.2-1) unstable; urgency=low
+++ Changes by Adeodato Simó:
* debian/control:
- - make tdebase-dev depend on kwin for the libtdecorations.so ->
+ - make tdebase-dev depend on twin for the libtdecorations.so ->
libtdecorations.so.1.0.0 symlink. (Closes: #289544)
* Included Czech po-debconf translation by Miroslav Kure.
@@ -3276,7 +3276,7 @@ tdebase (4:3.4.0-0pre1ubuntu6) hoary; urgency=low
tdebase (4:3.4.0-0pre1ubuntu5) hoary; urgency=low
- * Add kwin conflicts with old tdeartwork-theme-window
+ * Add twin conflicts with old tdeartwork-theme-window
-- Jonathan Riddell <jr@jriddell.org> Tue, 8 Mar 2005 22:48:59 +0000
@@ -3312,7 +3312,7 @@ tdebase (4:3.3.2-0pre1) experimental; urgency=low
* KDE_3_3_BRANCH update. Includes the tdebase part of the fix
for CAN-2004-1158.
* Lower tdeprint's dependency on gv to a Suggests. (Closes: #269590)
- * kwin is now registered as an x-window-manager. (Closes: #249162)
+ * twin is now registered as an x-window-manager. (Closes: #249162)
* Added /usr/share/xsessions to KDM's default session path, so
.desktop files installed there are found.
(Closes: #243770, #247365, #247747, #250384)
@@ -3855,7 +3855,7 @@ tdebase (4:2.2.1-5) unstable; urgency=low
tdebase (4:2.2.1-4) unstable; urgency=low
* More upstream fixes
- * don't set background in startkde script by default.
+ * don't set background in starttde script by default.
-- Ivan E. Moore II <rkrusty@debian.org> Thu, 27 Sep 2001 12:13:00 -0700
@@ -4056,7 +4056,7 @@ tdebase (4:2.2.0-0beta1-1) unstable; urgency=low
* Provide man link from kdm to chooser
* More build cleanup..take more of the automation out to make sure things
are constant
- * Remove custom startkde
+ * Remove custom starttde
* Revert old overrides so we can start from scratch
* Add in new python-base dependency
* New packages: kate, tdebase-audiolibs (so that those without sound do
@@ -4068,7 +4068,7 @@ tdebase (4:2.2.0-0beta1-1) unstable; urgency=low
* And let's list the bugs fixed...
ctrl-u problems with location bar fixed (Closes: #81425)
image transparency fixed for konsole on startup (Closes: #84062)
- fixes kwin's conflicting key accelerators (Closes: #86370)
+ fixes twin's conflicting key accelerators (Closes: #86370)
fixes rendering error for www.bluesnews.com (Closes: #79800)
fixes button problems for katalog.ub.uni-heidelberg.de (Closes: #88934)
now provides the audiocd ioslave bits which allow for ripping audio
@@ -4134,7 +4134,7 @@ tdebase (4:2.1.1-3) unstable; urgency=low
tdebase (4:2.1.1-2) unstable; urgency=low
- * Move startkde script into /etc/kde2 so that it will be a conffile and
+ * Move starttde script into /etc/kde2 so that it will be a conffile and
link it back to /usr/bin/kde2. (Closes: #91787)
* Build on older libc
* Adding in recommends for klisa
@@ -4410,7 +4410,7 @@ tdebase (4:2.1-20001213-1) unstable; urgency=low
* Fix whatis typo (Closes: #78178)
* Fix segfaults (Closes: #78903)
* Adding in a Recommend for kview to konqueror (Closes: #79201)
- * Changing x-window-manager alternative from kde2 to kwin
+ * Changing x-window-manager alternative from kde2 to twin
* KDM init.d script cleanup (Closes: #79320)
* Fixed default kdmrc script to show new options
* Adding in a kwm script for non-session launches
@@ -4546,7 +4546,7 @@ tdebase (4:2.0-20001008-0) unstable; urgency=low
tdebase (4:2.0-20001006-1) unstable; urgency=low
* More upstream fixes
- * Applying tdebase-1.94-kwin-nofreeze-20000924.diff patch (Closes: #74051)
+ * Applying tdebase-1.94-twin-nofreeze-20000924.diff patch (Closes: #74051)
-- Ivan E. Moore II <rkrusty@debian.org> Sun, 08 Oct 2000 03:30:00 -0700
@@ -5057,9 +5057,9 @@ tdebase (1:Beta2-2.1) experimental; urgency=low
tdebase (1:Beta2-2) unstable; urgency=low
- * fixed kde / startkde script. added minimal documentation.
+ * fixed kde / starttde script. added minimal documentation.
* fixed klock permissions.
- * removed startkde script.
+ * removed starttde script.
* removed virtual package names.
* fixed utmp file location in kvt.
diff --git a/debian/squeeze/tdebase/debian/control b/debian/squeeze/tdebase/debian/control
index dd8d15912..28d7b6ba9 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,14 +429,14 @@ 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
This package contains the KDE session manager. It is responsible for
restoring your KDE session on login. It is also needed to properly
start a KDE session. It registers KDE with X display managers, and
- provides the 'startkde' command, for starting an X session with KDE
+ provides the 'starttde' command, for starting an X session with KDE
from the console.
.
If you are running KDE for the first time for a certain user,
@@ -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..58861a14d 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,14 +421,14 @@ Package: ksmserver
Section: kde
Architecture: any
Provides: x-session-manager
-Depends: ${shlibs:Depends}, kwin (= ${Source-Version}) | x-window-manager
+Depends: ${shlibs:Depends}, twin (= ${Source-Version}) | x-window-manager
Recommends: kpersonalizer (= ${Source-Version})
Replaces: tdebase (<< 4:3.0.0)
Description: session manager for KDE
This package contains the KDE session manager. It is responsible for
restoring your KDE session on login. It is also needed to properly
start a KDE session. It registers KDE with X display managers, and
- provides the 'startkde' command, for starting an X session with KDE
+ provides the 'starttde' command, for starting an X session with KDE
from the console.
.
If you are running KDE for the first time for a certain user,
@@ -489,7 +489,7 @@ Description: useful tips for KDE
This package is part of KDE, and a component of the KDE base module.
See the 'kde' and 'tdebase' packages for more information.
-Package: kwin
+Package: twin
Section: kde
Architecture: any
Depends: ${shlibs:Depends}
diff --git a/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/ksmserver-trinity.install b/debian/squeeze/tdebase/debian/ksmserver-trinity.install
index 0946d8a57..f8c0aa867 100644
--- a/debian/squeeze/tdebase/debian/ksmserver-trinity.install
+++ b/debian/squeeze/tdebase/debian/ksmserver-trinity.install
@@ -1,5 +1,5 @@
debian/tmp/opt/trinity/bin/ksmserver
-debian/tmp/opt/trinity/bin/startkde
+debian/tmp/opt/trinity/bin/starttde
debian/tmp/opt/trinity/lib/trinity/ksmserver.la
debian/tmp/opt/trinity/lib/trinity/ksmserver.so
debian/tmp/opt/trinity/lib/libtdeinit_ksmserver.so
diff --git a/debian/squeeze/tdebase/debian/ksmserver-trinity.manpages b/debian/squeeze/tdebase/debian/ksmserver-trinity.manpages
index 05b93960e..354e23800 100644
--- a/debian/squeeze/tdebase/debian/ksmserver-trinity.manpages
+++ b/debian/squeeze/tdebase/debian/ksmserver-trinity.manpages
@@ -1 +1 @@
-debian/man/startkde-trinity.1
+debian/man/starttde-trinity.1
diff --git a/debian/squeeze/tdebase/debian/ksmserver-trinity.postinst b/debian/squeeze/tdebase/debian/ksmserver-trinity.postinst
index 6492cbb59..f5d73b934 100644
--- a/debian/squeeze/tdebase/debian/ksmserver-trinity.postinst
+++ b/debian/squeeze/tdebase/debian/ksmserver-trinity.postinst
@@ -20,9 +20,9 @@ set -e
case "$1" in
configure)
update-alternatives --install /usr/bin/x-session-manager \
- x-session-manager /opt/trinity/bin/startkde 40 \
+ x-session-manager /opt/trinity/bin/starttde 40 \
--slave /opt/trinity/share/man/man1/x-session-manager.1.gz \
- x-session-manager.1.gz "/opt/trinity/share/man/man1/startkde-trinity.1.gz"
+ x-session-manager.1.gz "/opt/trinity/share/man/man1/starttde-trinity.1.gz"
;;
diff --git a/debian/squeeze/tdebase/debian/ksmserver-trinity.preinst b/debian/squeeze/tdebase/debian/ksmserver-trinity.preinst
index 73ee5043a..884257d03 100644
--- a/debian/squeeze/tdebase/debian/ksmserver-trinity.preinst
+++ b/debian/squeeze/tdebase/debian/ksmserver-trinity.preinst
@@ -4,7 +4,7 @@ case "$1" in
upgrade)
rm -f /etc/gdm/Sessions/KDE
- rm -f /etc/trinity/debian/startkde
+ rm -f /etc/trinity/debian/starttde
/usr/sbin/update-alternatives --remove x-session-manager /usr/bin/kde2
/usr/sbin/update-alternatives --remove x-session-manager /usr/bin/trinity
mkdir -p /usr/share/autostart
diff --git a/debian/squeeze/tdebase/debian/ksmserver-trinity.prerm b/debian/squeeze/tdebase/debian/ksmserver-trinity.prerm
index 11b4bc08a..e9be94522 100644
--- a/debian/squeeze/tdebase/debian/ksmserver-trinity.prerm
+++ b/debian/squeeze/tdebase/debian/ksmserver-trinity.prerm
@@ -19,7 +19,7 @@ set -e
case "$1" in
remove)
- /usr/sbin/update-alternatives --remove x-session-manager /usr/trinity/bin/startkde
+ /usr/sbin/update-alternatives --remove x-session-manager /usr/trinity/bin/starttde
dpkg-divert --rename --remove /usr/share/autostart/plasma.desktop
;;
diff --git a/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/ubuntu/maverick/tdebase/debian/man/startkde-trinity.1 b/debian/squeeze/tdebase/debian/man/starttde-trinity.1
index f26b7f128..76c31c9ba 100644
--- a/ubuntu/maverick/tdebase/debian/man/startkde-trinity.1
+++ b/debian/squeeze/tdebase/debian/man/starttde-trinity.1
@@ -1,26 +1,26 @@
-.TH startkde 1 "Jan 17, 2005"
+.TH starttde 1 "Jan 17, 2005"
.SH NAME
-startkde \- Starts up the KDE Desktop Environment
+starttde \- Starts up the KDE Desktop Environment
.SH SYNOPSIS
-.B startkde
+.B starttde
.br
.SH DESCRIPTION
This manual page documents briefly the
-.B startkde
+.B starttde
command.
This manual page was written for the Debian distribution
because the original program does not have a manual page.
.PP
-The \fBstartkde\fP script starts up the K Desktop Environment and
+The \fBstarttde\fP script starts up the K Desktop Environment and
is typically executed by your login manager (e.g. xdm, gdm, kdm, wdm or from
-your X startup scripts). \fBstartkde\fP in turn launches ksmserver, which
+your X startup scripts). \fBstarttde\fP in turn launches ksmserver, which
will load your last session, or a default session that includes the standard
KDE programs if no saved session is available.
-\fBstartkde\fP, with ksmserver, is a standard X11R6 session manager that can manage
+\fBstarttde\fP, with ksmserver, is a standard X11R6 session manager that can manage
any X11R6 SM compliant program.
-\fBstartkde\fP and ksmserver use the contents of the ~/.kde directory
+\fBstarttde\fP and ksmserver use the contents of the ~/.kde directory
for starting previously saved sessions. Source scripts found in ~/.kde/env/*.sh
can be used to define environment variables that will be available to all KDE
programs.
@@ -32,15 +32,15 @@ At the end of a session, the scripts found in ~/.kde/shutdown will be executed.
.SH OPTIONS
-\fBstartkde\fP takes no command line options.
+\fBstarttde\fP takes no command line options.
.SH AUTHOR
-\fBstartkde\fP is written by the KDE Project.
+\fBstarttde\fP is written by the KDE Project.
This manual page was written by Philipp Grau.
.SH "REPORTING BUGS"
-Report bugs of this modified Debian version of startkde to the Bug
+Report bugs of this modified Debian version of starttde to the Bug
Tracking System at: http://bugs.debian.org
.SH COPYRIGHT
Copyright \(co 2005 Philipp Grau.
diff --git a/debian/lenny/tdebase/debian/patches/disable_startkde_wallpaper.diff b/debian/squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff
index 838bbec11..0eebed280 100644
--- a/debian/lenny/tdebase/debian/patches/disable_startkde_wallpaper.diff
+++ b/debian/squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff
@@ -1,5 +1,5 @@
---- startkde
-+++ startkde
+--- starttde
++++ starttde
@@ -184,17 +184,17 @@
. $kdehome/share/config/startupconfig
fi
diff --git a/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/man/kstartupconfig-trinity.1 b/debian/squeeze/tdelibs/debian/man/kstartupconfig-trinity.1
index dca82fb5e..57ae12c1d 100644
--- a/debian/squeeze/tdelibs/debian/man/kstartupconfig-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/kstartupconfig-trinity.1
@@ -8,7 +8,7 @@ kstartupconfig, kdostartupconfig
.sp 1
\fBkdostartupconfig\fP
.SH DESCRIPTION
-\fBkstartupconfig\fP loads configuration options for use in \fBstartkde\fP. It saves loading time as there is no need to launch programs linked to KDE libraries. \fBstartupconfig\fP uses a cache of some Kconfig options that are updated by \fBkdostartupconfig\fP. The cache is implemented as script file that is sourced and provides the options as shell variables.
+\fBkstartupconfig\fP loads configuration options for use in \fBstarttde\fP. It saves loading time as there is no need to launch programs linked to KDE libraries. \fBstartupconfig\fP uses a cache of some Kconfig options that are updated by \fBkdostartupconfig\fP. The cache is implemented as script file that is sourced and provides the options as shell variables.
.sp 1
The configuration options to load are stored in \fIstartupconfigkeys\fP as one option per line. They follow the format <file> <group> <key> <default>. A complete group is addressed as <file> [<group>]. The configuration options are processed in the specified order so the missing default values for groups can be specified as single options after the group option.
.sp 1
@@ -42,7 +42,7 @@ configuration options and files they belong to
.I $KDEHOME/share/config/startupconfigkeys
configuration options to load
.SH SEE ALSO
-.BR kconf_update (1),\ startkde (1)
+.BR kconf_update (1),\ starttde (1)
.SH AUTHORS
.nf
Lubos Lunak <l.lunak@kde.org>
diff --git a/debian/squeeze/tdelibs/debian/man/lnusertemp-trinity.sgml b/debian/squeeze/tdelibs/debian/man/lnusertemp-trinity.sgml
index c40c64520..d4a7162d1 100644
--- a/debian/squeeze/tdelibs/debian/man/lnusertemp-trinity.sgml
+++ b/debian/squeeze/tdelibs/debian/man/lnusertemp-trinity.sgml
@@ -105,7 +105,7 @@ manpage.1: manpage.sgml
attacks. </para>
<para><command>&dhpackage;</command> is usually called by the
- <command>startkde</command> script.</para>
+ <command>starttde</command> script.</para>
</refsect1>
<refsect1>
diff --git a/debian/squeeze/tdelibs/debian/man/tdeinit-trinity.1 b/debian/squeeze/tdelibs/debian/man/tdeinit-trinity.1
index 1c3861783..63c5935b6 100644
--- a/debian/squeeze/tdelibs/debian/man/tdeinit-trinity.1
+++ b/debian/squeeze/tdelibs/debian/man/tdeinit-trinity.1
@@ -10,7 +10,7 @@ tdeinit
.sp 1
\fBtdeinit\fP is used to start all other KDE programs. It can start binary program files as well as tdeinit loadable modules (KLMs).
.sp 1
-When \fBtdeinit\fP starts for the first time it launches \fBdcopserver\fP, \fBklauncher\fP, \fBkded\fP and some additional programs specified on its command line in the \fBstartkde\fP script (normally \fBkcminit\fP and \fBknotify\fP).
+When \fBtdeinit\fP starts for the first time it launches \fBdcopserver\fP, \fBklauncher\fP, \fBkded\fP and some additional programs specified on its command line in the \fBstarttde\fP script (normally \fBkcminit\fP and \fBknotify\fP).
.sp 1
The \fBtdeinit\fP master process can be used to start additional KDE programs via \fBtdeinit_wrapper\fP, \fBkshell\fP and \fBkwrapper\fP.
.sp 1
@@ -29,7 +29,7 @@ Terminate when no KDE applications are left running
.I /usr/lib/trinity
directory with KLMs (tdeinit loadable modules)
.SH SEE ALSO
-.BR dcopserver (1),\ kded (1),\ kcminit (1),\ tdeinit_wrapper (1),\ klauncher (1),\ kshell (1),\ kwrapper (1),\ startkde (1)
+.BR dcopserver (1),\ kded (1),\ kcminit (1),\ tdeinit_wrapper (1),\ klauncher (1),\ kshell (1),\ kwrapper (1),\ starttde (1)
.SH AUTHORS
.nf
Waldo Bastian <bastian@kde.org>
diff --git a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install
index 8f84589d6..eeb111f96 100644
--- a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -232,7 +232,7 @@ debian/tmp/opt/trinity/include/tdesu/ssh.h
debian/tmp/opt/trinity/include/tdesu/stub.h
debian/tmp/opt/trinity/include/tdesu/su.h
debian/tmp/opt/trinity/include/kde_terminal_interface.h
-debian/tmp/opt/trinity/include/kdeversion.h
+debian/tmp/opt/trinity/include/tdeversion.h
debian/tmp/opt/trinity/include/kdialogbase.h
debian/tmp/opt/trinity/include/kdialog.h
debian/tmp/opt/trinity/include/kdirlister.h
@@ -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/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec b/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec
index b561200b4..1c45101ff 100644
--- a/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec
+++ b/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec
@@ -5,7 +5,7 @@
%else
%define version 0.8
%endif
-%define release 1
+%define release 2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@@ -77,7 +77,7 @@ Development headers for knetworkmanager
cd knetworkmanager-0.*/src
%patch0 -p3
-%patch1 -p3
+#patch1 -p3
@@ -142,5 +142,8 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%{tde_libdir}/*.so
%changelog
-* Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1
+* Sat Nov 13 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-2 / 0.9-2
+- Remove faulty patch for WPA authentication
+
+* Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1 / 0.9-1
- Initial build
diff --git a/redhat/dependencies/arts/arts-3.5.13-enable_oss.patch b/redhat/dependencies/arts/arts-3.5.13-enable_oss.patch
index 0a6ab7c83..ca89ed76c 100644
--- a/redhat/dependencies/arts/arts-3.5.13-enable_oss.patch
+++ b/redhat/dependencies/arts/arts-3.5.13-enable_oss.patch
@@ -1,15 +1,6 @@
---- arts.3513/config.h.cmake.ORI 2011-11-12 00:33:38.784907854 +0100
-+++ arts.3513/config.h.cmake 2011-11-12 00:33:55.548557832 +0100
-@@ -28,3 +28,7 @@
- #cmakedefine HAVE_SND_PCM_RESUME 1
- #cmakedefine ALSA_PCM_OLD_SW_PARAMS_API 1
- #cmakedefine ALSA_PCM_OLD_HW_PARAMS_API 1
-+
-+#cmakedefine HAVE_SYS_SOUNDCARD_H 1
-+#cmakedefine HAVE_LIBPTHREAD 1
-+#define HAVE_IOCTL_INT_ULONGINT_DOTS 3
---- arts.3513/artsc/CMakeLists.txt.ORI 2011-11-12 00:50:03.023418039 +0100
-+++ arts.3513/artsc/CMakeLists.txt 2011-11-12 00:50:19.776070197 +0100
+diff -Nuar arts.ORI/artsc/CMakeLists.txt arts.PATCHED/artsc/CMakeLists.txt
+--- arts.ORI/artsc/CMakeLists.txt 2011-06-12 07:57:03.000000000 +0200
++++ arts.PATCHED/artsc/CMakeLists.txt 2011-11-14 21:53:12.000000000 +0100
@@ -43,6 +43,7 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
@@ -27,8 +18,69 @@
DESTINATION ${LIB_INSTALL_DIR}
)
---- arts.3513/flow/CMakeLists.txt.ORI 2011-11-12 00:56:01.582978475 +0100
-+++ arts.3513/flow/CMakeLists.txt 2011-11-12 00:56:14.392712888 +0100
+diff -Nuar arts.ORI/CMakeLists.txt arts.PATCHED/CMakeLists.txt
+--- arts.ORI/CMakeLists.txt 2011-03-28 04:09:15.000000000 +0200
++++ arts.PATCHED/CMakeLists.txt 2011-11-14 21:53:46.000000000 +0100
+@@ -33,6 +33,7 @@
+ option( WITH_AUDIOFILE "Enable audiofile (wav) support" ON )
+ option( WITH_VORBIS "Enable Ogg/Vorbis support" ON )
+ option( WITH_MAD "Enable MAD mp3 decoder support" ON )
++option( WITH_ESOUND "Enable ESOUND support" OFF )
+
+
+ ##### paths setup ###############################
+@@ -58,6 +59,8 @@
+ check_include_file( "malloc.h" HAVE_MALLOC_H )
+ check_include_file( "memory.h" HAVE_MEMORY_H )
+ check_include_file( "dlfcn.h" HAVE_DLFCN_H )
++check_include_file( "sys/soundcard.h" HAVE_SYS_SOUNDCARD_H )
++check_include_file( "pthread.h" HAVE_LIBPTHREAD )
+
+
+ ##### check for system libraries ################
+@@ -145,6 +148,21 @@
+ endif( WITH_ALSA )
+
+
++##### check for esound #######################
++
++set( HAVE_LIBESD 0 )
++if( WITH_ESOUND )
++
++ pkg_search_module( ESOUND esound )
++ if( ESOUND_FOUND )
++ set( HAVE_LIBESD 1 )
++ else( ESOUND_FOUND )
++ message(FATAL_ERROR "\nESOUND support is requested, but `libesd` not found" )
++ endif( ESOUND_FOUND )
++
++endif( WITH_ESOUND )
++
++
+ ##### check for glib/gthread modules ############
+
+ pkg_search_module( GLIB2 glib-2.0 )
+diff -Nuar arts.ORI/config.h.cmake arts.PATCHED/config.h.cmake
+--- arts.ORI/config.h.cmake 2010-10-12 03:53:06.000000000 +0200
++++ arts.PATCHED/config.h.cmake 2011-11-14 22:00:50.000000000 +0100
+@@ -23,8 +23,14 @@
+
+ #cmakedefine HAVE_LIBAUDIOFILE 1
+
++#cmakedefine HAVE_LIBESD 1
++
+ #cmakedefine HAVE_LIBASOUND2 1
+ #cmakedefine HAVE_ALSA_ASOUNDLIB_H 1
+ #cmakedefine HAVE_SND_PCM_RESUME 1
+ #cmakedefine ALSA_PCM_OLD_SW_PARAMS_API 1
+ #cmakedefine ALSA_PCM_OLD_HW_PARAMS_API 1
++
++#cmakedefine HAVE_SYS_SOUNDCARD_H 1
++#cmakedefine HAVE_LIBPTHREAD 1
++#define HAVE_IOCTL_INT_ULONGINT_DOTS 3
+diff -Nuar arts.ORI/flow/CMakeLists.txt arts.PATCHED/flow/CMakeLists.txt
+--- arts.ORI/flow/CMakeLists.txt 2011-10-04 04:01:15.000000000 +0200
++++ arts.PATCHED/flow/CMakeLists.txt 2011-11-14 21:53:12.000000000 +0100
@@ -15,6 +15,7 @@
include_directories(
@@ -37,8 +89,34 @@
${CMAKE_BINARY_DIR}/mcop
${CMAKE_SOURCE_DIR}/mcop
${CMAKE_CURRENT_BINARY_DIR}
---- arts.3513/mcop_mt/CMakeLists.txt.ORI 2011-11-12 00:59:06.148132592 +0100
-+++ arts.3513/mcop_mt/CMakeLists.txt 2011-11-12 01:16:08.584636258 +0100
+diff -Nuar arts.ORI/mcop/CMakeLists.txt arts.PATCHED/mcop/CMakeLists.txt
+--- arts.ORI/mcop/CMakeLists.txt 2010-10-12 03:53:05.000000000 +0200
++++ arts.PATCHED/mcop/CMakeLists.txt 2011-11-14 22:04:29.000000000 +0100
+@@ -12,11 +12,11 @@
+ configure_file( arts_export.h.in arts_export.h )
+
+ if( NOT EXTENSION_DIR )
+- set( EXTENSION_DIR ${CMAKE_INSTALL_PREFIX}/lib )
++ set( EXTENSION_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+ endif( NOT EXTENSION_DIR )
+
+ if( NOT DTRADER_DIR )
+- set( DTRADER_DIR ${CMAKE_INSTALL_PREFIX}/lib/mcop )
++ set( DTRADER_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/mcop )
+ endif( NOT DTRADER_DIR )
+
+ add_definitions(
+@@ -66,6 +66,6 @@
+ tde_add_library( ${target} SHARED
+ SOURCES ${${target}_SRCS}
+ VERSION 1.0.0
+- LINK ltdlc-static
++ LINK ltdlc-static ${ESOUND_LIBRARIES}
+ DESTINATION ${LIB_INSTALL_DIR}
+ )
+diff -Nuar arts.ORI/mcop_mt/CMakeLists.txt arts.PATCHED/mcop_mt/CMakeLists.txt
+--- arts.ORI/mcop_mt/CMakeLists.txt 2010-10-12 03:53:05.000000000 +0200
++++ arts.PATCHED/mcop_mt/CMakeLists.txt 2011-11-14 21:53:12.000000000 +0100
@@ -11,6 +11,11 @@
include_directories(
@@ -59,14 +137,3 @@
+ LINK artsflow-shared pthread
DESTINATION ${LIB_INSTALL_DIR}
)
---- arts/CMakeLists.txt.ORI 2011-11-12 01:20:34.671118554 +0100
-+++ arts/CMakeLists.txt 2011-11-12 01:22:04.857248409 +0100
-@@ -58,6 +58,8 @@
- check_include_file( "malloc.h" HAVE_MALLOC_H )
- check_include_file( "memory.h" HAVE_MEMORY_H )
- check_include_file( "dlfcn.h" HAVE_DLFCN_H )
-+check_include_file( "sys/soundcard.h" HAVE_SYS_SOUNDCARD_H )
-+check_include_file( "pthread.h" HAVE_LIBPTHREAD )
-
-
- ##### check for system libraries ################
diff --git a/redhat/dependencies/arts/trinity-arts-3.5.13.spec b/redhat/dependencies/arts/trinity-arts-3.5.13.spec
index 69ff66ea5..297db868e 100755
--- a/redhat/dependencies/arts/trinity-arts-3.5.13.spec
+++ b/redhat/dependencies/arts/trinity-arts-3.5.13.spec
@@ -83,9 +83,15 @@ cd build
%cmake \
-DINCLUDE_INSTALL_DIR=%{_includedir}/arts \
-DPKGCONFIG_INSTALL_DIR=%{_libdir}/pkgconfig \
+ -DWITH_ALSA=ON \
+ -DWITH_AUDIOFILE=ON \
+ -DWITH_VORBIS=ON \
-DWITH_MAD=OFF \
+ -DWITH_ESOUND=ON \
..
+#cp -f /tmp/config.h .
+
%__make %{?_smp_mflags}
%install
@@ -125,6 +131,9 @@ cd build
%changelog
+* Mon Nov 14 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
+- Enables OSS and ESD support
+
* Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
- Add missing BuildRequires
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec
index 02e7734f1..27a167636 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec
@@ -37,8 +37,6 @@ BuildRequires: gcc-c++
BuildRequires: dbus-devel
BuildRequires: tqtinterface-devel
-#Provides: dbus-1-qt
-
%description
Dbus TQT Interface
@@ -54,7 +52,7 @@ Development files for %{name}
%prep
%setup -q -n dependencies/%{name}
-%patch0 -p1
+#patch0 -p1
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
diff --git a/redhat/genrpm.sh b/redhat/genrpm.sh
index d54c88c21..c0627d032 100755
--- a/redhat/genrpm.sh
+++ b/redhat/genrpm.sh
@@ -5,6 +5,7 @@ cd "$( dirname "$0" )"
while [ $# -gt 0 ]; do
case "$1" in
"--auto") AUTO=1;;
+ "--version") REQVERSION="$2"; shift;;
*) COMP="$1";;
esac
shift
@@ -12,6 +13,7 @@ done
clear
cat <<EOF
+$(< /etc/redhat-release) $(uname -m)
This script generates RPM of TDE from source tarball.
Please choose a TDE component to build.
@@ -38,7 +40,11 @@ VERSION=$( awk '{ if ($1 == "'${COMP}'") { print $2; } }' components.txt )
# If no version is set in text file, get version number from source tarball name
if [ -z "${VERSION}" ]; then
- set $( cd "${COMP}"; echo ${COMP##*/}*.tar.gz)
+ if [ -n "${REQVERSION}" ]; then
+ set $( cd "${COMP}"; echo ${COMP##*/}*-${REQVERSION}.tar.gz)
+ else
+ set $( cd "${COMP}"; echo ${COMP##*/}*.tar.gz)
+ fi
if [ $# -gt 1 ]; then
select VERSION in $*; do break; done
elif [ -r "${COMP}/$1" ]; then
@@ -59,7 +65,12 @@ fi
# Chooses a spec file (if many)
set $( cd "${COMP}"; echo *.spec )
if [ $# -gt 1 ]; then
- select SPEC in $*; do break; done
+ if [ -n "${REQVERSION}" ]; then
+ set $( cd "${COMP}"; echo *-${REQVERSION}.spec )
+ SPEC="$1"
+ else
+ select SPEC in $*; do break; done
+ fi
elif [ -r "${COMP}/$1" ]; then
SPEC="$1"
else
@@ -86,7 +97,9 @@ esac
if [ "$(rpm -q --qf '%{arch}' kernel)" = "i686" ]; then
ARGS="${ARGS} --target=i686"
fi
-
+
+LOGFILE=/tmp/log.${COMP##*/}
+
set -x
(
rpmbuild -ba \
@@ -95,6 +108,18 @@ rpmbuild -ba \
--define "version ${VERSION:-3.5.13}" \
$ARGS \
${COMP}/${SPEC} || exit 1
-) 2>&1 | tee /tmp/log
+) 2>&1 | tee ${LOGFILE}
+RET=$?
set +x
+if [ ${RET} -gt 0 ]; then
+ exit ${RET}
+fi
+
+if grep -q "error: Failed build dependencies:" ${LOGFILE}; then
+# DEPS=$( sed -n -e "/.* is needed by .*/ s/^[ \t]*\([a-zA-Z2-9_-]*\) .*/\1/p" ${LOGFILE} )
+ set $( grep " is needed by " ${LOGFILE} | cut -d " " -f1 )
+ exit 2
+fi
+
+
diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec
index f5ff987a7..faf8d13ad 100644
--- a/redhat/kdebase/trinity-kdebase-3.5.13.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec
@@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
-%define release 6
+%define release 7
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@@ -63,29 +63,32 @@ Patch8: kdebase-3.5.13-startkde_ldpreload.patch
Patch9: kdebase-3.5.13-mediamanager_ftbfs.patch
## [kdebase/kicker/kicker/ui]
Patch10: kdebase-3.5.12-kickoff_unstable.patch
+## [kdebase/startkde] Sets default Start Icon in 'kickerrc'
+Patch11: kdebase-3.5.13-startkde_icon.patch
+
# Fedora 15 Theme: "Lovelock"
%if 0%{?fedora} == 15
Requires: lovelock-backgrounds-single
-%define kde_bg /usr/share/backgrounds/lovelock/default/standard/lovelock.png
+%define tde_bg /usr/share/backgrounds/lovelock/default/standard/lovelock.png
%endif
# Fedora 16 Theme: "Verne"
%if 0%{?fedora} == 16
Requires: verne-backgrounds-single
-%define kde_bg /usr/share/backgrounds/verne/default/standard/verne.png
+%define tde_bg /usr/share/backgrounds/verne/default/standard/verne.png
%endif
# RHEL 5 Theme
%if 0%{?rhel} == 5
Requires: desktop-backgrounds-basic
-%define kde_bg /usr/share/backgrounds/images/default.jpg
+%define tde_bg /usr/share/backgrounds/images/default.jpg
%endif
# RHEL 6 Theme
%if 0%{?rhel} == 6
Requires: redhat-logos
-%define kde_bg /usr/share/backgrounds/default.png
+%define tde_bg /usr/share/backgrounds/default.png
%endif
BuildRequires: tqtinterface-devel
@@ -217,20 +220,21 @@ Protocol handlers (KIOslaves) for personal information management, including:
cd kicker/kicker
%patch10 -p0
cd -
+%patch11 -p1
# Applies an optional distro-specific graphical theme
-%if "%{?kde_bg}" != ""
+%if "%{?tde_bg}" != ""
# KDM Background
%__sed -i "kdm/kfrontend/genkdmconf.c" \
- -e 's,"Wallpaper=isadora.png\n","Wallpaper=%{kde_bg}\n",'
+ -e 's,"Wallpaper=isadora.png\n","Wallpaper=%{tde_bg}\n",'
# TDE user default background
%__sed -i "kpersonalizer/keyecandypage.cpp" \
- -e 's,#define DEFAULT_WALLPAPER "isadora.png",#define DEFAULT_WALLPAPER "%{kde_bg}",'
+ -e 's,#define DEFAULT_WALLPAPER "isadora.png",#define DEFAULT_WALLPAPER "%{tde_bg}",'
%__sed -i "startkde" \
- -e 's,/usr/share/wallpapers/isadora.png.desktop,%{kde_bg},' \
- -e 's,Wallpaper=isadora.png,Wallpaper=%{kde_bg},'
+ -e 's,/usr/share/wallpapers/isadora.png.desktop,%{tde_bg},' \
+ -e 's,Wallpaper=isadora.png,Wallpaper=%{tde_bg},'
%endif
%build
@@ -579,6 +583,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%{_datadir}/cmake/*.cmake
%changelog
+* Sun Nov 13 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-7
+- Add distribution-specific start button icon
+
* Sat Nov 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6
- Add graphical theme for RHEL 5, RHEL 6, Fedora 15, Fedora 16
- Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
index 5c2652f17..abbb9a047 100755
--- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
+++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
@@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
-%define release 2
+%define release 3
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@@ -145,6 +145,13 @@ cat <<EOF >%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf
%{tde_libdir}
EOF
+# Moves the XDG configuration files to TDE directory
+%__install -p -D -m644 \
+ "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" \
+ "%{?buildroot}%{_prefix}/etc/xdg/menus/kde-applications.menu"
+%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg"
+
+
%clean
%__rm -rf %{?buildroot}
@@ -258,8 +265,8 @@ EOF
%endif
%{_sysconfdir}/ld.so.conf.d/trinity.conf
-# Provided by 'redhat-menus' package
-%exclude %{_sysconfdir}/xdg/menus/applications.menu
+# Avoid conflict with 'redhat-menus' package
+%{_prefix}/etc/xdg/menus/kde-applications.menu
# New in TDE 3.5.13
%{_bindir}/kdetcompmgr
@@ -285,6 +292,9 @@ EOF
%changelog
+* Sat Nov 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
+- Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE
+
* Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
- Add missing BuildRequires
diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
index c6e1e9ac0..c595d542c 100644
--- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
+++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
@@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
-%define release 2
+%define release 3
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@@ -223,6 +223,13 @@ for dir in k* ; do
done
done
+# Moves the XDG configuration files to TDE directory
+%__install -p -D -m644 \
+ "%{?buildroot}%{_sysconfdir}/xdg/menus/applications-merged/kde-multimedia-music.menu" \
+ "%{?buildroot}%{_prefix}/etc/xdg/menus/applications-merged/trinity-multimedia-music.menu"
+%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg"
+
+
%post
/sbin/ldconfig
@@ -351,7 +358,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%exclude %{_datadir}/icons/crystalsvg/*/*/juk*
%exclude %{_datadir}/icons/hicolor/*/apps/juk.png
-/etc/xdg/menus/applications-merged/*
+%{_prefix}/etc/xdg/menus/applications-merged/*
%{_libdir}/mcop/*
%{_libdir}/libkdeinit_*.so
#%{_libdir}/liboggarts.so
@@ -404,6 +411,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%exclude %{_libdir}/libyafxplayer.so
%changelog
+* Sat Nov 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
+- Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE
+
* Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
- Updates BuildRequires
diff --git a/redhat/trinity-desktop/trinity-desktop.spec b/redhat/trinity-desktop/trinity-desktop.spec
index c109fd82b..1820928c9 100644
--- a/redhat/trinity-desktop/trinity-desktop.spec
+++ b/redhat/trinity-desktop/trinity-desktop.spec
@@ -44,6 +44,7 @@ Requires: trinity-kdepim >= %{version}
Requires: trinity-kdeutils >= %{version}
Requires: trinity-kdetoys >= %{version}
Requires: trinity-repo >= %{version}
+Requires: hal
%description
The TDE project aims to keep the KDE3.5 computing style alive, as well as
diff --git a/redhat/trinity-live/fedora-live-tde-base.ks b/redhat/trinity-live/fedora-live-tde-base.ks
index b56e5c92a..ed912dfff 100644
--- a/redhat/trinity-live/fedora-live-tde-base.ks
+++ b/redhat/trinity-live/fedora-live-tde-base.ks
@@ -9,8 +9,11 @@ repo --name=trinity-extras-noarch --baseurl=http://trinity.mangafrance.com/f$rel
%packages
### The KDE-Desktop
-
trinity-desktop
+hal
+
+# TDE is missing a Network Applet, so we use Gnome...
+NetworkManager-gnome
### fixes
@@ -81,6 +84,7 @@ touch /usr/share/icons/hicolor/
# Create user Desktop directory
mkdir -p /home/liveuser/Desktop
+mkdir -p /home/liveuser/Documents
# make sure to set the right permissions and selinux contexts
chown -R liveuser:liveuser /home/liveuser/
@@ -91,4 +95,19 @@ sed -i 's/PRELINKING=yes/PRELINKING=no/' /etc/sysconfig/prelink
EOF
+# Sets 'nm-applet' to run automatically
+mkdir -p /home/liveuser/.trinity/Autostart
+cat <<EOF >/home/liveuser/.trinity/Autostart/nm-applet
+#!/bin/sh
+
+# Waits until kicker is started, so that
+# nm-applet can dock correctly.
+while ! pidof kicker; do
+ sleep 1
+done
+sleep 3
+/usr/bin/nm-applet
+EOF
+chmod +x /home/liveuser/.trinity/Autostart/nm-applet
+
%end
diff --git a/redhat/trinity-live/fedora-livecd-tde.ks b/redhat/trinity-live/fedora-livecd-tde.ks
index 16c799d1f..88ab2f91a 100644
--- a/redhat/trinity-live/fedora-livecd-tde.ks
+++ b/redhat/trinity-live/fedora-livecd-tde.ks
@@ -10,6 +10,9 @@
%include fedora-live-tde-base.ks
%include fedora-live-minimization.ks
+# 3rd party for VLC
+#repo --name=atrpms --baseurl=http://dl.atrpms.net/f$releasever-$basearch/atrpms/stable
+
%packages
# Additional packages that are not default in trinity-desktop but useful
@@ -18,12 +21,13 @@ trinity-live-openbox
# Some TDE applications
trinity-amarok
-trinity-digikam
+#trinity-digikam
trinity-dolphin
trinity-gwenview
trinity-k3b
trinity-kaffeine
trinity-kbookreader
+#trinity-knetworkmanager
trinity-konversation
trinity-ksensors
trinity-kstreamripper
@@ -31,13 +35,19 @@ trinity-yakuake
# Some TDE translations
trinity-kde-i18n-French
-trinity-kde-i18n-German
-#trinity-kde-i18n-Spanish
+#trinity-kde-i18n-German
+trinity-kde-i18n-Spanish
trinity-kde-i18n-Chinese-Big5
+# 3rd party stuff
+#vlc
+
# Fedora stuff
fuse
liveusb-creator
+#wlassistant
+#wicd
+#wicd-gtk
### more desktop stuff
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..f19a0e4e8 100644
--- a/ubuntu/maverick/tdebase/debian/changelog
+++ b/ubuntu/maverick/tdebase/debian/changelog
@@ -105,7 +105,7 @@ tdebase-trinity (4:3.5.10-0ubuntu12) karmic; urgency=low
tdebase-trinity (4:3.5.10-0ubuntu11) karmic; urgency=low
- * Repaired startkde script to export DESKTOP_SESSION
+ * Repaired starttde script to export DESKTOP_SESSION
* Depends on libogg-dev-la
* Repaired gcc4.4 compilation problems
@@ -196,7 +196,7 @@ tdebase-trinity (4:3.5.10-0ubuntu3~intrepid19) intrepid; urgency=low
tdebase-trinity (4:3.5.10-0ubuntu3~intrepid18) intrepid; urgency=low
- * Added XDG_DATA_DIRS and KDEDIRS to startkde, as suggested by zekica on the Debian forums
+ * Added XDG_DATA_DIRS and KDEDIRS to starttde, as suggested by zekica on the Debian forums
-- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 07 Mar 2009 13:18:00 -0600
@@ -240,7 +240,7 @@ tdebase-trinity (4:3.5.10-0ubuntu3~intrepid3) intrepid; urgency=low
tdebase-trinity (4:3.5.10-0ubuntu3~intrepid1) intrepid; urgency=low
- * Removed link /usr/lib/libkonsolepart.so for python-trinity-trinity and altered startkde script to function properly with the new .trinity home directory
+ * Removed link /usr/lib/libkonsolepart.so for python-trinity-trinity and altered starttde script to function properly with the new .trinity home directory
-- Timothy Pearson <kb9vqf@pearsoncomputing.net> Fri, 05 Dec 2008 16:15:00 -0600
@@ -353,7 +353,7 @@ tdebase (4:3.5.9-0ubuntu5) hardy; urgency=low
tdebase (4:3.5.9-0ubuntu4) hardy; urgency=low
- * Remove kubuntu_9920_startkde_dash_stupidness.diff,
+ * Remove kubuntu_9920_starttde_dash_stupidness.diff,
Closes LP: #206187
-- Jonathan Riddell <jriddell@ubuntu.com> Tue, 25 Mar 2008 23:05:42 +0000
@@ -428,7 +428,7 @@ tdebase (4:3.5.8-2ubuntu17) hardy; urgency=low
tdebase (4:3.5.8-2ubuntu17) hardy; urgency=low
- * Added kubuntu_9920_startkde_dash_stupidness.diff:
+ * Added kubuntu_9920_starttde_dash_stupidness.diff:
- For some stupid reasons, env scripts are not parsed correctly
due dash. Hard to believe, but this patch fixes the issue...
- Closes LP: #189144
@@ -677,7 +677,7 @@ tdebase (4:3.5.7-2) unstable; urgency=low
* Add support or back references in klipper. Thanks to Sean Finney.
(Closes: #427843)
* Updated nb debconf translation. (Closes: #417942)
- * Fix typo in startkde manpage. Thanks A. Costa. (Closes: #432062)
+ * Fix typo in starttde manpage. Thanks A. Costa. (Closes: #432062)
* Fix typo in kdmrc. Thanks Greg. (Closes: #422142)
* Updated vi debconf translation. Thanks Clytie Siddall (Closes: #426820)
* Updated pt_BR debconf translation. Thanks Eder L. Marques.
@@ -967,7 +967,7 @@ tdebase (4:3.5.7-1) unstable; urgency=low
- Remove patch 21 - applied upstream.
- Adapt patch 27 - kfreebsd - minor changes.
- Adapt patch 41 - amd64 and nspluginviewer - small changes.
- - Remove patch 42 - kwin and 64 bit. applied upstream.
+ - Remove patch 42 - twin and 64 bit. applied upstream.
- Remove patch 44 - opengl logo is fixed.
- Remove patch 45 - keyboard handler - applied upstream.
@@ -1246,7 +1246,7 @@ tdebase (4:3.5.6-0ubuntu1) feisty; urgency=low
* New upstream release
* Remove patched applied upstream:
- - 02_hal_kwin_fixes_branch.diff
+ - 02_hal_twin_fixes_branch.diff
- 29_halbackend_fstab_improvements.diff
- 30_mediamanager_followsymlinks.diff
- 32_camera_icon_from_mimetype.diff
@@ -1417,7 +1417,7 @@ tdebase (4:3.5.5a.dfsg.1-5) unstable; urgency=high
non-linux archs (Closes: 399059)
+++ Changes by Modestas Vainius:
- * Fix 36_kwin.diff patch. In some cases clients were not properly added to
+ * Fix 36_twin.diff patch. In some cases clients were not properly added to
the group. (Closes: #404226)
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 29 Dec 2006 19:15:23 +0200
@@ -1429,7 +1429,7 @@ tdebase (4:3.5.5a.dfsg.1-4) unstable; urgency=low
(Closes: #399823, #384416)
+++ Changes by Ana Guerrero:
- * Applied patch to avoid kwin crashes when switching desktop
+ * Applied patch to avoid twin crashes when switching desktop
(Closes: #365829).
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 13 Dec 2006 13:09:33 +0100
@@ -2019,7 +2019,7 @@ tdebase (4:3.5.3-2) unstable; urgency=medium
tdebase (4:3.5.3-1) unstable; urgency=low
* New upstream release.
- + fix kwin alt-tab problems. (Closes: #363357, #361421, #361127)
+ + fix twin alt-tab problems. (Closes: #363357, #361421, #361127)
+ fix problems with systram. (Closes: #347320)
+++ Changes by Christopher Martin:
@@ -2132,7 +2132,7 @@ tdebase (4:3.5.1-1) unstable; urgency=low
* Enable zeroconf support in ksysguardd; add libavahi-compat-libdnssd-dev to
the build-depends. (Closes: #348583)
- * Merge startkde manpage (and maintainer script patch to fully integrate it)
+ * Merge starttde manpage (and maintainer script patch to fully integrate it)
from Philipp Grau. Thanks. (Closes: #348501)
* Upload to unstable.
@@ -2332,7 +2332,7 @@ tdebase (4:3.5.2-0ubuntu9) dapper; urgency=low
tdebase (4:3.5.2-0ubuntu8) dapper; urgency=low
- * Add kubuntu_58_kwin_branch.diff fixes crash on alt-tab and
+ * Add kubuntu_58_twin_branch.diff fixes crash on alt-tab and
focus policies
-- Jonathan Riddell <jriddell@ubuntu.com> Fri, 14 Apr 2006 15:35:56 +0000
@@ -2632,7 +2632,7 @@ tdebase (4:3.5-rc2-0ubuntu1) dapper; urgency=low
* kdm depends on xauth not xbase-clients
* Update 18_default_fonts.diff
* Generate .pot files
- * Remove kubuntu_26_startkde.diff, no need to start ivman in 3.5
+ * Remove kubuntu_26_starttde.diff, no need to start ivman in 3.5
-- Jonathan Riddell <jriddell@ubuntu.com> Mon, 21 Nov 2005 17:46:39 +0000
@@ -2644,7 +2644,7 @@ tdebase (4:3.5-rc1-1ubuntu1) dapper; urgency=low
* Update kubuntu_16_hide_kpager_menu_entry.diff
* Update kubuntu_19_kdm_zsh_emulate.diff
* Update kubuntu_25_kcontrol_only_in_kde.diff
- * Update kubuntu_30_startkde_background_colour.diff
+ * Update kubuntu_30_starttde_background_colour.diff
* Update kubuntu_32_usplash_console_font.diff
* konqueror replaces old kcontrol
@@ -2762,7 +2762,7 @@ tdebase (4:3.4.2-2) unstable; urgency=low
+++ Changes by Christopher Martin:
- * For tdebase-data, add conflicts against old versions of kcontrol, kwin,
+ * For tdebase-data, add conflicts against old versions of kcontrol, twin,
and kicker. This should prevent users from unwittingly upgrading
tdebase-data to 3.4.x, while the rest of KDE stays at the 3.3.x level.
This had resulted in kcontrol breaking and other assorted issues.
@@ -2800,7 +2800,7 @@ tdebase (4:3.4.2-1) unstable; urgency=low
* Add build-dependencies on libxss-dev, libxxf86misc-dev, libxau-dev,
libxdmcp-dev, libxcomposite-dev, libxdamage-dev, and prune the
07_xlibs-static-pic.diff accordingly, for the X.Org transition. kompmgr
- is also now built and installed with kwin.
+ is also now built and installed with twin.
* Tightened build dependency on dbus-qt-1-dev to force building against a
C++ transitioned version. Can be removed once dbus (>= 0.23.4-5) is
@@ -2905,7 +2905,7 @@ tdebase (4:3.4.2-0ubuntu4) breezy; urgency=low
on desktop icons
* Compile with GCC 3.4 on hppa, m68k, arm to prevent
internal compiler error
- * Add kubuntu_30_startkde_background_colour.diff to make default
+ * Add kubuntu_30_starttde_background_colour.diff to make default
background colour match default wallpaperchange background colour
* Do not install SVG icons to save space
* Install simple konqueror.rc into /usr/share/apps/konqueror, workaround
@@ -2971,7 +2971,7 @@ tdebase (4:3.4.1-0ubuntu3) breezy; urgency=low
* Update kubuntu_23_hal_api.diff
* Replace 19_kcontrol_only_in_kde.diff with kubuntu_25_kcontrol_only_in_kde.diff
which stops KControl displaying (use System Settings instead)
- * Add kubuntu_26_startkde.diff to start ivman
+ * Add kubuntu_26_starttde.diff to start ivman
* Add 25_khelp_htdig.diff from Debian
-- Jonathan Riddell <jriddell@ubuntu.com> Mon, 20 Jun 2005 09:15:07 +0000
@@ -3065,7 +3065,7 @@ tdebase (4:3.4.0-0pre4) alioth; urgency=low
Debian. (Closes: #246280)
* Make ksmserver Recommend kpersonalizer, since it is used when
- running KDE for the first time. Also patch startkde so it doesn't
+ running KDE for the first time. Also patch starttde so it doesn't
fail when kpersonalizer is not present. (Closes: #309803)
* Add manpages for kdialog (thanks to Bastian Kleineidam for tracking it
@@ -3107,7 +3107,7 @@ tdebase (4:3.3.2-1) unstable; urgency=low
+++ Changes by Adeodato Simó:
* debian/control:
- - make tdebase-dev depend on kwin for the libtdecorations.so ->
+ - make tdebase-dev depend on twin for the libtdecorations.so ->
libtdecorations.so.1.0.0 symlink. (Closes: #289544)
* Included Czech po-debconf translation by Miroslav Kure.
@@ -3276,7 +3276,7 @@ tdebase (4:3.4.0-0pre1ubuntu6) hoary; urgency=low
tdebase (4:3.4.0-0pre1ubuntu5) hoary; urgency=low
- * Add kwin conflicts with old tdeartwork-theme-window
+ * Add twin conflicts with old tdeartwork-theme-window
-- Jonathan Riddell <jr@jriddell.org> Tue, 8 Mar 2005 22:48:59 +0000
@@ -3312,7 +3312,7 @@ tdebase (4:3.3.2-0pre1) experimental; urgency=low
* KDE_3_3_BRANCH update. Includes the tdebase part of the fix
for CAN-2004-1158.
* Lower tdeprint's dependency on gv to a Suggests. (Closes: #269590)
- * kwin is now registered as an x-window-manager. (Closes: #249162)
+ * twin is now registered as an x-window-manager. (Closes: #249162)
* Added /usr/share/xsessions to KDM's default session path, so
.desktop files installed there are found.
(Closes: #243770, #247365, #247747, #250384)
@@ -3855,7 +3855,7 @@ tdebase (4:2.2.1-5) unstable; urgency=low
tdebase (4:2.2.1-4) unstable; urgency=low
* More upstream fixes
- * don't set background in startkde script by default.
+ * don't set background in starttde script by default.
-- Ivan E. Moore II <rkrusty@debian.org> Thu, 27 Sep 2001 12:13:00 -0700
@@ -4056,7 +4056,7 @@ tdebase (4:2.2.0-0beta1-1) unstable; urgency=low
* Provide man link from kdm to chooser
* More build cleanup..take more of the automation out to make sure things
are constant
- * Remove custom startkde
+ * Remove custom starttde
* Revert old overrides so we can start from scratch
* Add in new python-base dependency
* New packages: kate, tdebase-audiolibs (so that those without sound do
@@ -4068,7 +4068,7 @@ tdebase (4:2.2.0-0beta1-1) unstable; urgency=low
* And let's list the bugs fixed...
ctrl-u problems with location bar fixed (Closes: #81425)
image transparency fixed for konsole on startup (Closes: #84062)
- fixes kwin's conflicting key accelerators (Closes: #86370)
+ fixes twin's conflicting key accelerators (Closes: #86370)
fixes rendering error for www.bluesnews.com (Closes: #79800)
fixes button problems for katalog.ub.uni-heidelberg.de (Closes: #88934)
now provides the audiocd ioslave bits which allow for ripping audio
@@ -4134,7 +4134,7 @@ tdebase (4:2.1.1-3) unstable; urgency=low
tdebase (4:2.1.1-2) unstable; urgency=low
- * Move startkde script into /etc/kde2 so that it will be a conffile and
+ * Move starttde script into /etc/kde2 so that it will be a conffile and
link it back to /usr/bin/kde2. (Closes: #91787)
* Build on older libc
* Adding in recommends for klisa
@@ -4410,7 +4410,7 @@ tdebase (4:2.1-20001213-1) unstable; urgency=low
* Fix whatis typo (Closes: #78178)
* Fix segfaults (Closes: #78903)
* Adding in a Recommend for kview to konqueror (Closes: #79201)
- * Changing x-window-manager alternative from kde2 to kwin
+ * Changing x-window-manager alternative from kde2 to twin
* KDM init.d script cleanup (Closes: #79320)
* Fixed default kdmrc script to show new options
* Adding in a kwm script for non-session launches
@@ -4546,7 +4546,7 @@ tdebase (4:2.0-20001008-0) unstable; urgency=low
tdebase (4:2.0-20001006-1) unstable; urgency=low
* More upstream fixes
- * Applying tdebase-1.94-kwin-nofreeze-20000924.diff patch (Closes: #74051)
+ * Applying tdebase-1.94-twin-nofreeze-20000924.diff patch (Closes: #74051)
-- Ivan E. Moore II <rkrusty@debian.org> Sun, 08 Oct 2000 03:30:00 -0700
@@ -5057,9 +5057,9 @@ tdebase (1:Beta2-2.1) experimental; urgency=low
tdebase (1:Beta2-2) unstable; urgency=low
- * fixed kde / startkde script. added minimal documentation.
+ * fixed kde / starttde script. added minimal documentation.
* fixed klock permissions.
- * removed startkde script.
+ * removed starttde script.
* removed virtual package names.
* fixed utmp file location in kvt.
diff --git a/ubuntu/maverick/tdebase/debian/control b/ubuntu/maverick/tdebase/debian/control
index 13b0f584b..eef9136ec 100644
--- a/ubuntu/maverick/tdebase/debian/control
+++ b/ubuntu/maverick/tdebase/debian/control
@@ -14,7 +14,7 @@ Section: kde
Architecture: all
Replaces: tdebase-kde3 (<< 4:3.5.13)
Breaks: tdebase-kde3 (<< 4:3.5.13)
-Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-kio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), kwin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), hal-trinity | kfreebsd-gnu | hurd, xcalib
+Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-kio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), twin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), hal-trinity | kfreebsd-gnu | hurd, xcalib
Recommends: kdm-trinity (>= ${Source-Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity
Suggests: tdebase-trinity-doc-html (>= ${Source-Version})
Description: base components from the official KDE release
@@ -127,7 +127,7 @@ Section: kde
Architecture: all
Replaces: tdebase-data-kde3 (<< 4:3.5.13)
Breaks: tdebase-data-kde3 (<< 4:3.5.13)
-Conflicts: kcontrol-trinity (<< 4:3.4.2-1), kwin-trinity (<< 4:3.4.2-1), kicker-trinity (<< 4:3.4.2-1)
+Conflicts: kcontrol-trinity (<< 4:3.4.2-1), twin-trinity (<< 4:3.4.2-1), kicker-trinity (<< 4:3.4.2-1)
Description: shared data files for the KDE base module
This package contains the architecture-independent shared data files
needed for a basic KDE desktop installation.
@@ -140,7 +140,7 @@ Section: devel
Architecture: any
Replaces: tdebase-kde3-dev (<< 4:3.5.13)
Breaks: tdebase-kde3-dev (<< 4:3.5.13)
-Depends: kate-trinity (= ${Source-Version}), kcontrol-trinity (= ${Source-Version}), tdebase-trinity-bin (= ${Source-Version}), tdeprint-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), khelpcenter-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), klipper-trinity (= ${Source-Version}), kmenuedit-trinity (= ${Source-Version}), konqueror-nsplugins-trinity (= ${Source-Version}), konqueror-trinity (= ${Source-Version}), konsole-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version}), ksysguard-trinity (= ${Source-Version}), kwin-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: kate-trinity (= ${Source-Version}), kcontrol-trinity (= ${Source-Version}), tdebase-trinity-bin (= ${Source-Version}), tdeprint-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), khelpcenter-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), klipper-trinity (= ${Source-Version}), kmenuedit-trinity (= ${Source-Version}), konqueror-nsplugins-trinity (= ${Source-Version}), konqueror-trinity (= ${Source-Version}), konsole-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version}), ksysguard-trinity (= ${Source-Version}), twin-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
Description: development files for the KDE base module
This package contains headers and other development files needed to
compile software based on the KDE base module.
@@ -461,13 +461,13 @@ Architecture: any
Replaces: ksmserver-kde3 (<< 4:3.5.13)
Breaks: ksmserver-kde3 (<< 4:3.5.13)
Provides: x-session-manager
-Depends: ${shlibs:Depends}, tdebase-runtime-data-common-trinity, kwin-trinity (= ${Source-Version}) | x-window-manager
+Depends: ${shlibs:Depends}, tdebase-runtime-data-common-trinity, twin-trinity (= ${Source-Version}) | x-window-manager
Recommends: kpersonalizer-trinity (= ${Source-Version}), tde-ubuntu-integration
Description: session manager for KDE
This package contains the KDE session manager. It is responsible for
restoring your KDE session on login. It is also needed to properly
start a KDE session. It registers KDE with X display managers, and
- provides the 'startkde' command, for starting an X session with KDE
+ provides the 'starttde' command, for starting an X session with KDE
from the console.
.
If you are running KDE for the first time for a certain user,
@@ -532,11 +532,11 @@ Description: useful tips for KDE
This package is part of KDE, and a component of the KDE base module.
See the 'kde-trinity' and 'tdebase-trinity' packages for more information.
-Package: kwin-trinity
+Package: twin-trinity
Section: kde
Architecture: any
-Replaces: kwin-kde3 (<< 4:3.5.13)
-Breaks: kwin-kde3 (<< 4:3.5.13)
+Replaces: twin-kde3 (<< 4:3.5.13)
+Breaks: twin-kde3 (<< 4:3.5.13)
Depends: ${shlibs:Depends}
Provides: x-window-manager
Suggests: tdebase-trinity-bin (= ${Source-Version}), tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3}), kdesktop-trinity (= ${Source-Version}), kicker-trinity (= ${Source-Version}), kpager-trinity (= ${Source-Version}), kpersonalizer-trinity (= ${Source-Version}), ksmserver-trinity (= ${Source-Version}), ksplash-trinity (= ${Source-Version})
diff --git a/ubuntu/maverick/tdebase/debian/control.in b/ubuntu/maverick/tdebase/debian/control.in
index 107c75b66..58861a14d 100644
--- a/ubuntu/maverick/tdebase/debian/control.in
+++ b/ubuntu/maverick/tdebase/debian/control.in
@@ -13,7 +13,7 @@ XS-Vcs-Bzr: http://bazaar.launchpad.net/~kubuntu-members/tdebase/debian
Package: tdebase
Section: kde
Architecture: all
-Depends: kappfinder (>= ${Source-Version}), kate (>= ${Source-Version}), kcontrol (>= ${Source-Version}), tdebase-bin (>= ${Source-Version}), tdebase-data (>= ${Source-Version}), tdebase-kio-plugins (>= ${Source-Version}), kdepasswd (>= ${Source-Version}), tdeprint (>= ${Source-Version}), kdesktop (>= ${Source-Version}), kfind (>= ${Source-Version}), khelpcenter (>= ${Source-Version}), kicker (>= ${Source-Version}), klipper (>= ${Source-Version}), kmenuedit (>= ${Source-Version}), konqueror-nsplugins (>= ${Source-Version}), konqueror (>= ${Source-Version}), konsole (>= ${Source-Version}), kpager (>= ${Source-Version}), kpersonalizer (>= ${Source-Version}), ksmserver (>= ${Source-Version}), ksplash (>= ${Source-Version}), ksysguard (>= ${Source-Version}), ktip (>= ${Source-Version}), kwin (>= ${Source-Version}), libkonq4 (>= ${Source-Version}), hal | kfreebsd-gnu | hurd, pmount | kfreebsd-gnu | hurd
+Depends: kappfinder (>= ${Source-Version}), kate (>= ${Source-Version}), kcontrol (>= ${Source-Version}), tdebase-bin (>= ${Source-Version}), tdebase-data (>= ${Source-Version}), tdebase-kio-plugins (>= ${Source-Version}), kdepasswd (>= ${Source-Version}), tdeprint (>= ${Source-Version}), kdesktop (>= ${Source-Version}), kfind (>= ${Source-Version}), khelpcenter (>= ${Source-Version}), kicker (>= ${Source-Version}), klipper (>= ${Source-Version}), kmenuedit (>= ${Source-Version}), konqueror-nsplugins (>= ${Source-Version}), konqueror (>= ${Source-Version}), konsole (>= ${Source-Version}), kpager (>= ${Source-Version}), kpersonalizer (>= ${Source-Version}), ksmserver (>= ${Source-Version}), ksplash (>= ${Source-Version}), ksysguard (>= ${Source-Version}), ktip (>= ${Source-Version}), twin (>= ${Source-Version}), libkonq4 (>= ${Source-Version}), hal | kfreebsd-gnu | hurd, pmount | kfreebsd-gnu | hurd
Recommends: kdm (>= ${Source-Version})
Suggests: tdebase-doc-html (>= ${Source-Version})
Description: base components from the official KDE release
@@ -109,7 +109,7 @@ Description: core binaries for the KDE base module
Package: tdebase-data
Section: kde
Architecture: all
-Conflicts: kcontrol (<< 4:3.4.2-1), kwin (<< 4:3.4.2-1), kicker (<< 4:3.4.2-1)
+Conflicts: kcontrol (<< 4:3.4.2-1), twin (<< 4:3.4.2-1), kicker (<< 4:3.4.2-1)
Replaces: tdebase (<< 4:3.0.0), tdeedu-data (<< 4:3.4.0), tdelibs-data (<< 4:3.3.0), kdewallpapers (<< 4:3.0.0), kcontrol (<< 4:3.5.5a.dfsg.1-1ubuntu18)
Description: shared data files for the KDE base module
This package contains the architecture-independent shared data files
@@ -121,7 +121,7 @@ Description: shared data files for the KDE base module
Package: tdebase-dev
Section: devel
Architecture: any
-Depends: kate (= ${Source-Version}), kcontrol (= ${Source-Version}), tdebase-bin (= ${Source-Version}), tdeprint (= ${Source-Version}), kdesktop (= ${Source-Version}), khelpcenter (= ${Source-Version}), kicker (= ${Source-Version}), klipper (= ${Source-Version}), kmenuedit (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), konsole (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version}), ksysguard (= ${Source-Version}), kwin (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: kate (= ${Source-Version}), kcontrol (= ${Source-Version}), tdebase-bin (= ${Source-Version}), tdeprint (= ${Source-Version}), kdesktop (= ${Source-Version}), khelpcenter (= ${Source-Version}), kicker (= ${Source-Version}), klipper (= ${Source-Version}), kmenuedit (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), konsole (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version}), ksysguard (= ${Source-Version}), twin (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
Replaces: kate (<< 4:3.0.0), tdebase (<< 4:3.0.0), konqueror (<< 4:3.0.0)
Description: development files for the KDE base module
This package contains headers and other development files needed to
@@ -421,14 +421,14 @@ Package: ksmserver
Section: kde
Architecture: any
Provides: x-session-manager
-Depends: ${shlibs:Depends}, kwin (= ${Source-Version}) | x-window-manager
+Depends: ${shlibs:Depends}, twin (= ${Source-Version}) | x-window-manager
Recommends: kpersonalizer (= ${Source-Version})
Replaces: tdebase (<< 4:3.0.0)
Description: session manager for KDE
This package contains the KDE session manager. It is responsible for
restoring your KDE session on login. It is also needed to properly
start a KDE session. It registers KDE with X display managers, and
- provides the 'startkde' command, for starting an X session with KDE
+ provides the 'starttde' command, for starting an X session with KDE
from the console.
.
If you are running KDE for the first time for a certain user,
@@ -489,7 +489,7 @@ Description: useful tips for KDE
This package is part of KDE, and a component of the KDE base module.
See the 'kde' and 'tdebase' packages for more information.
-Package: kwin
+Package: twin
Section: kde
Architecture: any
Depends: ${shlibs:Depends}
diff --git a/ubuntu/maverick/tdebase/debian/copyright b/ubuntu/maverick/tdebase/debian/copyright
index a17edd5c2..3d683d411 100644
--- a/ubuntu/maverick/tdebase/debian/copyright
+++ b/ubuntu/maverick/tdebase/debian/copyright
@@ -20,7 +20,7 @@ kdcop, tdesu, klipper
BSD
---
-drkonqi, kaddressbook, kicker, ksmserver, ksplash, kwin, legacyimport
+drkonqi, kaddressbook, kicker, ksmserver, ksplash, twin, legacyimport
GPL
---
diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.install b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.install
index 0946d8a57..f8c0aa867 100644
--- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.install
@@ -1,5 +1,5 @@
debian/tmp/opt/trinity/bin/ksmserver
-debian/tmp/opt/trinity/bin/startkde
+debian/tmp/opt/trinity/bin/starttde
debian/tmp/opt/trinity/lib/trinity/ksmserver.la
debian/tmp/opt/trinity/lib/trinity/ksmserver.so
debian/tmp/opt/trinity/lib/libtdeinit_ksmserver.so
diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.manpages b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.manpages
index 05b93960e..354e23800 100644
--- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.manpages
+++ b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.manpages
@@ -1 +1 @@
-debian/man/startkde-trinity.1
+debian/man/starttde-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.postinst b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.postinst
index 6492cbb59..f5d73b934 100644
--- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.postinst
+++ b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.postinst
@@ -20,9 +20,9 @@ set -e
case "$1" in
configure)
update-alternatives --install /usr/bin/x-session-manager \
- x-session-manager /opt/trinity/bin/startkde 40 \
+ x-session-manager /opt/trinity/bin/starttde 40 \
--slave /opt/trinity/share/man/man1/x-session-manager.1.gz \
- x-session-manager.1.gz "/opt/trinity/share/man/man1/startkde-trinity.1.gz"
+ x-session-manager.1.gz "/opt/trinity/share/man/man1/starttde-trinity.1.gz"
;;
diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst
index 73ee5043a..884257d03 100644
--- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst
+++ b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst
@@ -4,7 +4,7 @@ case "$1" in
upgrade)
rm -f /etc/gdm/Sessions/KDE
- rm -f /etc/trinity/debian/startkde
+ rm -f /etc/trinity/debian/starttde
/usr/sbin/update-alternatives --remove x-session-manager /usr/bin/kde2
/usr/sbin/update-alternatives --remove x-session-manager /usr/bin/trinity
mkdir -p /usr/share/autostart
diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.prerm b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.prerm
index 11b4bc08a..e9be94522 100644
--- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.prerm
+++ b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.prerm
@@ -19,7 +19,7 @@ set -e
case "$1" in
remove)
- /usr/sbin/update-alternatives --remove x-session-manager /usr/trinity/bin/startkde
+ /usr/sbin/update-alternatives --remove x-session-manager /usr/trinity/bin/starttde
dpkg-divert --rename --remove /usr/share/autostart/plasma.desktop
;;
diff --git a/ubuntu/maverick/tdebase/debian/kwin-trinity.install b/ubuntu/maverick/tdebase/debian/kwin-trinity.install
index a6fde0638..62d42f166 100644
--- a/ubuntu/maverick/tdebase/debian/kwin-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/kwin-trinity.install
@@ -1,101 +1,101 @@
debian/tmp/opt/trinity/bin/kompmgr
-debian/tmp/opt/trinity/bin/kwin
-debian/tmp/opt/trinity/bin/kwin_killer_helper
-debian/tmp/opt/trinity/bin/kwin_rules_dialog
-debian/tmp/opt/trinity/lib/kconf_update_bin/kwin_update_default_rules
-debian/tmp/opt/trinity/lib/kconf_update_bin/kwin_update_window_settings
-debian/tmp/opt/trinity/lib/trinity/kcm_kwindecoration.la
-debian/tmp/opt/trinity/lib/trinity/kcm_kwindecoration.so
-debian/tmp/opt/trinity/lib/trinity/kcm_kwinoptions.la
-debian/tmp/opt/trinity/lib/trinity/kcm_kwinoptions.so
-debian/tmp/opt/trinity/lib/trinity/kcm_kwinrules.la
-debian/tmp/opt/trinity/lib/trinity/kcm_kwinrules.so
-debian/tmp/opt/trinity/lib/trinity/kwin3_b2.la
-debian/tmp/opt/trinity/lib/trinity/kwin3_b2.so
-debian/tmp/opt/trinity/lib/trinity/kwin3_default.la
-debian/tmp/opt/trinity/lib/trinity/kwin3_default.so
-debian/tmp/opt/trinity/lib/trinity/kwin3_keramik.la
-debian/tmp/opt/trinity/lib/trinity/kwin3_keramik.so
-debian/tmp/opt/trinity/lib/trinity/kwin3_laptop.la
-debian/tmp/opt/trinity/lib/trinity/kwin3_laptop.so
-debian/tmp/opt/trinity/lib/trinity/kwin3_modernsys.la
-debian/tmp/opt/trinity/lib/trinity/kwin3_modernsys.so
-debian/tmp/opt/trinity/lib/trinity/kwin3_plastik.la
-debian/tmp/opt/trinity/lib/trinity/kwin3_plastik.so
-debian/tmp/opt/trinity/lib/trinity/kwin3_quartz.la
-debian/tmp/opt/trinity/lib/trinity/kwin3_quartz.so
-debian/tmp/opt/trinity/lib/trinity/kwin3_redmond.la
-debian/tmp/opt/trinity/lib/trinity/kwin3_redmond.so
-debian/tmp/opt/trinity/lib/trinity/kwin3_web.la
-debian/tmp/opt/trinity/lib/trinity/kwin3_web.so
-debian/tmp/opt/trinity/lib/trinity/kwin_b2_config.la
-debian/tmp/opt/trinity/lib/trinity/kwin_b2_config.so
-debian/tmp/opt/trinity/lib/trinity/kwin_default_config.la
-debian/tmp/opt/trinity/lib/trinity/kwin_default_config.so
-debian/tmp/opt/trinity/lib/trinity/kwin_keramik_config.la
-debian/tmp/opt/trinity/lib/trinity/kwin_keramik_config.so
-debian/tmp/opt/trinity/lib/trinity/kwin.la
-debian/tmp/opt/trinity/lib/trinity/kwin_modernsys_config.la
-debian/tmp/opt/trinity/lib/trinity/kwin_modernsys_config.so
-debian/tmp/opt/trinity/lib/trinity/kwin_plastik_config.la
-debian/tmp/opt/trinity/lib/trinity/kwin_plastik_config.so
-debian/tmp/opt/trinity/lib/trinity/kwin_quartz_config.la
-debian/tmp/opt/trinity/lib/trinity/kwin_quartz_config.so
-debian/tmp/opt/trinity/lib/trinity/kwin_rules_dialog.la
-debian/tmp/opt/trinity/lib/trinity/kwin_rules_dialog.so
-debian/tmp/opt/trinity/lib/trinity/kwin.so
+debian/tmp/opt/trinity/bin/twin
+debian/tmp/opt/trinity/bin/twin_killer_helper
+debian/tmp/opt/trinity/bin/twin_rules_dialog
+debian/tmp/opt/trinity/lib/kconf_update_bin/twin_update_default_rules
+debian/tmp/opt/trinity/lib/kconf_update_bin/twin_update_window_settings
+debian/tmp/opt/trinity/lib/trinity/kcm_twindecoration.la
+debian/tmp/opt/trinity/lib/trinity/kcm_twindecoration.so
+debian/tmp/opt/trinity/lib/trinity/kcm_twinoptions.la
+debian/tmp/opt/trinity/lib/trinity/kcm_twinoptions.so
+debian/tmp/opt/trinity/lib/trinity/kcm_twinrules.la
+debian/tmp/opt/trinity/lib/trinity/kcm_twinrules.so
+debian/tmp/opt/trinity/lib/trinity/twin3_b2.la
+debian/tmp/opt/trinity/lib/trinity/twin3_b2.so
+debian/tmp/opt/trinity/lib/trinity/twin3_default.la
+debian/tmp/opt/trinity/lib/trinity/twin3_default.so
+debian/tmp/opt/trinity/lib/trinity/twin3_keramik.la
+debian/tmp/opt/trinity/lib/trinity/twin3_keramik.so
+debian/tmp/opt/trinity/lib/trinity/twin3_laptop.la
+debian/tmp/opt/trinity/lib/trinity/twin3_laptop.so
+debian/tmp/opt/trinity/lib/trinity/twin3_modernsys.la
+debian/tmp/opt/trinity/lib/trinity/twin3_modernsys.so
+debian/tmp/opt/trinity/lib/trinity/twin3_plastik.la
+debian/tmp/opt/trinity/lib/trinity/twin3_plastik.so
+debian/tmp/opt/trinity/lib/trinity/twin3_quartz.la
+debian/tmp/opt/trinity/lib/trinity/twin3_quartz.so
+debian/tmp/opt/trinity/lib/trinity/twin3_redmond.la
+debian/tmp/opt/trinity/lib/trinity/twin3_redmond.so
+debian/tmp/opt/trinity/lib/trinity/twin3_web.la
+debian/tmp/opt/trinity/lib/trinity/twin3_web.so
+debian/tmp/opt/trinity/lib/trinity/twin_b2_config.la
+debian/tmp/opt/trinity/lib/trinity/twin_b2_config.so
+debian/tmp/opt/trinity/lib/trinity/twin_default_config.la
+debian/tmp/opt/trinity/lib/trinity/twin_default_config.so
+debian/tmp/opt/trinity/lib/trinity/twin_keramik_config.la
+debian/tmp/opt/trinity/lib/trinity/twin_keramik_config.so
+debian/tmp/opt/trinity/lib/trinity/twin.la
+debian/tmp/opt/trinity/lib/trinity/twin_modernsys_config.la
+debian/tmp/opt/trinity/lib/trinity/twin_modernsys_config.so
+debian/tmp/opt/trinity/lib/trinity/twin_plastik_config.la
+debian/tmp/opt/trinity/lib/trinity/twin_plastik_config.so
+debian/tmp/opt/trinity/lib/trinity/twin_quartz_config.la
+debian/tmp/opt/trinity/lib/trinity/twin_quartz_config.so
+debian/tmp/opt/trinity/lib/trinity/twin_rules_dialog.la
+debian/tmp/opt/trinity/lib/trinity/twin_rules_dialog.so
+debian/tmp/opt/trinity/lib/trinity/twin.so
debian/tmp/opt/trinity/lib/libtdecorations.so.1
debian/tmp/opt/trinity/lib/libtdecorations.so.1.0.0
-debian/tmp/opt/trinity/lib/libtdeinit_kwin_rules_dialog.so
-debian/tmp/opt/trinity/lib/libtdeinit_kwin.so
+debian/tmp/opt/trinity/lib/libtdeinit_twin_rules_dialog.so
+debian/tmp/opt/trinity/lib/libtdeinit_twin.so
debian/tmp/opt/trinity/share/applications/kde/showdesktop.desktop
-debian/tmp/opt/trinity/share/applications/kde/kwindecoration.desktop
-debian/tmp/opt/trinity/share/applications/kde/kwinoptions.desktop
-debian/tmp/opt/trinity/share/applications/kde/kwinrules.desktop
-debian/tmp/opt/trinity/share/applnk/.hidden/kwinactions.desktop
-debian/tmp/opt/trinity/share/applnk/.hidden/kwinadvanced.desktop
-debian/tmp/opt/trinity/share/applnk/.hidden/kwinfocus.desktop
-debian/tmp/opt/trinity/share/applnk/.hidden/kwinmoving.desktop
-debian/tmp/opt/trinity/share/applnk/.hidden/kwintranslucency.desktop
-debian/tmp/opt/trinity/share/apps/kconf_update/kwin3_plugin.pl
-debian/tmp/opt/trinity/share/apps/kconf_update/kwin3_plugin.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kwin_focus1.sh
-debian/tmp/opt/trinity/share/apps/kconf_update/kwin_focus1.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kwin_focus2.sh
-debian/tmp/opt/trinity/share/apps/kconf_update/kwin_focus2.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kwin_fsp_workarounds_1.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kwiniconify.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kwinsticky.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kwin.upd
-debian/tmp/opt/trinity/share/apps/kconf_update/kwinupdatewindowsettings.upd
+debian/tmp/opt/trinity/share/applications/kde/twindecoration.desktop
+debian/tmp/opt/trinity/share/applications/kde/twinoptions.desktop
+debian/tmp/opt/trinity/share/applications/kde/twinrules.desktop
+debian/tmp/opt/trinity/share/applnk/.hidden/twinactions.desktop
+debian/tmp/opt/trinity/share/applnk/.hidden/twinadvanced.desktop
+debian/tmp/opt/trinity/share/applnk/.hidden/twinfocus.desktop
+debian/tmp/opt/trinity/share/applnk/.hidden/twinmoving.desktop
+debian/tmp/opt/trinity/share/applnk/.hidden/twintranslucency.desktop
+debian/tmp/opt/trinity/share/apps/kconf_update/twin3_plugin.pl
+debian/tmp/opt/trinity/share/apps/kconf_update/twin3_plugin.upd
+debian/tmp/opt/trinity/share/apps/kconf_update/twin_focus1.sh
+debian/tmp/opt/trinity/share/apps/kconf_update/twin_focus1.upd
+debian/tmp/opt/trinity/share/apps/kconf_update/twin_focus2.sh
+debian/tmp/opt/trinity/share/apps/kconf_update/twin_focus2.upd
+debian/tmp/opt/trinity/share/apps/kconf_update/twin_fsp_workarounds_1.upd
+debian/tmp/opt/trinity/share/apps/kconf_update/twiniconify.upd
+debian/tmp/opt/trinity/share/apps/kconf_update/twinsticky.upd
+debian/tmp/opt/trinity/share/apps/kconf_update/twin.upd
+debian/tmp/opt/trinity/share/apps/kconf_update/twinupdatewindowsettings.upd
debian/tmp/opt/trinity/share/apps/kconf_update/pluginlibFix.pl
-debian/tmp/opt/trinity/share/apps/kwin/b2.desktop
-debian/tmp/opt/trinity/share/apps/kwin/eventsrc
-debian/tmp/opt/trinity/share/apps/kwin/keramik.desktop
-debian/tmp/opt/trinity/share/apps/kwin/laptop.desktop
-debian/tmp/opt/trinity/share/apps/kwin/modernsystem.desktop
-debian/tmp/opt/trinity/share/apps/kwin/pics/bluesun.png
-debian/tmp/opt/trinity/share/apps/kwin/pics/close.png
-debian/tmp/opt/trinity/share/apps/kwin/pics/fog-grey.png
-debian/tmp/opt/trinity/share/apps/kwin/pics/fog.png
-debian/tmp/opt/trinity/share/apps/kwin/pics/greenie.dim.png
-debian/tmp/opt/trinity/share/apps/kwin/pics/greenie.light.png
-debian/tmp/opt/trinity/share/apps/kwin/pics/iconify.png
-debian/tmp/opt/trinity/share/apps/kwin/pics/maximizedown.png
-debian/tmp/opt/trinity/share/apps/kwin/pics/maximize.png
-debian/tmp/opt/trinity/share/apps/kwin/pics/menu.png
-debian/tmp/opt/trinity/share/apps/kwin/pics/pindown.png
-debian/tmp/opt/trinity/share/apps/kwin/pics/pinup.png
-debian/tmp/opt/trinity/share/apps/kwin/pics/unknown.png
-debian/tmp/opt/trinity/share/apps/kwin/plastik.desktop
-debian/tmp/opt/trinity/share/apps/kwin/quartz.desktop
-debian/tmp/opt/trinity/share/apps/kwin/redmond.desktop
-debian/tmp/opt/trinity/share/apps/kwin/web.desktop
-debian/tmp/opt/trinity/share/config.kcfg/kwin.kcfg
+debian/tmp/opt/trinity/share/apps/twin/b2.desktop
+debian/tmp/opt/trinity/share/apps/twin/eventsrc
+debian/tmp/opt/trinity/share/apps/twin/keramik.desktop
+debian/tmp/opt/trinity/share/apps/twin/laptop.desktop
+debian/tmp/opt/trinity/share/apps/twin/modernsystem.desktop
+debian/tmp/opt/trinity/share/apps/twin/pics/bluesun.png
+debian/tmp/opt/trinity/share/apps/twin/pics/close.png
+debian/tmp/opt/trinity/share/apps/twin/pics/fog-grey.png
+debian/tmp/opt/trinity/share/apps/twin/pics/fog.png
+debian/tmp/opt/trinity/share/apps/twin/pics/greenie.dim.png
+debian/tmp/opt/trinity/share/apps/twin/pics/greenie.light.png
+debian/tmp/opt/trinity/share/apps/twin/pics/iconify.png
+debian/tmp/opt/trinity/share/apps/twin/pics/maximizedown.png
+debian/tmp/opt/trinity/share/apps/twin/pics/maximize.png
+debian/tmp/opt/trinity/share/apps/twin/pics/menu.png
+debian/tmp/opt/trinity/share/apps/twin/pics/pindown.png
+debian/tmp/opt/trinity/share/apps/twin/pics/pinup.png
+debian/tmp/opt/trinity/share/apps/twin/pics/unknown.png
+debian/tmp/opt/trinity/share/apps/twin/plastik.desktop
+debian/tmp/opt/trinity/share/apps/twin/quartz.desktop
+debian/tmp/opt/trinity/share/apps/twin/redmond.desktop
+debian/tmp/opt/trinity/share/apps/twin/web.desktop
+debian/tmp/opt/trinity/share/config.kcfg/twin.kcfg
debian/tmp/opt/trinity/share/doc/kde/HTML/en/kompmgr/common
debian/tmp/opt/trinity/share/doc/kde/HTML/en/kompmgr/index.cache.bz2
debian/tmp/opt/trinity/share/doc/kde/HTML/en/kompmgr/index.docbook
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kwin.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kwin.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kwin.png
-debian/tmp/opt/trinity/share/apps/kwin/default_rules/*
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/twin.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/twin.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/twin.png
+debian/tmp/opt/trinity/share/apps/twin/default_rules/*
diff --git a/ubuntu/maverick/tdebase/debian/kwin-trinity.lintian b/ubuntu/maverick/tdebase/debian/kwin-trinity.lintian
index ab81fccc0..b6272e484 100644
--- a/ubuntu/maverick/tdebase/debian/kwin-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/kwin-trinity.lintian
@@ -1,2 +1,2 @@
-kwin: shlib-missing-in-control-file libtdeinit_kwin.so usr/lib/libtdeinit_kwin.so
-kwin: shlib-missing-in-control-file libtdeinit_kwin_rules_dialog.so usr/lib/libtdeinit_kwin_rules_dialog.so
+twin: shlib-missing-in-control-file libtdeinit_twin.so usr/lib/libtdeinit_twin.so
+twin: shlib-missing-in-control-file libtdeinit_twin_rules_dialog.so usr/lib/libtdeinit_twin_rules_dialog.so
diff --git a/ubuntu/maverick/tdebase/debian/kwin-trinity.postinst b/ubuntu/maverick/tdebase/debian/kwin-trinity.postinst
index 4c2228326..b8273333f 100644
--- a/ubuntu/maverick/tdebase/debian/kwin-trinity.postinst
+++ b/ubuntu/maverick/tdebase/debian/kwin-trinity.postinst
@@ -19,7 +19,7 @@ set -e
case "$1" in
configure)
- update-alternatives --install /usr/bin/x-window-manager x-window-manager /opt/trinity/bin/kwin 50
+ update-alternatives --install /usr/bin/x-window-manager x-window-manager /opt/trinity/bin/twin 50
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/ubuntu/maverick/tdebase/debian/kwin-trinity.prerm b/ubuntu/maverick/tdebase/debian/kwin-trinity.prerm
index fef049114..67c4b2507 100644
--- a/ubuntu/maverick/tdebase/debian/kwin-trinity.prerm
+++ b/ubuntu/maverick/tdebase/debian/kwin-trinity.prerm
@@ -19,7 +19,7 @@ set -e
case "$1" in
remove)
- /usr/sbin/update-alternatives --remove x-window-manager /usr/trinity/bin/kwin
+ /usr/sbin/update-alternatives --remove x-window-manager /usr/trinity/bin/twin
;;
upgrade|deconfigure)
diff --git a/debian/squeeze/tdebase/debian/man/startkde-trinity.1 b/ubuntu/maverick/tdebase/debian/man/starttde-trinity.1
index f26b7f128..76c31c9ba 100644
--- a/debian/squeeze/tdebase/debian/man/startkde-trinity.1
+++ b/ubuntu/maverick/tdebase/debian/man/starttde-trinity.1
@@ -1,26 +1,26 @@
-.TH startkde 1 "Jan 17, 2005"
+.TH starttde 1 "Jan 17, 2005"
.SH NAME
-startkde \- Starts up the KDE Desktop Environment
+starttde \- Starts up the KDE Desktop Environment
.SH SYNOPSIS
-.B startkde
+.B starttde
.br
.SH DESCRIPTION
This manual page documents briefly the
-.B startkde
+.B starttde
command.
This manual page was written for the Debian distribution
because the original program does not have a manual page.
.PP
-The \fBstartkde\fP script starts up the K Desktop Environment and
+The \fBstarttde\fP script starts up the K Desktop Environment and
is typically executed by your login manager (e.g. xdm, gdm, kdm, wdm or from
-your X startup scripts). \fBstartkde\fP in turn launches ksmserver, which
+your X startup scripts). \fBstarttde\fP in turn launches ksmserver, which
will load your last session, or a default session that includes the standard
KDE programs if no saved session is available.
-\fBstartkde\fP, with ksmserver, is a standard X11R6 session manager that can manage
+\fBstarttde\fP, with ksmserver, is a standard X11R6 session manager that can manage
any X11R6 SM compliant program.
-\fBstartkde\fP and ksmserver use the contents of the ~/.kde directory
+\fBstarttde\fP and ksmserver use the contents of the ~/.kde directory
for starting previously saved sessions. Source scripts found in ~/.kde/env/*.sh
can be used to define environment variables that will be available to all KDE
programs.
@@ -32,15 +32,15 @@ At the end of a session, the scripts found in ~/.kde/shutdown will be executed.
.SH OPTIONS
-\fBstartkde\fP takes no command line options.
+\fBstarttde\fP takes no command line options.
.SH AUTHOR
-\fBstartkde\fP is written by the KDE Project.
+\fBstarttde\fP is written by the KDE Project.
This manual page was written by Philipp Grau.
.SH "REPORTING BUGS"
-Report bugs of this modified Debian version of startkde to the Bug
+Report bugs of this modified Debian version of starttde to the Bug
Tracking System at: http://bugs.debian.org
.SH COPYRIGHT
Copyright \(co 2005 Philipp Grau.
diff --git a/debian/squeeze/tdebase/debian/patches/disable_startkde_wallpaper.diff b/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff
index 838bbec11..0eebed280 100644
--- a/debian/squeeze/tdebase/debian/patches/disable_startkde_wallpaper.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff
@@ -1,5 +1,5 @@
---- startkde
-+++ startkde
+--- starttde
++++ starttde
@@ -184,17 +184,17 @@
. $kdehome/share/config/startupconfig
fi
diff --git a/ubuntu/maverick/tdebase/debian/rules b/ubuntu/maverick/tdebase/debian/rules
index da70cfb66..5fcea6ca0 100755
--- a/ubuntu/maverick/tdebase/debian/rules
+++ b/ubuntu/maverick/tdebase/debian/rules
@@ -36,7 +36,7 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdebase-trinity-dbg
DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter tdesu knetattach kioslave kxkb kdebugdialog kdcop
PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \
- ksysguard-trinity kwin-trinity libkonq4-trinity
+ ksysguard-trinity twin-trinity libkonq4-trinity
DEB_DH_MAKESHLIBS_ARGS_kate-trinity := -V'kate-trinity (>= 4:3.5.8-1)'
DEB_DH_MAKESHLIBS_ARGS_kcontrol-trinity := -V'kcontrol-trinity (>= 4:3.5.8-1)'
@@ -45,7 +45,7 @@ DEB_DH_MAKESHLIBS_ARGS_kicker-trinity := -V'kicker-trinity (>= 4:3.5.8-1)'
DEB_DH_MAKESHLIBS_ARGS_konqueror-trinity := -V'konqueror-trinity (>= 4:3.5.8-1)'
DEB_DH_MAKESHLIBS_ARGS_ksplash-trinity := -V'ksplash-trinity (>= 4:3.5.8-1)'
DEB_DH_MAKESHLIBS_ARGS_ksysguard-trinity := -V'ksysguard-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kwin-trinity := -V'kwin-trinity (>= 4:3.5.8-1)'
+DEB_DH_MAKESHLIBS_ARGS_twin-trinity := -V'twin-trinity (>= 4:3.5.8-1)'
DEB_DH_MAKESHLIBS_ARGS_libkonq4-trinity := -V'libkonq4-trinity (>= 4:3.5.8-1)'
#shlibs_ver = 4:3.5.0-1
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
index 843b55228..68d02cf06 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
@@ -227,9 +227,9 @@ debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/khtml/common
debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/khtml/index.cache.bz2
debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/khtml/index.docbook
debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/khtml/nsplugin.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kwindecoration/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kwindecoration/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kwindecoration/index.docbook
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/twindecoration/common
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/twindecoration/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/twindecoration/index.docbook
debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/language/common
debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/language/index.cache.bz2
debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/language/index.docbook
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-dev.install b/ubuntu/maverick/tdebase/debian/tdebase-trinity-dev.install
index 4328f203e..80fe5d689 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-dev.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-dev.install
@@ -32,11 +32,11 @@ debian/tmp/opt/trinity/include//ksgrd/StyleSettings.h
debian/tmp/opt/trinity/include//ksgrd/TimerSettings.h
debian/tmp/opt/trinity/include//ksplash/objkstheme.h
debian/tmp/opt/trinity/include//ksplash/themeengine.h
-debian/tmp/opt/trinity/include//kwin/client.h
+debian/tmp/opt/trinity/include//twin/client.h
debian/tmp/opt/trinity/include//KWinInterface.h
-debian/tmp/opt/trinity/include//kwin/kwinbutton.h
-debian/tmp/opt/trinity/include//kwin/options.h
-debian/tmp/opt/trinity/include//kwin/workspace.h
+debian/tmp/opt/trinity/include//twin/twinbutton.h
+debian/tmp/opt/trinity/include//twin/options.h
+debian/tmp/opt/trinity/include//twin/workspace.h
debian/tmp/opt/trinity/lib/libkasbar.la
debian/tmp/opt/trinity/lib/libkasbar.so
debian/tmp/opt/trinity/lib/libkateinterfaces.la
@@ -65,8 +65,8 @@ debian/tmp/opt/trinity/lib/libtdeinit_konqueror.la
debian/tmp/opt/trinity/lib/libtdeinit_konsole.la
debian/tmp/opt/trinity/lib/libtdeinit_kprinter.la
debian/tmp/opt/trinity/lib/libtdeinit_ksmserver.la
-debian/tmp/opt/trinity/lib/libtdeinit_kwin.la
-debian/tmp/opt/trinity/lib/libtdeinit_kwin_rules_dialog.la
+debian/tmp/opt/trinity/lib/libtdeinit_twin.la
+debian/tmp/opt/trinity/lib/libtdeinit_twin_rules_dialog.la
debian/tmp/opt/trinity/lib/libtdeinit_kwrite.la
debian/tmp/opt/trinity/lib/libtdeinit_kxkb.la
debian/tmp/opt/trinity/lib/libkfontinst.la
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/man/kstartupconfig-trinity.1 b/ubuntu/maverick/tdelibs/debian/man/kstartupconfig-trinity.1
index dca82fb5e..57ae12c1d 100644
--- a/ubuntu/maverick/tdelibs/debian/man/kstartupconfig-trinity.1
+++ b/ubuntu/maverick/tdelibs/debian/man/kstartupconfig-trinity.1
@@ -8,7 +8,7 @@ kstartupconfig, kdostartupconfig
.sp 1
\fBkdostartupconfig\fP
.SH DESCRIPTION
-\fBkstartupconfig\fP loads configuration options for use in \fBstartkde\fP. It saves loading time as there is no need to launch programs linked to KDE libraries. \fBstartupconfig\fP uses a cache of some Kconfig options that are updated by \fBkdostartupconfig\fP. The cache is implemented as script file that is sourced and provides the options as shell variables.
+\fBkstartupconfig\fP loads configuration options for use in \fBstarttde\fP. It saves loading time as there is no need to launch programs linked to KDE libraries. \fBstartupconfig\fP uses a cache of some Kconfig options that are updated by \fBkdostartupconfig\fP. The cache is implemented as script file that is sourced and provides the options as shell variables.
.sp 1
The configuration options to load are stored in \fIstartupconfigkeys\fP as one option per line. They follow the format <file> <group> <key> <default>. A complete group is addressed as <file> [<group>]. The configuration options are processed in the specified order so the missing default values for groups can be specified as single options after the group option.
.sp 1
@@ -42,7 +42,7 @@ configuration options and files they belong to
.I $KDEHOME/share/config/startupconfigkeys
configuration options to load
.SH SEE ALSO
-.BR kconf_update (1),\ startkde (1)
+.BR kconf_update (1),\ starttde (1)
.SH AUTHORS
.nf
Lubos Lunak <l.lunak@kde.org>
diff --git a/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml b/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml
index c40c64520..d4a7162d1 100644
--- a/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml
+++ b/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml
@@ -105,7 +105,7 @@ manpage.1: manpage.sgml
attacks. </para>
<para><command>&dhpackage;</command> is usually called by the
- <command>startkde</command> script.</para>
+ <command>starttde</command> script.</para>
</refsect1>
<refsect1>
diff --git a/ubuntu/maverick/tdelibs/debian/man/tdeinit-trinity.1 b/ubuntu/maverick/tdelibs/debian/man/tdeinit-trinity.1
index 1c3861783..63c5935b6 100644
--- a/ubuntu/maverick/tdelibs/debian/man/tdeinit-trinity.1
+++ b/ubuntu/maverick/tdelibs/debian/man/tdeinit-trinity.1
@@ -10,7 +10,7 @@ tdeinit
.sp 1
\fBtdeinit\fP is used to start all other KDE programs. It can start binary program files as well as tdeinit loadable modules (KLMs).
.sp 1
-When \fBtdeinit\fP starts for the first time it launches \fBdcopserver\fP, \fBklauncher\fP, \fBkded\fP and some additional programs specified on its command line in the \fBstartkde\fP script (normally \fBkcminit\fP and \fBknotify\fP).
+When \fBtdeinit\fP starts for the first time it launches \fBdcopserver\fP, \fBklauncher\fP, \fBkded\fP and some additional programs specified on its command line in the \fBstarttde\fP script (normally \fBkcminit\fP and \fBknotify\fP).
.sp 1
The \fBtdeinit\fP master process can be used to start additional KDE programs via \fBtdeinit_wrapper\fP, \fBkshell\fP and \fBkwrapper\fP.
.sp 1
@@ -29,7 +29,7 @@ Terminate when no KDE applications are left running
.I /usr/lib/trinity
directory with KLMs (tdeinit loadable modules)
.SH SEE ALSO
-.BR dcopserver (1),\ kded (1),\ kcminit (1),\ tdeinit_wrapper (1),\ klauncher (1),\ kshell (1),\ kwrapper (1),\ startkde (1)
+.BR dcopserver (1),\ kded (1),\ kcminit (1),\ tdeinit_wrapper (1),\ klauncher (1),\ kshell (1),\ kwrapper (1),\ starttde (1)
.SH AUTHORS
.nf
Waldo Bastian <bastian@kde.org>
diff --git a/ubuntu/maverick/tdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff b/ubuntu/maverick/tdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff
deleted file mode 100644
index 06bd685ca..000000000
--- a/ubuntu/maverick/tdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- tdelibs/Makefile.am.in 2006-06-26 16:14:54.000000000 +0000
-+++ tdelibs/Makefile.am.in 2006-06-26 16:16:33.000000000 +0000
-@@ -54,10 +54,8 @@
- find $$dirs -maxdepth 1 -name "*.cc" -print >> files ;\
- find $$dirs -maxdepth 1 -name "*.h" -print >> files ;\
- echo ./tdecore/kde-config.cpp.in >> files ;\
-- $(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp; \
-- : > kde.pot ;\
-+ $(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp;
- $(XGETTEXT) -ktranslate -x qt-messages.pot rc.cpp `cat files` && cat messages.po qt-messages.pot > $(podir)/tdelibs.pot
-- $(XGETTEXT) common_texts.cpp -o kde.pot
- rm -f dirs
-
- EXTRA_DIST = admin kde.pot \
diff --git a/ubuntu/maverick/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff b/ubuntu/maverick/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff
index a0db3e5c7..b224a4d11 100644
--- a/ubuntu/maverick/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff
+++ b/ubuntu/maverick/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff
@@ -5,7 +5,7 @@
"<p>For more information on KDE internationalization "
"visit <a href=\"http://l10n.kde.org\">http://l10n.kde.org</a></p>"
- );
-+ ) + i18n("<p>Debian includes additions and alterations to the KDE translation from <a href=\"https://translations.launchpad.net/\">Launchpad</a>.</p>");
++ ) + i18n("<p>Debian includes additions and alterations to the TDE translation from <a href=\"https://translations.launchpad.net/\">Launchpad</a>.</p>");
}
TQString
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
index 8f84589d6..eeb111f96 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install
@@ -232,7 +232,7 @@ debian/tmp/opt/trinity/include/tdesu/ssh.h
debian/tmp/opt/trinity/include/tdesu/stub.h
debian/tmp/opt/trinity/include/tdesu/su.h
debian/tmp/opt/trinity/include/kde_terminal_interface.h
-debian/tmp/opt/trinity/include/kdeversion.h
+debian/tmp/opt/trinity/include/tdeversion.h
debian/tmp/opt/trinity/include/kdialogbase.h
debian/tmp/opt/trinity/include/kdialog.h
debian/tmp/opt/trinity/include/kdirlister.h
@@ -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