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

7 files changed, 17 insertions, 17 deletions

diff --git a/ubuntu/maverick/kdewebdev/debian/changelog b/ubuntu/maverick/kdewebdev/debian/changelog
index 36cb83a38..67562c948 100644
--- a/ubuntu/maverick/kdewebdev/debian/changelog
+++ b/ubuntu/maverick/kdewebdev/debian/changelog
@@ -6,7 +6,7 @@ kdewebdev-trinity (4:3.5.10-0ubuntu5) karmic; urgency=low
 
 kdewebdev-trinity (4:3.5.10-0ubuntu1~intrepid2) intrepid; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 03 March 2009 20:08:00 -0600
@@ -577,7 +577,7 @@ quanta (1:3.1.0-3) unstable; urgency=low
 
 quanta (1:3.1.0-2) unstable; urgency=low
 
-  * First KDE3 upload to debian (closes: #164599).
+  * First Trinity upload to debian (closes: #164599).
   * Updated PHP documentation index (closes: #96787).
   * Latin characters are displayed correctly (closes: #124005).
 
@@ -611,7 +611,7 @@ quanta (1:3.0pr2-1) unstable; urgency=low
 quanta (1:3.0pr1-1) unstable; urgency=low
 
   * New upstream release.
-  * Built for KDE3.
+  * Built for Trinity.
 
  -- Ben Burton <benb@acm.org>  Wed,  4 Sep 2002 10:36:12 +1000
 
diff --git a/ubuntu/maverick/kdewebdev/debian/kfilereplace-trinity.install b/ubuntu/maverick/kdewebdev/debian/kfilereplace-trinity.install
index 1a39dc32e..ea0c71bee 100644
--- a/ubuntu/maverick/kdewebdev/debian/kfilereplace-trinity.install
+++ b/ubuntu/maverick/kdewebdev/debian/kfilereplace-trinity.install
@@ -1,6 +1,6 @@
 debian/tmp/opt/trinity/bin/kfilereplace
-debian/tmp/opt/trinity/lib/kde3/libkfilereplacepart.la
-debian/tmp/opt/trinity/lib/kde3/libkfilereplacepart.so
+debian/tmp/opt/trinity/lib/trinity/libkfilereplacepart.la
+debian/tmp/opt/trinity/lib/trinity/libkfilereplacepart.so
 debian/tmp/opt/trinity/share/applications/kde/kfilereplace.desktop
 debian/tmp/opt/trinity/share/apps/kfilereplace/kfilereplaceui.rc
 debian/tmp/opt/trinity/share/apps/kfilereplacepart
diff --git a/ubuntu/maverick/kdewebdev/debian/kimagemapeditor-trinity.install b/ubuntu/maverick/kdewebdev/debian/kimagemapeditor-trinity.install
index c29527c1b..62dfdcceb 100644
--- a/ubuntu/maverick/kdewebdev/debian/kimagemapeditor-trinity.install
+++ b/ubuntu/maverick/kdewebdev/debian/kimagemapeditor-trinity.install
@@ -1,8 +1,8 @@
 debian/icons/kimagemapeditor.xpm	/opt/trinity/share/pixmaps
 
 debian/tmp/opt/trinity/bin/kimagemapeditor
-debian/tmp/opt/trinity/lib/kde3/libkimagemapeditor.la
-debian/tmp/opt/trinity/lib/kde3/libkimagemapeditor.so
+debian/tmp/opt/trinity/lib/trinity/libkimagemapeditor.la
+debian/tmp/opt/trinity/lib/trinity/libkimagemapeditor.so
 debian/tmp/opt/trinity/share/applications/kde/kimagemapeditor.desktop
 debian/tmp/opt/trinity/share/apps/kimagemapeditor
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kimagemapeditor.png
diff --git a/ubuntu/maverick/kdewebdev/debian/klinkstatus-trinity.install b/ubuntu/maverick/kdewebdev/debian/klinkstatus-trinity.install
index b9df813b2..f483a219b 100644
--- a/ubuntu/maverick/kdewebdev/debian/klinkstatus-trinity.install
+++ b/ubuntu/maverick/kdewebdev/debian/klinkstatus-trinity.install
@@ -1,8 +1,8 @@
 debian/icons/klinkstatus.xpm	/opt/trinity/share/pixmaps
 
 debian/tmp/opt/trinity/bin/klinkstatus
-debian/tmp/opt/trinity/lib/kde3/libklinkstatuspart.la
-debian/tmp/opt/trinity/lib/kde3/libklinkstatuspart.so
+debian/tmp/opt/trinity/lib/trinity/libklinkstatuspart.la
+debian/tmp/opt/trinity/lib/trinity/libklinkstatuspart.so
 debian/tmp/opt/trinity/share/applications/kde/klinkstatus.desktop
 debian/tmp/opt/trinity/share/apps/klinkstatus
 debian/tmp/opt/trinity/share/apps/klinkstatuspart
diff --git a/ubuntu/maverick/kdewebdev/debian/kommander-trinity.install b/ubuntu/maverick/kdewebdev/debian/kommander-trinity.install
index b17b858ea..230dadb45 100644
--- a/ubuntu/maverick/kdewebdev/debian/kommander-trinity.install
+++ b/ubuntu/maverick/kdewebdev/debian/kommander-trinity.install
@@ -25,8 +25,8 @@ debian/tmp/opt/trinity/share/mimelnk/application/x-kommander.desktop
 kommander/examples /opt/trinity/share/doc/kommander
 kommander/working/extractkmdr /opt/trinity/bin
 kommander/working/kmdr2po /opt/trinity/bin
-debian/tmp/opt/trinity/lib/kde3/libkommander_part.so
-debian/tmp/opt/trinity/lib/kde3/libkommander_part.la
+debian/tmp/opt/trinity/lib/trinity/libkommander_part.so
+debian/tmp/opt/trinity/lib/trinity/libkommander_part.la
 debian/tmp/opt/trinity/share/apps/kommander/pics/toolbox.png
 debian/tmp/opt/trinity/share/apps/kommander/pics/kfontcombo.png
 debian/tmp/opt/trinity/share/apps/kommander/translating/extractkmdr
diff --git a/ubuntu/maverick/kdewebdev/debian/kxsldbg-trinity.install b/ubuntu/maverick/kdewebdev/debian/kxsldbg-trinity.install
index ec9b78a4b..71ccaf3ec 100644
--- a/ubuntu/maverick/kdewebdev/debian/kxsldbg-trinity.install
+++ b/ubuntu/maverick/kdewebdev/debian/kxsldbg-trinity.install
@@ -1,7 +1,7 @@
 debian/tmp/opt/trinity/bin/kxsldbg
 debian/tmp/opt/trinity/bin/xsldbg
-debian/tmp/opt/trinity/lib/kde3/libkxsldbgpart.la
-debian/tmp/opt/trinity/lib/kde3/libkxsldbgpart.so
+debian/tmp/opt/trinity/lib/trinity/libkxsldbgpart.la
+debian/tmp/opt/trinity/lib/trinity/libkxsldbgpart.so
 debian/tmp/opt/trinity/share/applications/kde/kxsldbg.desktop
 debian/tmp/opt/trinity/share/apps/kxsldbg
 debian/tmp/opt/trinity/share/apps/kxsldbgpart
diff --git a/ubuntu/maverick/kdewebdev/debian/quanta-trinity.install b/ubuntu/maverick/kdewebdev/debian/quanta-trinity.install
index a65362c1e..638a01597 100644
--- a/ubuntu/maverick/kdewebdev/debian/quanta-trinity.install
+++ b/ubuntu/maverick/kdewebdev/debian/quanta-trinity.install
@@ -2,10 +2,10 @@ debian/docrc/*.docrc        /opt/trinity/share/apps/quanta/doc
 debian/icons/quanta.xpm	/opt/trinity/share/pixmaps
 
 debian/tmp/opt/trinity/bin/quanta
-debian/tmp/opt/trinity/lib/kde3/quantadebuggerdbgp.la
-debian/tmp/opt/trinity/lib/kde3/quantadebuggerdbgp.so
-debian/tmp/opt/trinity/lib/kde3/quantadebuggergubed.la
-debian/tmp/opt/trinity/lib/kde3/quantadebuggergubed.so
+debian/tmp/opt/trinity/lib/trinity/quantadebuggerdbgp.la
+debian/tmp/opt/trinity/lib/trinity/quantadebuggerdbgp.so
+debian/tmp/opt/trinity/lib/trinity/quantadebuggergubed.la
+debian/tmp/opt/trinity/lib/trinity/quantadebuggergubed.so
 debian/tmp/opt/trinity/share/applications/kde/quanta.desktop
 debian/tmp/opt/trinity/share/apps/kafkapart
 debian/tmp/opt/trinity/share/doc/kde/HTML/en/quanta/*.bz2