summaryrefslogtreecommitdiffstats
path: root/debian/squeeze/applications/kaffeine
diff options
context:
space:
mode:
authorRobert Xu <robxu9@gmail.com>2011-08-20 22:17:03 -0400
committerRobert Xu <robxu9@gmail.com>2011-08-20 22:17:03 -0400
commit6f3a1bc646b0d5eb63f09e59e9b0262d47ee4ebf (patch)
tree141e44b1b831644c739f3ec4e0bef2d10ef71da7 /debian/squeeze/applications/kaffeine
parent7621ba87b889eccdea4958715c25de4b403ad705 (diff)
parent26f5630a822b38ef215210699e9e08e74143b38b (diff)
downloadtde-packaging-6f3a1bc646b0d5eb63f09e59e9b0262d47ee4ebf.tar.gz
tde-packaging-6f3a1bc646b0d5eb63f09e59e9b0262d47ee4ebf.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'debian/squeeze/applications/kaffeine')
-rw-r--r--debian/squeeze/applications/kaffeine/debian/changelog2
-rw-r--r--debian/squeeze/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install4
-rw-r--r--debian/squeeze/applications/kaffeine/debian/kaffeine-trinity.install8
3 files changed, 7 insertions, 7 deletions
diff --git a/debian/squeeze/applications/kaffeine/debian/changelog b/debian/squeeze/applications/kaffeine/debian/changelog
index c2c2946e3..856250282 100644
--- a/debian/squeeze/applications/kaffeine/debian/changelog
+++ b/debian/squeeze/applications/kaffeine/debian/changelog
@@ -6,7 +6,7 @@ kaffeine-trinity (0.8.6-0ubuntu6) karmic; urgency=low
kaffeine-trinity (0.8.6-0ubuntu5) intrepid; urgency=low
- * Moved KDE3 to /opt/trinity
+ * Moved Trinity to /opt/trinity
* Integrated properly with KDE4.2+
-- Timothy Pearson <kb9vqf@pearsoncomputing.net> Wed, 04 March 2009 01:11:00 -0600
diff --git a/debian/squeeze/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install b/debian/squeeze/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install
index ef17e5d67..cddfdc50f 100644
--- a/debian/squeeze/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install
+++ b/debian/squeeze/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install
@@ -1,4 +1,4 @@
-debian/tmp/opt/trinity/lib/kde3/libgstreamerpart.la
-debian/tmp/opt/trinity/lib/kde3/libgstreamerpart.so
+debian/tmp/opt/trinity/lib/trinity/libgstreamerpart.la
+debian/tmp/opt/trinity/lib/trinity/libgstreamerpart.so
debian/tmp/opt/trinity/share/services/gstreamer_part.desktop
debian/tmp/opt/trinity/share/apps/gstreamerpart/gstreamer_part.rc
diff --git a/debian/squeeze/applications/kaffeine/debian/kaffeine-trinity.install b/debian/squeeze/applications/kaffeine/debian/kaffeine-trinity.install
index 8fbe826e1..825837cba 100644
--- a/debian/squeeze/applications/kaffeine/debian/kaffeine-trinity.install
+++ b/debian/squeeze/applications/kaffeine/debian/kaffeine-trinity.install
@@ -15,9 +15,9 @@ debian/tmp/opt/trinity/share/mimelnk/application/x-kaffeine.desktop
debian/tmp/opt/trinity/share/locale/
debian/tmp/opt/trinity/include/kde/kaffeine/*h
debian/tmp/opt/trinity/share/services/kaffeineoggvorbis.desktop
-debian/tmp/opt/trinity/lib/kde3/libkaffeineoggvorbis.la
-debian/tmp/opt/trinity/lib/kde3/libkaffeineoggvorbis.so
-debian/tmp/opt/trinity/lib/kde3/libxinepart.la
-debian/tmp/opt/trinity/lib/kde3/libxinepart.so
+debian/tmp/opt/trinity/lib/trinity/libkaffeineoggvorbis.la
+debian/tmp/opt/trinity/lib/trinity/libkaffeineoggvorbis.so
+debian/tmp/opt/trinity/lib/trinity/libxinepart.la
+debian/tmp/opt/trinity/lib/trinity/libxinepart.so
debian/tmp/opt/trinity/share/services/xine_part.desktop