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

9 files changed, 20 insertions, 20 deletions

diff --git a/ubuntu/maverick/tdeutils/debian/ark-trinity-trinity.lintian b/ubuntu/maverick/tdeutils/debian/ark-trinity-trinity.lintian
index 7c958e5e4..2b8d3a553 100644
--- a/ubuntu/maverick/tdeutils/debian/ark-trinity-trinity.lintian
+++ b/ubuntu/maverick/tdeutils/debian/ark-trinity-trinity.lintian
@@ -1,3 +1,3 @@
-ark: no-shlibs-control-file opt/trinity/lib/libkdeinit_ark.so
-ark: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_ark.so
-ark: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_ark.so
+ark: no-shlibs-control-file opt/trinity/lib/libtdeinit_ark.so
+ark: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
+ark: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
diff --git a/ubuntu/maverick/tdeutils/debian/ark-trinity.install b/ubuntu/maverick/tdeutils/debian/ark-trinity.install
index bb908c9c3..fd8123f1a 100644
--- a/ubuntu/maverick/tdeutils/debian/ark-trinity.install
+++ b/ubuntu/maverick/tdeutils/debian/ark-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/lib/trinity/ark.la
 debian/tmp/opt/trinity/lib/trinity/ark.so
 debian/tmp/opt/trinity/lib/trinity/libarkpart.la
 debian/tmp/opt/trinity/lib/trinity/libarkpart.so
-debian/tmp/opt/trinity/lib/libkdeinit_ark.so
+debian/tmp/opt/trinity/lib/libtdeinit_ark.so
 debian/tmp/opt/trinity/share/applications/kde/ark.desktop
 debian/tmp/opt/trinity/share/apps/ark/ark_part.rc
 debian/tmp/opt/trinity/share/apps/ark/ark_part_readonly.rc
diff --git a/ubuntu/maverick/tdeutils/debian/kcalc-trinity-trinity.lintian b/ubuntu/maverick/tdeutils/debian/kcalc-trinity-trinity.lintian
index d05acaa86..075ce6c50 100644
--- a/ubuntu/maverick/tdeutils/debian/kcalc-trinity-trinity.lintian
+++ b/ubuntu/maverick/tdeutils/debian/kcalc-trinity-trinity.lintian
@@ -1,3 +1,3 @@
-kcalc: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcalc.so
-kcalc: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kcalc.so
-kcalc: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kcalc.so
+kcalc: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcalc.so
+kcalc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
+kcalc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
diff --git a/ubuntu/maverick/tdeutils/debian/kcalc-trinity.install b/ubuntu/maverick/tdeutils/debian/kcalc-trinity.install
index bf44a2749..b4806f5f0 100644
--- a/ubuntu/maverick/tdeutils/debian/kcalc-trinity.install
+++ b/ubuntu/maverick/tdeutils/debian/kcalc-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/kcalc
 debian/tmp/opt/trinity/lib/trinity/kcalc.la
 debian/tmp/opt/trinity/lib/trinity/kcalc.so
-debian/tmp/opt/trinity/lib/libkdeinit_kcalc.so
+debian/tmp/opt/trinity/lib/libtdeinit_kcalc.so
 debian/tmp/opt/trinity/share/applications/kde/kcalc.desktop
 debian/tmp/opt/trinity/share/apps/kcalc/kcalcui.rc
 debian/tmp/opt/trinity/share/apps/kconf_update/kcalcrc.upd
diff --git a/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.install b/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.install
index 7753037cb..cf0ff5438 100644
--- a/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.install
+++ b/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.install
@@ -3,7 +3,7 @@ debian/tmp/opt/trinity/lib/trinity/irkick.la
 debian/tmp/opt/trinity/lib/trinity/irkick.so
 debian/tmp/opt/trinity/lib/trinity/kcm_kcmlirc.la
 debian/tmp/opt/trinity/lib/trinity/kcm_kcmlirc.so
-debian/tmp/opt/trinity/lib/libkdeinit_irkick.so
+debian/tmp/opt/trinity/lib/libtdeinit_irkick.so
 debian/tmp/opt/trinity/share/applications/kde/irkick.desktop
 debian/tmp/opt/trinity/share/applications/kde/kcmlirc.desktop
 debian/tmp/opt/trinity/share/apps/irkick/icons/hicolor/16x16/actions/irkick.png
diff --git a/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.lintian b/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.lintian
index 51b260d6a..986b7f7d4 100644
--- a/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.lintian
+++ b/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.lintian
@@ -1,3 +1,3 @@
-kdelirc: no-shlibs-control-file opt/trinity/lib/libkdeinit_irkick.so
-kdelirc: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_irkick.so
-kdelirc: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_irkick.so
+kdelirc: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so
+kdelirc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
+kdelirc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
diff --git a/ubuntu/maverick/tdeutils/debian/kedit-trinity.install b/ubuntu/maverick/tdeutils/debian/kedit-trinity.install
index 0ecca6f75..9e70f971b 100644
--- a/ubuntu/maverick/tdeutils/debian/kedit-trinity.install
+++ b/ubuntu/maverick/tdeutils/debian/kedit-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/kedit
 debian/tmp/opt/trinity/lib/trinity/kedit.la
 debian/tmp/opt/trinity/lib/trinity/kedit.so
-debian/tmp/opt/trinity/lib/libkdeinit_kedit.so
+debian/tmp/opt/trinity/lib/libtdeinit_kedit.so
 debian/tmp/opt/trinity/share/applications/kde/KEdit.desktop
 debian/tmp/opt/trinity/share/apps/kedit/keditui.rc
 debian/tmp/opt/trinity/share/config.kcfg/kedit.kcfg
diff --git a/ubuntu/maverick/tdeutils/debian/kedit-trinity.lintian b/ubuntu/maverick/tdeutils/debian/kedit-trinity.lintian
index 864682bca..a2a63b3ba 100644
--- a/ubuntu/maverick/tdeutils/debian/kedit-trinity.lintian
+++ b/ubuntu/maverick/tdeutils/debian/kedit-trinity.lintian
@@ -1,3 +1,3 @@
-kedit: no-shlibs-control-file opt/trinity/lib/libkdeinit_kedit.so
-kedit: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kedit.so
-kedit: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kedit.so
+kedit: no-shlibs-control-file opt/trinity/lib/libtdeinit_kedit.so
+kedit: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
+kedit: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-dev.install b/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-dev.install
index e6ba996f4..a3c425a38 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-dev.install
+++ b/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-dev.install
@@ -15,10 +15,10 @@ debian/tmp/opt/trinity/include/kde/ksim/themetypes.h
 debian/tmp/opt/trinity/include/kde/kwidgetstreamer.h
 debian/tmp/opt/trinity/lib/libkcmlaptop.la
 debian/tmp/opt/trinity/lib/libkcmlaptop.so
-debian/tmp/opt/trinity/lib/libkdeinit_ark.la
-debian/tmp/opt/trinity/lib/libkdeinit_irkick.la
-debian/tmp/opt/trinity/lib/libkdeinit_kcalc.la
-debian/tmp/opt/trinity/lib/libkdeinit_kedit.la
+debian/tmp/opt/trinity/lib/libtdeinit_ark.la
+debian/tmp/opt/trinity/lib/libtdeinit_irkick.la
+debian/tmp/opt/trinity/lib/libtdeinit_kcalc.la
+debian/tmp/opt/trinity/lib/libtdeinit_kedit.la
 debian/tmp/opt/trinity/lib/libkmilo.la
 debian/tmp/opt/trinity/lib/libkmilo.so
 debian/tmp/opt/trinity/lib/libkregexpeditorcommon.la