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

6 files changed, 29 insertions, 29 deletions

diff --git a/ubuntu/maverick/applications/amarok/debian/amarok-engine-xine-trinity.install b/ubuntu/maverick/applications/amarok/debian/amarok-engine-xine-trinity.install
index 6b23c8378..c5e46604f 100644
--- a/ubuntu/maverick/applications/amarok/debian/amarok-engine-xine-trinity.install
+++ b/ubuntu/maverick/applications/amarok/debian/amarok-engine-xine-trinity.install
@@ -1,4 +1,4 @@
 debian/tmp/opt/trinity/share/services/amarok_xine-engine.desktop
 debian/tmp/opt/trinity/share/config.kcfg/xinecfg.kcfg
-debian/tmp/opt/trinity/lib/kde3/libamarok_xine-engine.so
-debian/tmp/opt/trinity/lib/kde3/libamarok_xine-engine.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_xine-engine.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_xine-engine.la
diff --git a/ubuntu/maverick/applications/amarok/debian/amarok-engine-yauap-trinity.install b/ubuntu/maverick/applications/amarok/debian/amarok-engine-yauap-trinity.install
index 9a7c007c6..ab71ca6f9 100644
--- a/ubuntu/maverick/applications/amarok/debian/amarok-engine-yauap-trinity.install
+++ b/ubuntu/maverick/applications/amarok/debian/amarok-engine-yauap-trinity.install
@@ -1,3 +1,3 @@
 debian/tmp/opt/trinity/share/services/amarok_yauap-engine_plugin.desktop
-debian/tmp/opt/trinity/lib/kde3/libamarok_yauap-engine_plugin.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_yauap-engine_plugin.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_yauap-engine_plugin.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_yauap-engine_plugin.so
diff --git a/ubuntu/maverick/applications/amarok/debian/amarok-trinity.install b/ubuntu/maverick/applications/amarok/debian/amarok-trinity.install
index 50181a39e..f5aeb567f 100644
--- a/ubuntu/maverick/applications/amarok/debian/amarok-trinity.install
+++ b/ubuntu/maverick/applications/amarok/debian/amarok-trinity.install
@@ -7,31 +7,31 @@ debian/tmp/opt/trinity/share/servicetypes/amarok_codecinstall.desktop
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_append.desktop
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_addaspodcast.desktop 
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_play_audiocd.desktop
-debian/tmp/opt/trinity/lib/kde3/libamarok_void-engine_plugin.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_void-engine_plugin.so
-debian/tmp/opt/trinity/lib/kde3/libamarok_generic-mediadevice.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_generic-mediadevice.so
-debian/tmp/opt/trinity/lib/kde3/libamarok_ifp-mediadevice.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_ifp-mediadevice.so
-debian/tmp/opt/trinity/lib/kde3/libamarok_ipod-mediadevice.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_ipod-mediadevice.so
-debian/tmp/opt/trinity/lib/kde3/libamarok_njb-mediadevice.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_njb-mediadevice.so
-debian/tmp/opt/trinity/lib/kde3/libamarok_smb-device.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_smb-device.so
-debian/tmp/opt/trinity/lib/kde3/libamarok_massstorage-device.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_massstorage-device.so
-debian/tmp/opt/trinity/lib/kde3/libamarok_nfs-device.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_nfs-device.so
-debian/tmp/opt/trinity/lib/kde3/libamarok_daap-mediadevice.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_daap-mediadevice.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_generic-mediadevice.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_generic-mediadevice.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_ifp-mediadevice.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_ifp-mediadevice.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_ipod-mediadevice.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_ipod-mediadevice.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_massstorage-device.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_massstorage-device.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_nfs-device.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_nfs-device.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.so
 
 #libkarma is not in MAIN yet
-#debian/tmp/opt/trinity/lib/kde3/libamarok_riokarma-mediadevice.la
-#debian/tmp/opt/trinity/lib/kde3/libamarok_riokarma-mediadevice.so
+#debian/tmp/opt/trinity/lib/trinity/libamarok_riokarma-mediadevice.la
+#debian/tmp/opt/trinity/lib/trinity/libamarok_riokarma-mediadevice.so
 
-debian/tmp/opt/trinity/lib/kde3/libamarok_mtp-mediadevice.la
-debian/tmp/opt/trinity/lib/kde3/libamarok_mtp-mediadevice.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_mtp-mediadevice.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_mtp-mediadevice.so
 debian/tmp/opt/trinity/lib/ruby_lib/*           /opt/trinity/lib/ruby_lib/
 debian/tmp/opt/trinity/lib/libamarok.so.0
 debian/tmp/opt/trinity/lib/libamarok.so.0.0.0
diff --git a/ubuntu/maverick/applications/amarok/debian/changelog b/ubuntu/maverick/applications/amarok/debian/changelog
index 7dc833d40..43671ac52 100644
--- a/ubuntu/maverick/applications/amarok/debian/changelog
+++ b/ubuntu/maverick/applications/amarok/debian/changelog
@@ -12,7 +12,7 @@ amarok-trinity (2:1.4.10-0ubuntu5) jaunty; urgency=low
 
 amarok-trinity (2:1.4.10-0ubuntu4) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 03 March 2009 20:08:00 -0600
diff --git a/ubuntu/maverick/applications/amarok/debian/control b/ubuntu/maverick/applications/amarok/debian/control
index a0c2c0ebf..dbb0f8232 100644
--- a/ubuntu/maverick/applications/amarok/debian/control
+++ b/ubuntu/maverick/applications/amarok/debian/control
@@ -21,7 +21,7 @@ Architecture: any
 Depends:  amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engine-yauap-trinity (= ${binary:Version}), unzip, ${shlibs:Depends}
 Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser,
  python, python-qt3, libqt0-ruby1.8, libvisual-0.4-plugins
-Description: versatile and easy to use audio player for KDE3
+Description: versatile and easy to use audio player for Trinity
  Amarok tries to be a little different, providing a simple drag and drop
  interface that really makes playlist handling easy.
  .
diff --git a/ubuntu/maverick/applications/amarok/debian/control.in b/ubuntu/maverick/applications/amarok/debian/control.in
index 314cdab75..d57046d4c 100644
--- a/ubuntu/maverick/applications/amarok/debian/control.in
+++ b/ubuntu/maverick/applications/amarok/debian/control.in
@@ -20,7 +20,7 @@ Architecture: any
 Depends:  amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engine-yauap-trinity (= ${binary:Version}), unzip, ${shlibs:Depends}
 Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser,
  python, python-qt3, libqt0-ruby1.8, libvisual-0.4-plugins
-Description: versatile and easy to use audio player for KDE3
+Description: versatile and easy to use audio player for Trinity
  Amarok tries to be a little different, providing a simple drag and drop
  interface that really makes playlist handling easy.
  .