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

7 files changed, 16 insertions, 16 deletions

diff --git a/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.install b/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.install
index 742bd3f9c..79dfc1cef 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.install
+++ b/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.install
@@ -6,8 +6,8 @@ debian/tmp/opt/trinity/lib/trinity/kmix_panelapplet.la
 debian/tmp/opt/trinity/lib/trinity/kmix_panelapplet.so
 debian/tmp/opt/trinity/lib/trinity/kmixctrl.la
 debian/tmp/opt/trinity/lib/trinity/kmixctrl.so
-debian/tmp/opt/trinity/lib/libkdeinit_kmix.so
-debian/tmp/opt/trinity/lib/libkdeinit_kmixctrl.so
+debian/tmp/opt/trinity/lib/libtdeinit_kmix.so
+debian/tmp/opt/trinity/lib/libtdeinit_kmixctrl.so
 debian/tmp/opt/trinity/share/applications/kde/kmix.desktop
 debian/tmp/opt/trinity/share/apps/kicker/applets/kmixapplet.desktop
 debian/tmp/opt/trinity/share/apps/kmix/kmixui.rc
diff --git a/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.lintian b/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.lintian
index 6f97d1c92..a2a96f9ee 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.lintian
+++ b/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.lintian
@@ -1,4 +1,4 @@
-kmix: no-shlibs-control-file opt/trinity/lib/libkdeinit_kmixctrl.so
-kmix: no-shlibs-control-file opt/trinity/lib/libkdeinit_kmix.so
-kmix: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kmixctrl.so
-kmix: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kmixctrl.so
+kmix: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmixctrl.so
+kmix: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmix.so
+kmix: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
+kmix: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
diff --git a/ubuntu/maverick/tdemultimedia/debian/krec-trinity.install b/ubuntu/maverick/tdemultimedia/debian/krec-trinity.install
index 7446b200d..bbb4ed25f 100644
--- a/ubuntu/maverick/tdemultimedia/debian/krec-trinity.install
+++ b/ubuntu/maverick/tdemultimedia/debian/krec-trinity.install
@@ -9,7 +9,7 @@ debian/tmp/opt/trinity/lib/trinity/libkrecexport_ogg.la
 debian/tmp/opt/trinity/lib/trinity/libkrecexport_ogg.so
 debian/tmp/opt/trinity/lib/trinity/libkrecexport_wave.la
 debian/tmp/opt/trinity/lib/trinity/libkrecexport_wave.so
-debian/tmp/opt/trinity/lib/libkdeinit_krec.so
+debian/tmp/opt/trinity/lib/libtdeinit_krec.so
 debian/tmp/opt/trinity/share/applications/kde/krec.desktop
 debian/tmp/opt/trinity/share/apps/krec/icons/crystalsvg/16x16/actions/krec_record.png
 debian/tmp/opt/trinity/share/apps/krec/icons/crystalsvg/22x22/actions/krec_record.png
diff --git a/ubuntu/maverick/tdemultimedia/debian/krec-trinity.lintian b/ubuntu/maverick/tdemultimedia/debian/krec-trinity.lintian
index 4b6b929a1..b09b553d8 100644
--- a/ubuntu/maverick/tdemultimedia/debian/krec-trinity.lintian
+++ b/ubuntu/maverick/tdemultimedia/debian/krec-trinity.lintian
@@ -1,3 +1,3 @@
-krec: no-shlibs-control-file opt/trinity/lib/libkdeinit_krec.so
-krec: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_krec.so
-krec: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_krec.so
+krec: no-shlibs-control-file opt/trinity/lib/libtdeinit_krec.so
+krec: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
+krec: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
diff --git a/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.install b/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.install
index 21524ef0b..e7b22e4e0 100644
--- a/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.install
+++ b/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.install
@@ -38,7 +38,7 @@ debian/tmp/opt/trinity/lib/trinity/noatunsimple.la
 debian/tmp/opt/trinity/lib/trinity/noatunsimple.so
 debian/tmp/opt/trinity/lib/libartseffects.la
 debian/tmp/opt/trinity/lib/libartseffects.so
-debian/tmp/opt/trinity/lib/libkdeinit_noatun.so
+debian/tmp/opt/trinity/lib/libtdeinit_noatun.so
 debian/tmp/opt/trinity/lib/libnoatun.so.1
 debian/tmp/opt/trinity/lib/libnoatun.so.1.2.0
 debian/tmp/opt/trinity/lib/libnoatunarts.la
diff --git a/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.lintian b/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.lintian
index 2dba45ea5..89faa71aa 100644
--- a/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.lintian
+++ b/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.lintian
@@ -1,4 +1,4 @@
 noatun: shlib-missing-in-control-file libwinskinvis.so opt/trinity/lib/libwinskinvis.so
 noatun: shlib-missing-in-control-file libartseffects.so opt/trinity/lib/libartseffects.so
 noatun: shlib-missing-in-control-file libnoatunarts.so opt/trinity/lib/libnoatunarts.so
-noatun: shlib-missing-in-control-file libkdeinit_noatun.so opt/trinity/lib/libkdeinit_noatun.so
+noatun: shlib-missing-in-control-file libtdeinit_noatun.so opt/trinity/lib/libtdeinit_noatun.so
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-trinity-dev.install b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-trinity-dev.install
index 343efda6f..a6b4265bd 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-trinity-dev.install
+++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-trinity-dev.install
@@ -151,10 +151,10 @@ debian/tmp/opt/trinity/lib/libaudiocdplugins.la
 debian/tmp/opt/trinity/lib/libaudiocdplugins.so
 debian/tmp/opt/trinity/lib/libkcddb.la
 debian/tmp/opt/trinity/lib/libkcddb.so
-debian/tmp/opt/trinity/lib/libkdeinit_kmix.la
-debian/tmp/opt/trinity/lib/libkdeinit_kmixctrl.la
-debian/tmp/opt/trinity/lib/libkdeinit_krec.la
-debian/tmp/opt/trinity/lib/libkdeinit_noatun.la
+debian/tmp/opt/trinity/lib/libtdeinit_kmix.la
+debian/tmp/opt/trinity/lib/libtdeinit_kmixctrl.la
+debian/tmp/opt/trinity/lib/libtdeinit_krec.la
+debian/tmp/opt/trinity/lib/libtdeinit_noatun.la
 debian/tmp/opt/trinity/lib/libkmidlib.la
 debian/tmp/opt/trinity/lib/libkmidlib.so
 debian/tmp/opt/trinity/lib/libmpeg.la