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

8 files changed, 16 insertions, 16 deletions

diff --git a/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.install b/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.install
index 99491c4e7..bdbbef7c6 100644
--- a/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.install
@@ -9,7 +9,7 @@ debian/tmp/opt/trinity/lib/trinity/libkmrmlpart.la
 debian/tmp/opt/trinity/lib/trinity/libkmrmlpart.so
 debian/tmp/opt/trinity/lib/trinity/mrmlsearch.la
 debian/tmp/opt/trinity/lib/trinity/mrmlsearch.so
-debian/tmp/opt/trinity/lib/libkdeinit_mrmlsearch.so
+debian/tmp/opt/trinity/lib/libtdeinit_mrmlsearch.so
 debian/tmp/opt/trinity/share/applications/kde/kcmkmrml.desktop
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/mrml-servicemenu.desktop
 debian/tmp/opt/trinity/share/mimelnk/text/mrml.desktop
diff --git a/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.lintian b/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.lintian
index 5c83f447b..e3a5ddb8a 100644
--- a/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.lintian
+++ b/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.lintian
@@ -1,4 +1,4 @@
-kmrml: no-shlibs-control-file opt/trinity/lib/libkdeinit_mrmlsearch.so
-kmrml: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_mrmlsearch.so
-kmrml: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_mrmlsearch.so
-kmrml: package-name-doesnt-match-sonames libkdeinit-mrmlsearch
+kmrml: no-shlibs-control-file opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml: package-name-doesnt-match-sonames libtdeinit-mrmlsearch
diff --git a/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.install b/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.install
index 07929cfa2..d9ef57977 100644
--- a/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/kuickshow
 debian/tmp/opt/trinity/lib/trinity/kuickshow.la
 debian/tmp/opt/trinity/lib/trinity/kuickshow.so
-debian/tmp/opt/trinity/lib/libkdeinit_kuickshow.so
+debian/tmp/opt/trinity/lib/libtdeinit_kuickshow.so
 debian/tmp/opt/trinity/share/applications/kde/kuickshow.desktop
 debian/tmp/opt/trinity/share/apps/kuickshow/im_palette.pal
 debian/tmp/opt/trinity/share/apps/kuickshow/pics/about.png
diff --git a/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.lintian b/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.lintian
index 61cb450ac..4551b5f0c 100644
--- a/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.lintian
+++ b/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.lintian
@@ -1,4 +1,4 @@
-kuickshow: no-shlibs-control-file opt/trinity/lib/libkdeinit_kuickshow.so
-kuickshow: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kuickshow.so
-kuickshow: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kuickshow.so
-kuickshow: package-name-doesnt-match-sonames libkdeinit-kuickshow
+kuickshow: no-shlibs-control-file opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow: package-name-doesnt-match-sonames libtdeinit-kuickshow
diff --git a/ubuntu/maverick/tdegraphics/debian/kview-trinity.install b/ubuntu/maverick/tdegraphics/debian/kview-trinity.install
index 0efbbd7b5..ca570ad61 100644
--- a/ubuntu/maverick/tdegraphics/debian/kview-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/kview-trinity.install
@@ -21,7 +21,7 @@ debian/tmp/opt/trinity/lib/trinity/libkviewcanvas.la
 debian/tmp/opt/trinity/lib/trinity/libkviewcanvas.so
 debian/tmp/opt/trinity/lib/trinity/libkviewviewer.la
 debian/tmp/opt/trinity/lib/trinity/libkviewviewer.so
-debian/tmp/opt/trinity/lib/libkdeinit_kview.so
+debian/tmp/opt/trinity/lib/libtdeinit_kview.so
 debian/tmp/opt/trinity/lib/libkimageviewer.so.0
 debian/tmp/opt/trinity/lib/libkimageviewer.so.0.0.0
 debian/tmp/opt/trinity/lib/trinity/libphotobook.la
diff --git a/ubuntu/maverick/tdegraphics/debian/kview-trinity.lintian b/ubuntu/maverick/tdegraphics/debian/kview-trinity.lintian
index 8314a8155..b81a18ccc 100644
--- a/ubuntu/maverick/tdegraphics/debian/kview-trinity.lintian
+++ b/ubuntu/maverick/tdegraphics/debian/kview-trinity.lintian
@@ -1,3 +1,3 @@
 kview: shlib-missing-in-control-file libphotobook.so opt/trinity/lib/libphotobook.so
-kview: shlib-missing-in-control-file libkdeinit_kview.so opt/trinity/lib/libkdeinit_kview.so
-kview: package-name-doesnt-match-sonames libkdeinit-kview libkimageviewer0
+kview: shlib-missing-in-control-file libtdeinit_kview.so opt/trinity/lib/libtdeinit_kview.so
+kview: package-name-doesnt-match-sonames libtdeinit-kview libkimageviewer0
diff --git a/ubuntu/maverick/tdegraphics/debian/rules b/ubuntu/maverick/tdegraphics/debian/rules
index 42330d01a..caff9212a 100755
--- a/ubuntu/maverick/tdegraphics/debian/rules
+++ b/ubuntu/maverick/tdegraphics/debian/rules
@@ -35,7 +35,7 @@ DEB_DH_MAKESHLIBS_ARGS_libkscan1-trinity	:= -V'libkscan1-trinity (>= 4:3.5.5-1)'
 
 binary-post-install/kuickshow-trinity::
 ifeq ($(DEB_HOST_ARCH), powerpc)
-	chrpath -d -k debian/kuickshow-trinity/opt/trinity/lib/libkdeinit_kuickshow.so
+	chrpath -d -k debian/kuickshow-trinity/opt/trinity/lib/libtdeinit_kuickshow.so
 endif
 
 #shlibs_ver = 4:3.5.0-1
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-dev-trinity.install b/ubuntu/maverick/tdegraphics/debian/tdegraphics-dev-trinity.install
index 3c15273ee..608149acc 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-dev-trinity.install
+++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-dev-trinity.install
@@ -179,8 +179,8 @@ debian/tmp/opt/trinity/include/kde/kviewshell/zoomlimits.h
 debian/tmp/opt/trinity/include/kde/libtext2path-0.1/BezierPath.h
 debian/tmp/opt/trinity/include/kde/libtext2path-0.1/Glyph.h
 debian/tmp/opt/trinity/include/kde/libtext2path-0.1/GlyphTracer.h
-debian/tmp/opt/trinity/lib/libkdeinit_kview.la
-debian/tmp/opt/trinity/lib/libkdeinit_mrmlsearch.la
+debian/tmp/opt/trinity/lib/libtdeinit_kview.la
+debian/tmp/opt/trinity/lib/libtdeinit_mrmlsearch.la
 debian/tmp/opt/trinity/lib/libkghostviewlib.la
 debian/tmp/opt/trinity/lib/libkghostviewlib.so
 debian/tmp/opt/trinity/lib/libkimageviewer.la