Fix remaining instances of KDE3 in the Debian and Ubuntu packaging

7 files changed, 14 insertions, 15 deletions

diff --git a/debian/squeeze/kdebase/debian/changelog b/debian/squeeze/kdebase/debian/changelog
index 5d6e57ac4..9742e6bde 100644
--- a/debian/squeeze/kdebase/debian/changelog
+++ b/debian/squeeze/kdebase/debian/changelog
@@ -152,7 +152,7 @@ kdebase-trinity (4:3.5.10-0ubuntu4~intrepid10) intrepid; urgency=low
 
 kdebase-trinity (4:3.5.10-0ubuntu4~intrepid8) intrepid; urgency=low
 
-  * Repaired plasma startup to autodetect KDE3/KDE4 and not run/run accordingly
+  * Repaired plasma startup to autodetect Trinity/KDE4 and not run/run accordingly
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 15 Apr 2009 11:37:00 -0600
 
@@ -202,7 +202,7 @@ kdebase-trinity (4:3.5.10-0ubuntu3~intrepid18) intrepid; urgency=low
 
 kdebase-trinity (4:3.5.10-0ubuntu3~intrepid15) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
   * Removed unbuilt libraries khotkeys_arts.la and khotkeys_arts.so
 
@@ -258,7 +258,7 @@ kdebase-trinity (4:3.5.10-0ubuntu2~intrepid11) intrepid; urgency=low
 
 kdebase-trinity (4:3.5.10-0ubuntu2~intrepid9) intrepid; urgency=low
 
-  * Fixed KDE3 games path
+  * Fixed Trinity games path
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 01 Dec 2008 00:34:00 -0600
 
@@ -574,7 +574,7 @@ kdebase (4:3.5.8.dfsg.1-2) unstable; urgency=low
   +++ Changes by Armin Berres:
 
   * Split off kdebase-bin-trinity which contains executables which can be provided by
-    KDE3 or KDE4.
+    Trinity or KDE4.
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
 
diff --git a/debian/squeeze/kdebase/debian/control b/debian/squeeze/kdebase/debian/control
index c28567d94..8681f7ea0 100644
--- a/debian/squeeze/kdebase/debian/control
+++ b/debian/squeeze/kdebase/debian/control
@@ -30,9 +30,9 @@ Package: kdebase-runtime-data-common-trinity
 Section: kde
 Architecture: all
 Depends: kdebase-trinity
-Description: Shared common files for KDE3 and KDE4
+Description: Shared common files for Trinity and KDE4
  .
- Shared common files for both KDE3 and KDE4
+ Shared common files for both Trinity and KDE4
  Such as the desktop right-click-"Create New" list
 
 Package: kappfinder-trinity
@@ -306,7 +306,7 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
 Replaces: kdebase-trinity (<< 4:3.0.0), kdebase-trinity-doc (<< 4:3.0.0)
-Description: clipboard utility for KDE3
+Description: clipboard utility for Trinity
  klipper provides standard clipboard functions (cut and paste, history
  saving) plus additional features, like the ability to offer actions to 
  take dependent on the clipboard contents. For example, it can launch a 
diff --git a/debian/squeeze/kdebase/debian/kdebase-data-trinity.install b/debian/squeeze/kdebase/debian/kdebase-data-trinity.install
index 1d0003595..c14dd7dcc 100644
--- a/debian/squeeze/kdebase/debian/kdebase-data-trinity.install
+++ b/debian/squeeze/kdebase/debian/kdebase-data-trinity.install
@@ -1172,8 +1172,8 @@ debian/tmp/opt/trinity/share/wallpapers/horse-head-nebula.png
 debian/tmp/opt/trinity/share/wallpapers/horse-head-nebula.png.desktop
 debian/tmp/opt/trinity/share/wallpapers/isadora.png
 debian/tmp/opt/trinity/share/wallpapers/isadora.png.desktop
-debian/tmp/opt/trinity/share/wallpapers/KDE34.png
-debian/tmp/opt/trinity/share/wallpapers/KDE34.png.desktop
+debian/tmp/opt/trinity/share/wallpapers/Trinity4.png
+debian/tmp/opt/trinity/share/wallpapers/Trinity4.png.desktop
 debian/tmp/opt/trinity/share/wallpapers/konqui.svgz
 debian/tmp/opt/trinity/share/wallpapers/konqui.svgz.desktop
 debian/tmp/opt/trinity/share/wallpapers/lineart.svgz
diff --git a/debian/squeeze/kdebase/debian/kdm-trinity.init b/debian/squeeze/kdebase/debian/kdm-trinity.init
index 28bca2f65..effad2fd6 100644
--- a/debian/squeeze/kdebase/debian/kdm-trinity.init
+++ b/debian/squeeze/kdebase/debian/kdm-trinity.init
@@ -7,7 +7,7 @@
 # Should-Stop:       console-screen
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Short-Description: X display manager for KDE3
+# Short-Description: X display manager for Trinity
 # Description:       KDM manages a collection of X servers, which may be on the local host or remote machines.
 ### END INIT INFO
 # /etc/init.d/kdm-trinity: start or stop the X display manager
diff --git a/debian/squeeze/kdebase/debian/plasma-desktop.autodetect b/debian/squeeze/kdebase/debian/plasma-desktop.autodetect
index 436ca7b45..b083cb277 100755
--- a/debian/squeeze/kdebase/debian/plasma-desktop.autodetect
+++ b/debian/squeeze/kdebase/debian/plasma-desktop.autodetect
@@ -5,8 +5,8 @@ echo "You are running $DESKTOP_SESSION"
 
 if [[ "$DESKTOP_SESSION" == "trinity" ]]
 then
-	# Do nothing, this is KDE3
-	echo "I detected KDE3"
+	# Do nothing, this is Trinity
+	echo "I detected Trinity"
 else
 	# This is KDE4, start plasma-desktop
 	echo "I detected KDE4"
diff --git a/debian/squeeze/kdebase/debian/plasma.autodetect b/debian/squeeze/kdebase/debian/plasma.autodetect
index 40e44f6cd..c23f68909 100755
--- a/debian/squeeze/kdebase/debian/plasma.autodetect
+++ b/debian/squeeze/kdebase/debian/plasma.autodetect
@@ -5,8 +5,8 @@ echo "You are running $DESKTOP_SESSION"
 
 if [[ "$DESKTOP_SESSION" == "trinity" ]]
 then
-	# Do nothing, this is KDE3
-	echo "I detected KDE3"
+	# Do nothing, this is Trinity
+	echo "I detected Trinity"
 else
 	# This is KDE4, start plasma
 	echo "I detected KDE4"
diff --git a/debian/squeeze/kdebase/debian/rules b/debian/squeeze/kdebase/debian/rules
index c621bf7d8..ac42efaf8 100755
--- a/debian/squeeze/kdebase/debian/rules
+++ b/debian/squeeze/kdebase/debian/rules
@@ -271,4 +271,3 @@ binary-install/ksmserver-trinity::
 	install -p -D -m644 debian/tmp/opt/trinity/share/apps/kdm/sessions/tde.desktop debian/ksmserver-trinity/usr/share/xsessions/trinity.desktop
 	install -p -D -m755 debian/plasma.autodetect debian/ksmserver-trinity/usr/bin/plasma.autodetect
 	install -p -D -m755 debian/plasma-desktop.autodetect debian/ksmserver-trinity/usr/bin/plasma-desktop.autodetect
-	sed -i 's/KDE3/Trinity/g' debian/ksmserver-trinity/usr/share/xsessions/trinity.desktop