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

16 files changed, 33 insertions, 33 deletions

diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/changelog b/ubuntu/maverick/libraries/kipi-plugins/debian/changelog
index da8fca349..d9e80a9a4 100755
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/changelog
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/changelog
@@ -45,9 +45,9 @@ kipi-plugins (0.1.5-1) unstable; urgency=low
     + remove automake: not needed
     + remove libexif-dev: replaced upstream by libexiv2-dev
   * Cherry pick fixes from SVN:
-    + 40_kdesvn786355_timeadjusst_fix_filestat.diff
-    + 40_kdesvn786363_timeAdjust_update_DateTimeOriginal.diff
-    + 40_kdesvn786549_99_rawDecoding_jpeg_compression.diff
+    + 40_tdesvn786355_timeadjusst_fix_filestat.diff
+    + 40_tdesvn786363_timeAdjust_update_DateTimeOriginal.diff
+    + 40_tdesvn786549_99_rawDecoding_jpeg_compression.diff
     Thx to upstream for pointing me to those patches.
 
   [ Fathi Boudra ]
@@ -120,7 +120,7 @@ kipi-plugins (0.1.4~beta2-1) experimental; urgency=low
      50_libkexiv2-0.patch
      50_libkexiv2-1.patch
      50_libkexiv2-2.patch
-     15_kdesvn_655231_fix-gallery-2.2-export.diff
+     15_tdesvn_655231_fix-gallery-2.2-export.diff
      Bug#417297-GCC4.3.diff
 
  -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Tue, 26 Jun 2007 23:28:36 +0100
@@ -130,7 +130,7 @@ kipi-plugins (0.1.3-5) unstable; urgency=low
   [ Achim Bohnet ]
   * debian/control: set kipi-plugins-doc section to doc. Fixes override
     disparity on uploads.
-  * Add debian/patches/15_kdesvn_655231_fix-gallery-2.2-export.diff
+  * Add debian/patches/15_tdesvn_655231_fix-gallery-2.2-export.diff
     Fixes export to gallery 2.2: http://bugs.kde.org/show_bug.cgi?id=142259
   * Add debian/patches/50_libkexiv2-{1,2,3}.patch:  Fixes FTBFS with
     libexiv2 0.14.  This adds also a build dependency on libkexiv2-dev
@@ -206,8 +206,8 @@ kipi-plugins (0.1.3-1) experimental; urgency=low
     + ipodexport fix for relibtoolization (KDE bug 140279):
       ipodexport is calling g_type_init() explicitely without linking 
       against libgobject-2.0: debian/patches/40_fix_ipod_export_linking.diff
-  * remove patches/10_kdesvn_618170_Makefile.am_libs_used_only.diff and
-    patches/30_kdesvn_625568_pod.patch. Included upstream.
+  * remove patches/10_tdesvn_618170_Makefile.am_libs_used_only.diff and
+    patches/30_tdesvn_625568_pod.patch. Included upstream.
 
  -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Thu, 25 Jan 2007 21:34:40 +0100
 
@@ -236,7 +236,7 @@ kipi-plugins (0.1.3~rc1-1) experimental; urgency=low
     + order plugins list in long description as in README
     + avoid term 'plugins' in short description of the plugins
   * relibtoolization:
-      add patches/10_kdesvn_618170_Makefile.am_libs_used_only.diff
+      add patches/10_tdesvn_618170_Makefile.am_libs_used_only.diff
 
  -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Fri, 29 Dec 2006 13:46:46 +0100
 
@@ -366,7 +366,7 @@ kipi-plugins (0.1+rc1-1) unstable; urgency=low
 
   [ Achim Bohnet ]
   * Now that the pkgs are build on all archs, fix build dependencies
-     + kdelibs4-dev: remove version
+     + tdelibs4-dev: remove version
      + libkexif1-dev (>= 0.2-1), libkipi0-dev (>= 0.1-1): (re)set
        versions to last API change. (Helps backporting.)
   * patches/01_rawconverter_dcraw7.0+trinity.4-fixes-from-head.diff removed.
@@ -396,7 +396,7 @@ kipi-plugins (0.1+rc1-1) unstable; urgency=low
 kipi-plugins (0.1+beta2-22) unstable; urgency=low
 
   * C++ transition package
-  * Upgrade Build-Depends: kdelibs4-dev (>= 3.4.2-1), libkexif1-dev (>=
+  * Upgrade Build-Depends: tdelibs4-dev (>= 3.4.2-1), libkexif1-dev (>=
     0.2.1-5), libkipi0-dev (>= 0.1.1-3)
 
  -- Mark Purcell <msp@debian.org>  Sun, 21 Aug 2005 10:48:53 +0100
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/control b/ubuntu/maverick/libraries/kipi-plugins/debian/control
index bbbdb77a5..7a396b78c 100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/control
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/control
@@ -3,10 +3,10 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Mark Purcell <msp@debian.org>, Achim Bohnet <ach@mpe.mpg.de>, Fathi Boudra <fabo@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), quilt, pkg-config, kdelibs4-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 5), quilt, pkg-config, tdelibs4-trinity-dev,
  libexiv2-dev, libgphoto2-2-dev, libgpod-nogtk-dev,
  libkcal2-trinity-dev, libkdcraw3-trinity-dev, libkexiv2-3-trinity-dev,
- libkipi0-trinity-dev, libtiff4-dev, libxslt1-dev, kdepim-trinity-dev,
+ libkipi0-trinity-dev, libtiff4-dev, libxslt1-dev, tdepim-trinity-dev,
  automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://www.kipi-plugins.org/
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/control.in b/ubuntu/maverick/libraries/kipi-plugins/debian/control.in
index 2f1de6547..0d68a8196 100755
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/control.in
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/control.in
@@ -4,10 +4,10 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>= 5), quilt, pkg-config, kdelibs4-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 5), quilt, pkg-config, tdelibs4-trinity-dev,
  libexiv2-trinity-dev (>= 0.16), libgphoto2-2-dev, libgpod-nogtk-dev,
  libkcal2-trinity-dev, libkdcraw3-trinity-dev, libkexiv2-3-trinity-dev,
- libkipi0-trinity-dev, libtiff4-dev, libxslt1-dev, kdepim-trinity-dev,
+ libkipi0-trinity-dev, libtiff4-dev, libxslt1-dev, tdepim-trinity-dev,
  automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 Homepage: http://www.kipi-plugins.org/
diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/control b/ubuntu/maverick/libraries/libkdcraw/debian/control
index 33909fbf5..906728ee0 100644
--- a/ubuntu/maverick/libraries/libkdcraw/debian/control
+++ b/ubuntu/maverick/libraries/libkdcraw/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp@debian.org>, Achim Bohnet <ach@mpe.mpg.de>, Fathi Boudra <fabo@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), quilt, kdelibs4-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs4-trinity-dev,
  liblcms1-dev, libjpeg62-dev, pkg-config,
  automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/control.in b/ubuntu/maverick/libraries/libkdcraw/debian/control.in
index a28c0245d..db049eed3 100644
--- a/ubuntu/maverick/libraries/libkdcraw/debian/control.in
+++ b/ubuntu/maverick/libraries/libkdcraw/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>= 5), quilt, kdelibs4-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs4-trinity-dev,
  liblcms1-dev, libjpeg62-dev, pkg-config,
  automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/control b/ubuntu/maverick/libraries/libkexiv2/debian/control
index 1be032c44..6ebaea475 100644
--- a/ubuntu/maverick/libraries/libkexiv2/debian/control
+++ b/ubuntu/maverick/libraries/libkexiv2/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>
-Build-Depends: debhelper (>> 5), cdbs, libexiv2-dev, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>> 5), cdbs, libexiv2-dev, tdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://www.kipi-plugins.org/
 
diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/control.in b/ubuntu/maverick/libraries/libkexiv2/debian/control.in
index 0225eb0fc..34658fb18 100644
--- a/ubuntu/maverick/libraries/libkexiv2/debian/control.in
+++ b/ubuntu/maverick/libraries/libkexiv2/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>> 5), cdbs, libexiv2-trinity-dev (>= 0.12), kdelibs4-trinity-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
+Build-Depends: debhelper (>> 5), cdbs, libexiv2-trinity-dev (>= 0.12), tdelibs4-trinity-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
 Standards-Version: 3.8.3
 Homepage: http://www.kipi-plugins.org/
 
diff --git a/ubuntu/maverick/libraries/libkipi/debian/changelog b/ubuntu/maverick/libraries/libkipi/debian/changelog
index ed7cd918a..eaec4a227 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/changelog
+++ b/ubuntu/maverick/libraries/libkipi/debian/changelog
@@ -59,7 +59,7 @@ libkipi (0.1.4-1) unstable; urgency=low
 
   [ Achim Bohnet ]
   * new upstream release.  Fixes FTBFS on first installation.
-  * Remove 11_kdesvn_r540613_fix_include_path.diff.  Included upstream
+  * Remove 11_tdesvn_r540613_fix_include_path.diff.  Included upstream
   * Remove 06_disable_no_undefined.diff. Not needed. Pkg is properly
     relibtoolized
   * Update relibtoolization patches: 98_buildprep.diff 99_only_-lqt-mt.diff
@@ -69,7 +69,7 @@ libkipi (0.1.4-1) unstable; urgency=low
 libkipi (0.1.3-2) unstable; urgency=low
 
   [ Achim Bohnet ]
-  * Add 11_kdesvn_r540613_fix_include_path.diff.  Closes: #366933: libkipi -
+  * Add 11_tdesvn_r540613_fix_include_path.diff.  Closes: #366933: libkipi -
     FTBFS: error: libkipi/interface.h: No such file or directory
 
  -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Sun, 14 May 2006 11:03:25 +0200
@@ -125,7 +125,7 @@ libkipi (0.1.2-2) unstable; urgency=low
     future releases
 
   [ Achim Bohnet ]
-  * 2nd g++ v4 ABI change: Because we already depend on kdelibs4c2a,
+  * 2nd g++ v4 ABI change: Because we already depend on tdelibs4c2a,
     remove c2 that was unnecessarily introduced for the 1st g++ v4.0
     ABI change.  Now backporting and sync with kunbuntu needs no
     source changes again.
@@ -134,8 +134,8 @@ libkipi (0.1.2-2) unstable; urgency=low
         --list-missing
       + remove unnecessary --disable-debug configure option
       + build with --enable-final
-  * Temporarily Build-Depend on kdelibs4-dev (>= 4:3.4.3-2) to make
-    sure we build against kdelibs4c2a
+  * Temporarily Build-Depend on tdelibs4-dev (>= 4:3.4.3-2) to make
+    sure we build against tdelibs4c2a
 
  -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Fri,  2 Dec 2005 15:49:45 +0100
 
@@ -146,7 +146,7 @@ libkipi (0.1.2-1) unstable; urgency=low
 
   +++ Changes by Achim Bohnet:
 
-  * remove versioned build-dependency of kdelibs4-dev now that
+  * remove versioned build-dependency of tdelibs4-dev now that
     it's build on all archs with new C++ ABI.
   * patches/00_fix-home-page-url.patch removed. Fixed upstream.
   * updated debian/copyright for 0.1.2 tarball
@@ -163,7 +163,7 @@ libkipi (0.1.1-4) unstable; urgency=low
 libkipi (0.1.1-3) unstable; urgency=low
 
   * C++ transition package
-  * Upgrade Build-Depends: kdelibs4-dev (>= 3.4.2-1)
+  * Upgrade Build-Depends: tdelibs4-dev (>= 3.4.2-1)
   * Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell
     <msp@debian.org>
 
diff --git a/ubuntu/maverick/libraries/libkipi/debian/control b/ubuntu/maverick/libraries/libkipi/debian/control
index 4424ac60f..e33e73d15 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/control
+++ b/ubuntu/maverick/libraries/libkipi/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>> 4.1), libexif-dev, kdelibs4-trinity-dev (>= 4:3.4.3-2), automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>> 4.1), libexif-dev, tdelibs4-trinity-dev (>= 4:3.4.3-2), automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: libkipi0-trinity-dev
diff --git a/ubuntu/maverick/libraries/libkipi/debian/control.in b/ubuntu/maverick/libraries/libkipi/debian/control.in
index 9c54b995b..3b1e241ef 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/control.in
+++ b/ubuntu/maverick/libraries/libkipi/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>> 4.1), libexif-dev, kdelibs4-trinity-dev (>= 4:3.4.3-2), autotools-dev
+Build-Depends: cdbs, debhelper (>> 4.1), libexif-dev, tdelibs4-trinity-dev (>= 4:3.4.3-2), autotools-dev
 Standards-Version: 3.8.3
 
 Package: libkipi0-trinity-dev
diff --git a/ubuntu/maverick/libraries/mlt/debian/changelog b/ubuntu/maverick/libraries/mlt/debian/changelog
index 56a1c1fd2..d705cbdeb 100644
--- a/ubuntu/maverick/libraries/mlt/debian/changelog
+++ b/ubuntu/maverick/libraries/mlt/debian/changelog
@@ -63,7 +63,7 @@ mlt (0.2.4.svn20071228-0.0ubuntu1) hardy; urgency=low
 mlt (0.2.4.svn20071228-0.0) unstable; urgency=low
 
   * New svn release.
-  * Replace libqt3-mt-dev by kdelibs4-dev in Build-Depends.
+  * Replace libqt3-mt-dev by tdelibs4-dev in Build-Depends.
   * Install modules in /usr/lib instead of /usr/share
 
  -- Christian Marillat <marillat@debian.org>  Sat, 29 Dec 2007 17:12:24 +0100
diff --git a/ubuntu/maverick/libraries/mlt/debian/control b/ubuntu/maverick/libraries/mlt/debian/control
index b55371a4d..64fc2a37d 100644
--- a/ubuntu/maverick/libraries/mlt/debian/control
+++ b/ubuntu/maverick/libraries/mlt/debian/control
@@ -7,7 +7,7 @@ Homepage: http://mlt.sourceforge.net/
 Standards-Version: 3.8.3
 Build-Depends: debhelper (>= 5), libdv4-dev, libquicktime-dev (>= 2:1.0.0),
  libvorbis-dev, libsdl-dev | libsdl1.2-dev, libgtk2.0-dev, libjack-dev, quilt,
- libsamplerate-dev, libmad0-dev, kdelibs4-trinity-dev, imagemagick, ffmpeg, libflac-dev,
+ libsamplerate-dev, libmad0-dev, tdelibs4-trinity-dev, imagemagick, ffmpeg, libflac-dev,
  libavcodec-dev, libxml2-dev, ladspa-sdk, libavutil-dev, libxcursor-dev,
  libxinerama-dev, libxrandr-dev, libxrender-dev, libavformat-dev,
  libswscale-dev, libasound2-dev, libsox-dev
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/changelog b/ubuntu/maverick/libraries/pykdeextensions/debian/changelog
index 3c1ed6acf..92b728999 100644
--- a/ubuntu/maverick/libraries/pykdeextensions/debian/changelog
+++ b/ubuntu/maverick/libraries/pykdeextensions/debian/changelog
@@ -100,7 +100,7 @@ pykdeextensions (0.4.0-3) unstable; urgency=low
   * Added pycompat and pyversions
   * Force to use python2.4 (Closes: #375618)
   * Added to Build-Depends: python-support, python-all-dev,
-    kdelibs4c2a (for kde-config)
+    tdelibs4c2a (for kde-config)
   * Updated libpythonize0-dev, libpythonize0, and pykdextensions install files
   * Cleaned up rules
   * Added 12_force_python2.4_script.diff to force python2.4 in scripts
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/control b/ubuntu/maverick/libraries/pykdeextensions/debian/control
index b7719fae4..d82091f2d 100644
--- a/ubuntu/maverick/libraries/pykdeextensions/debian/control
+++ b/ubuntu/maverick/libraries/pykdeextensions/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, kdelibs4c2a-trinity, libtool,
+Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, tdelibs4c2a-trinity, libtool,
  libxml2-utils, libxrandr-dev, libxxf86vm-dev, pyqt-tools, python-trinity-trinity,
  python-qt-dev, python-sip4-dev, python-support (>= 0.6), python2.6, python2.6-dev
 Standards-Version: 3.8.4
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/changelog b/ubuntu/maverick/libraries/python-trinity/debian/changelog
index 48f8d4dae..688f8d49c 100644
--- a/ubuntu/maverick/libraries/python-trinity/debian/changelog
+++ b/ubuntu/maverick/libraries/python-trinity/debian/changelog
@@ -207,7 +207,7 @@ python-trinity (3.16.0-0ubuntu8) feisty; urgency=low
     adds setPtyFd() to sip/kpart/konsole_kpart.sip
 
   [ Jonathan Riddell ]
-  * Update build-dep version to kdelibs and konsole 3.5.6
+  * Update build-dep version to tdelibs and konsole 3.5.6
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 19 Jan 2007 10:43:29 +0100
 
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/control b/ubuntu/maverick/libraries/python-trinity/debian/control
index 73729642b..38a85e452 100644
--- a/ubuntu/maverick/libraries/python-trinity/debian/control
+++ b/ubuntu/maverick/libraries/python-trinity/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Ricardo Javier Cardenes Medina <rcardenes@debian.org>
 Uploaders: Torsten Marek <shlomme@debian.org>, Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5.0.38), libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-qt-dev (>= 3.18), kdelibs4-trinity-dev, python-central (>= 0.6.11), dpatch, python-sip4, python-sip4-dbg, python-sip4-dev
+Build-Depends: debhelper (>= 5.0.38), libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-qt-dev (>= 3.18), tdelibs4-trinity-dev, python-central (>= 0.6.11), dpatch, python-sip4, python-sip4-dbg, python-sip4-dev
 Standards-Version: 3.8.4
 Homepage: http://www.riverbankcomputing.co.uk/pykde/index.php
 XS-Python-Version: all