Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

6 files changed, 9 insertions, 9 deletions

diff --git a/ubuntu/maverick/dependencies/arts/debian/changelog b/ubuntu/maverick/dependencies/arts/debian/changelog
index 1ec6d7736..2fe0652db 100644
--- a/ubuntu/maverick/dependencies/arts/debian/changelog
+++ b/ubuntu/maverick/dependencies/arts/debian/changelog
@@ -6,7 +6,7 @@ arts-trinity (1.5.10-0ubuntu3) karmic; urgency=low
 
 arts-trinity (1.5.10-0ubuntu2~intrepid5) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 25 Feb 2009 15:12:00 -0600
@@ -19,7 +19,7 @@ arts-trinity (1.5.10-0ubuntu2~intrepid4) intrepid; urgency=low
 
 arts-trinity (1.5.10-0ubuntu2~intrepid3) intrepid; urgency=low
 
-  * Altered prefix for KDE3.5
+  * Altered prefix for Trinity.5
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 20 Nov 2008 17:48:45 -0600
 
diff --git a/ubuntu/maverick/dependencies/arts/debian/control b/ubuntu/maverick/dependencies/arts/debian/control
index e29a6efd5..57a7a33a1 100644
--- a/ubuntu/maverick/dependencies/arts/debian/control
+++ b/ubuntu/maverick/dependencies/arts/debian/control
@@ -24,7 +24,7 @@ Description: sound system from the official KDE release
  technological superiority of the Unix operating system.
  .
  This metapackage includes the complete aRts sound system, without
- development packages. aRts is the core sound system for KDE3.
+ development packages. aRts is the core sound system for Trinity.
 
 Package: libarts1c2a-trinity
 Architecture: any
diff --git a/ubuntu/maverick/dependencies/qt3/debian/README.Debian b/ubuntu/maverick/dependencies/qt3/debian/README.Debian
index 5d8bb34ed..7cc02d1ec 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/README.Debian
+++ b/ubuntu/maverick/dependencies/qt3/debian/README.Debian
@@ -54,7 +54,7 @@ should choose as a package maintainer for
 qt-plugins so the user doesn't have to customize his library path for 
 loading Qt plugins. The only exception is that KDE delivers a set of Qt 
 plugins as well (mainly styles and designer plugins); those are placed in 
-/usr/lib/kde3/plugins. 
+/usr/lib/trinity/plugins. 
 
 QMotif Extension: As this code is only available in commercial environments 
 (and produces a static library libqmotif.a anyway that those commercial 
@@ -242,7 +242,7 @@ configuration file. Where does that global configuration file go if I make
 use of the QSettings class ? 
 
 A: With qt-3.2.0, Trolltech has introduced a configure option to Qt called
---sysconfdir which we intentionally set to /etc/qt3 similar to /etc/kde3 for
+--sysconfdir which we intentionally set to /etc/qt3 similar to /etc/trinity for
 KDE programs. Install your application's system wide configuration file
 to /etc/qt3. 
 
diff --git a/ubuntu/maverick/dependencies/qt3/debian/control b/ubuntu/maverick/dependencies/qt3/debian/control
index 11c2ee3b3..083065827 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/control
+++ b/ubuntu/maverick/dependencies/qt3/debian/control
@@ -28,7 +28,7 @@ Conflicts: libqt3c102-mt, libqui1-emb, libqt3c-mt
 Suggests: libqt3-mt-psql, libqt3-mt-mysql, libqt3-mt-odbc
 Description: Qt GUI Library (Threaded runtime version), Version 3
  This is the Trolltech Qt library, version 3. It's necessary for
- applications that link against the libqt-mt.so.3, e.g. all KDE3
+ applications that link against the libqt-mt.so.3, e.g. all Trinity
  applications.
 
 Package: libqt3-mt-mysql
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt_plugins_3.3rc b/ubuntu/maverick/dependencies/qt3/debian/qt_plugins_3.3rc
index 9bbc50788..9fb7f9711 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt_plugins_3.3rc
+++ b/ubuntu/maverick/dependencies/qt3/debian/qt_plugins_3.3rc
@@ -1,4 +1,4 @@
 [usr]
-lib/kde3/plugins/styles/plastik.so=30306^e3^ei686 Linux g++-4.* full-config^e2006-09-29T20:06:31^e
+lib/trinity/plugins/styles/plastik.so=30306^e3^ei686 Linux g++-4.* full-config^e2006-09-29T20:06:31^e
 lib/qt3/plugins/imageformats/libqmng.so=30306^e3^ei686 Linux g++-4.* full-config^e2006-08-25T18:22:18^e
 
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qtrc b/ubuntu/maverick/dependencies/qt3/debian/qtrc
index d9db19425..3c977f4d1 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qtrc
+++ b/ubuntu/maverick/dependencies/qt3/debian/qtrc
@@ -1,5 +1,5 @@
 [3.3]
-libraryPath=/usr/lib/kde3/plugins/
+libraryPath=/usr/lib/trinity/plugins/
 
 [General]
 GUIEffects=general^eanimatecombo^e
@@ -12,7 +12,7 @@ style=Plastik
 
 [KDE]
 contrast=7
-kdeAddedLibraryPaths=/usr/lib/kde3/plugins/^e
+kdeAddedLibraryPaths=/usr/lib/trinity/plugins/^e
 
 [KWinPalette]
 activeBackground=#1f26ad