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

8 files changed, 21 insertions, 21 deletions

diff --git a/debian/squeeze/tdesdk/debian/cervisia-trinity.install b/debian/squeeze/tdesdk/debian/cervisia-trinity.install
index 8bbaccc5d..b4087e1c1 100644
--- a/debian/squeeze/tdesdk/debian/cervisia-trinity.install
+++ b/debian/squeeze/tdesdk/debian/cervisia-trinity.install
@@ -1,6 +1,6 @@
 debian/tmp/opt/trinity/bin/cervisia
-debian/tmp/opt/trinity/lib/libkdeinit_cervisia.la
-debian/tmp/opt/trinity/lib/libkdeinit_cervisia.so
+debian/tmp/opt/trinity/lib/libtdeinit_cervisia.la
+debian/tmp/opt/trinity/lib/libtdeinit_cervisia.so
 debian/tmp/opt/trinity/lib/trinity/cervisia.la
 debian/tmp/opt/trinity/lib/trinity/cervisia.so
 debian/tmp/opt/trinity/lib/trinity/libcervisiapart.la
diff --git a/debian/squeeze/tdesdk/debian/cervisia-trinity.lintian b/debian/squeeze/tdesdk/debian/cervisia-trinity.lintian
index d7a490dae..4e79c02c5 100644
--- a/debian/squeeze/tdesdk/debian/cervisia-trinity.lintian
+++ b/debian/squeeze/tdesdk/debian/cervisia-trinity.lintian
@@ -2,8 +2,8 @@
 cervisia: script-not-executable ./usr/share/apps/kconf_update/change_colors.pl
 cervisia: script-not-executable ./usr/share/apps/kconf_update/move_repositories.pl
 
-# This is from kdeinit black magic.
-cervisia: no-shlibs-control-file opt/trinity/lib/libkdeinit_cervisia.so
-cervisia: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_cervisia.so
-cervisia: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_cervisia.so
-cervisia: package-name-doesnt-match-sonames libkdeinit-cervisia
+# This is from tdeinit black magic.
+cervisia: no-shlibs-control-file opt/trinity/lib/libtdeinit_cervisia.so
+cervisia: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
+cervisia: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
+cervisia: package-name-doesnt-match-sonames libtdeinit-cervisia
diff --git a/debian/squeeze/tdesdk/debian/changelog b/debian/squeeze/tdesdk/debian/changelog
index e041b19d5..288f761e6 100644
--- a/debian/squeeze/tdesdk/debian/changelog
+++ b/debian/squeeze/tdesdk/debian/changelog
@@ -476,7 +476,7 @@ tdesdk (4:3.4.2-2.1) unstable; urgency=medium
 tdesdk (4:3.4.2-2) unstable; urgency=low
 
   * Built against libfam-dev, not libgamin-dev (closes: #326547).
-  * Updated overrides files to account for kdeinit black magic.
+  * Updated overrides files to account for tdeinit black magic.
 
  -- Ben Burton <bab@debian.org>  Sun,  4 Sep 2005 10:58:17 +1000
 
@@ -536,8 +536,8 @@ tdesdk (4:3.4.1-0ubuntu3) breezy; urgency=low
 
 tdesdk (4:3.4.1-0ubuntu2) breezy; urgency=low
 
-  * Add libkdeinit_cvsservice.so to libcvsservice0.install
-  * Add cervisia.so and libkdeinit_cervisia.so to cervisia.install
+  * Add libtdeinit_cvsservice.so to libcvsservice0.install
+  * Add cervisia.so and libtdeinit_cervisia.so to cervisia.install
 
  -- Jonathan Riddell <jr@jriddell.org>  Thu,  2 Jun 2005 01:33:59 +0000
 
diff --git a/debian/squeeze/tdesdk/debian/desktop-i18n/findfiles b/debian/squeeze/tdesdk/debian/desktop-i18n/findfiles
index 397948556..62e5012c2 100644
--- a/debian/squeeze/tdesdk/debian/desktop-i18n/findfiles
+++ b/debian/squeeze/tdesdk/debian/desktop-i18n/findfiles
@@ -28,7 +28,7 @@ find ./kimgio -name \*.kimgio -print 2>/dev/null | grep -v debian >> $filelist
 find ./noatun -name \*.plugin -print 2>/dev/null | grep -v debian >> $filelist
 find ./noatun-plugins -name \*.plugin -print 2>/dev/null | grep -v debian >> $filelist
 find ./amor/data -name \*rc -print 2>/dev/null | grep -v debian >> $filelist
-find ./kdeprint -name \*.print -print 2>/dev/null | grep -v debian >> $filelist 
+find ./tdeprint -name \*.print -print 2>/dev/null | grep -v debian >> $filelist 
 find . -name \*.kksrc -print 2>/dev/null | grep -v debian >> $filelist
 find ./kopete -name \*.plugin -print 2>/dev/null | grep -v debian >> $filelist
 find . -name \*.kdevtemplate -print 2>/dev/null | grep -v debian >> $filelist
diff --git a/debian/squeeze/tdesdk/debian/libcvsservice-trinity-dev.install b/debian/squeeze/tdesdk/debian/libcvsservice-trinity-dev.install
index ee6134374..ac87e6efb 100644
--- a/debian/squeeze/tdesdk/debian/libcvsservice-trinity-dev.install
+++ b/debian/squeeze/tdesdk/debian/libcvsservice-trinity-dev.install
@@ -3,5 +3,5 @@ debian/tmp/opt/trinity/include/kde/cvsservice_stub.h
 debian/tmp/opt/trinity/include/kde/repository_stub.h
 debian/tmp/opt/trinity/lib/libcvsservice.la
 debian/tmp/opt/trinity/lib/libcvsservice.so
-debian/tmp/opt/trinity/lib/libkdeinit_cvsaskpass.la
-debian/tmp/opt/trinity/lib/libkdeinit_cvsservice.la
+debian/tmp/opt/trinity/lib/libtdeinit_cvsaskpass.la
+debian/tmp/opt/trinity/lib/libtdeinit_cvsservice.la
diff --git a/debian/squeeze/tdesdk/debian/libcvsservice0-trinity.install b/debian/squeeze/tdesdk/debian/libcvsservice0-trinity.install
index c1649ddd2..6f6370493 100644
--- a/debian/squeeze/tdesdk/debian/libcvsservice0-trinity.install
+++ b/debian/squeeze/tdesdk/debian/libcvsservice0-trinity.install
@@ -2,8 +2,8 @@ debian/tmp/opt/trinity/bin/cvsaskpass
 debian/tmp/opt/trinity/bin/cvsservice
 debian/tmp/opt/trinity/lib/libcvsservice.so.0
 debian/tmp/opt/trinity/lib/libcvsservice.so.0.0.1
-debian/tmp/opt/trinity/lib/libkdeinit_cvsaskpass.so
-debian/tmp/opt/trinity/lib/libkdeinit_cvsservice.so
+debian/tmp/opt/trinity/lib/libtdeinit_cvsaskpass.so
+debian/tmp/opt/trinity/lib/libtdeinit_cvsservice.so
 debian/tmp/opt/trinity/lib/trinity/cvsaskpass.la
 debian/tmp/opt/trinity/lib/trinity/cvsaskpass.so
 debian/tmp/opt/trinity/lib/trinity/cvsservice.la
diff --git a/debian/squeeze/tdesdk/debian/libcvsservice0-trinity.lintian b/debian/squeeze/tdesdk/debian/libcvsservice0-trinity.lintian
index 1430a5540..f3a4e3325 100644
--- a/debian/squeeze/tdesdk/debian/libcvsservice0-trinity.lintian
+++ b/debian/squeeze/tdesdk/debian/libcvsservice0-trinity.lintian
@@ -1,3 +1,3 @@
-# This is from kdeinit black magic.
-libcvsservice0: shlib-missing-in-control-file libkdeinit_cvsaskpass.so opt/trinity/lib/libkdeinit_cvsaskpass.so
-libcvsservice0: shlib-missing-in-control-file libkdeinit_cvsservice.so opt/trinity/lib/libkdeinit_cvsservice.so
+# This is from tdeinit black magic.
+libcvsservice0: shlib-missing-in-control-file libtdeinit_cvsaskpass.so opt/trinity/lib/libtdeinit_cvsaskpass.so
+libcvsservice0: shlib-missing-in-control-file libtdeinit_cvsservice.so opt/trinity/lib/libtdeinit_cvsservice.so
diff --git a/debian/squeeze/tdesdk/debian/man/kdekillall.1 b/debian/squeeze/tdesdk/debian/man/kdekillall.1
index 2a2c5c8a5..2bd5eb224 100644
--- a/debian/squeeze/tdesdk/debian/man/kdekillall.1
+++ b/debian/squeeze/tdesdk/debian/man/kdekillall.1
@@ -16,14 +16,14 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-kdekillall \- kills processes started with kdeinit
+kdekillall \- kills processes started with tdeinit
 .SH SYNOPSIS
 .B kdekillall
 [ \fB\-\fP\fIsignal\fP ] \fIprocess-name\fP
 .SH DESCRIPTION
 \fBkdekillall\fP kills all processes with a particular name
-that were started through kdeinit.  Specifically, it kills all processes
-\fBkdeinit:\fP \fIprocess-name\fP.
+that were started through tdeinit.  Specifically, it kills all processes
+\fBtdeinit:\fP \fIprocess-name\fP.
 .PP
 This utility is part of the KDE Software Development Kit.
 .SH OPTIONS