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

4 files changed, 27 insertions, 27 deletions

diff --git a/ubuntu/maverick/applications/k3b/debian/changelog b/ubuntu/maverick/applications/k3b/debian/changelog
index 46bd8c12e..37b58f616 100644
--- a/ubuntu/maverick/applications/k3b/debian/changelog
+++ b/ubuntu/maverick/applications/k3b/debian/changelog
@@ -6,7 +6,7 @@ k3b-trinity (1.0.5-4ubuntu2) karmic; urgency=low
 
 k3b-trinity (1.0.5-4ubuntu0) jaunty; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 16 June 2009 11:18:00 -0600
diff --git a/ubuntu/maverick/applications/k3b/debian/k3b-trinity.install b/ubuntu/maverick/applications/k3b/debian/k3b-trinity.install
index e2601f7be..8e0b27b98 100644
--- a/ubuntu/maverick/applications/k3b/debian/k3b-trinity.install
+++ b/ubuntu/maverick/applications/k3b/debian/k3b-trinity.install
@@ -1,5 +1,5 @@
 debian/tmp/opt/trinity/bin/*
 debian/tmp/opt/trinity/share/applications/*
 debian/k3b.xpm /opt/trinity/share/pixmaps/
-debian/tmp/opt/trinity/lib/kde3/kfile_k3b.so
-debian/tmp/opt/trinity/lib/kde3/kfile_k3b.la
+debian/tmp/opt/trinity/lib/trinity/kfile_k3b.so
+debian/tmp/opt/trinity/lib/trinity/kfile_k3b.la
diff --git a/ubuntu/maverick/applications/k3b/debian/libk3b3-extracodecs-trinity.install b/ubuntu/maverick/applications/k3b/debian/libk3b3-extracodecs-trinity.install
index 5e8cf796c..d806398ef 100644
--- a/ubuntu/maverick/applications/k3b/debian/libk3b3-extracodecs-trinity.install
+++ b/ubuntu/maverick/applications/k3b/debian/libk3b3-extracodecs-trinity.install
@@ -1,2 +1,2 @@
-debian/tmp/opt/trinity/lib/kde3/libk3bmaddecoder.*
-debian/tmp/opt/trinity/lib/kde3/libk3bffmpegdecoder.*
+debian/tmp/opt/trinity/lib/trinity/libk3bmaddecoder.*
+debian/tmp/opt/trinity/lib/trinity/libk3bffmpegdecoder.*
diff --git a/ubuntu/maverick/applications/k3b/debian/libk3b3-trinity.install b/ubuntu/maverick/applications/k3b/debian/libk3b3-trinity.install
index ac53b1722..e18a34c1c 100644
--- a/ubuntu/maverick/applications/k3b/debian/libk3b3-trinity.install
+++ b/ubuntu/maverick/applications/k3b/debian/libk3b3-trinity.install
@@ -1,27 +1,27 @@
 debian/tmp/opt/trinity/lib/libk3b.so.*
 debian/tmp/opt/trinity/lib/libk3bdevice.so.*
 debian/tmp/opt/trinity/lib/*.la
-debian/tmp/opt/trinity/lib/kde3/libk3balsaoutputplugin.la
-debian/tmp/opt/trinity/lib/kde3/libk3balsaoutputplugin.so
-debian/tmp/opt/trinity/lib/kde3/libk3bartsoutputplugin.la
-debian/tmp/opt/trinity/lib/kde3/libk3bartsoutputplugin.so
-debian/tmp/opt/trinity/lib/kde3/libk3bexternalencoder.la
-debian/tmp/opt/trinity/lib/kde3/libk3bexternalencoder.so
-debian/tmp/opt/trinity/lib/kde3/libk3bflacdecoder.la
-debian/tmp/opt/trinity/lib/kde3/libk3bflacdecoder.so
+debian/tmp/opt/trinity/lib/trinity/libk3balsaoutputplugin.la
+debian/tmp/opt/trinity/lib/trinity/libk3balsaoutputplugin.so
+debian/tmp/opt/trinity/lib/trinity/libk3bartsoutputplugin.la
+debian/tmp/opt/trinity/lib/trinity/libk3bartsoutputplugin.so
+debian/tmp/opt/trinity/lib/trinity/libk3bexternalencoder.la
+debian/tmp/opt/trinity/lib/trinity/libk3bexternalencoder.so
+debian/tmp/opt/trinity/lib/trinity/libk3bflacdecoder.la
+debian/tmp/opt/trinity/lib/trinity/libk3bflacdecoder.so
 
 
-debian/tmp/opt/trinity/lib/kde3/libk3boggvorbisdecoder.la
-debian/tmp/opt/trinity/lib/kde3/libk3boggvorbisdecoder.so
-debian/tmp/opt/trinity/lib/kde3/libk3boggvorbisencoder.la
-debian/tmp/opt/trinity/lib/kde3/libk3boggvorbisencoder.so
-debian/tmp/opt/trinity/lib/kde3/libk3bsoxencoder.la
-debian/tmp/opt/trinity/lib/kde3/libk3bsoxencoder.so
-debian/tmp/opt/trinity/lib/kde3/libk3bwavedecoder.la
-debian/tmp/opt/trinity/lib/kde3/libk3bwavedecoder.so
-debian/tmp/opt/trinity/lib/kde3/libk3baudioprojectcddbplugin.so
-debian/tmp/opt/trinity/lib/kde3/libk3baudioprojectcddbplugin.la
-debian/tmp/opt/trinity/lib/kde3/libk3baudiometainforenamerplugin.so
-debian/tmp/opt/trinity/lib/kde3/libk3baudiometainforenamerplugin.la
-debian/tmp/opt/trinity/lib/kde3/kio_videodvd.so
-debian/tmp/opt/trinity/lib/kde3/kio_videodvd.la
+debian/tmp/opt/trinity/lib/trinity/libk3boggvorbisdecoder.la
+debian/tmp/opt/trinity/lib/trinity/libk3boggvorbisdecoder.so
+debian/tmp/opt/trinity/lib/trinity/libk3boggvorbisencoder.la
+debian/tmp/opt/trinity/lib/trinity/libk3boggvorbisencoder.so
+debian/tmp/opt/trinity/lib/trinity/libk3bsoxencoder.la
+debian/tmp/opt/trinity/lib/trinity/libk3bsoxencoder.so
+debian/tmp/opt/trinity/lib/trinity/libk3bwavedecoder.la
+debian/tmp/opt/trinity/lib/trinity/libk3bwavedecoder.so
+debian/tmp/opt/trinity/lib/trinity/libk3baudioprojectcddbplugin.so
+debian/tmp/opt/trinity/lib/trinity/libk3baudioprojectcddbplugin.la
+debian/tmp/opt/trinity/lib/trinity/libk3baudiometainforenamerplugin.so
+debian/tmp/opt/trinity/lib/trinity/libk3baudiometainforenamerplugin.la
+debian/tmp/opt/trinity/lib/trinity/kio_videodvd.so
+debian/tmp/opt/trinity/lib/trinity/kio_videodvd.la