Sun Jan 25 11:42:14 UTC 2009

Author: modax-guest
Date: 2009-01-25 11:42:14 +0000 (Sun, 25 Jan 2009)
New Revision: 13526

Added:
   branches/kde4.2/packages/koffice/debian/karbon.lintian-overrides
   branches/kde4.2/packages/koffice/debian/kchart.lintian-overrides
   branches/kde4.2/packages/koffice/debian/koffice-libs.lintian-overrides
   branches/kde4.2/packages/koffice/debian/kplato.lintian-overrides
   branches/kde4.2/packages/koffice/debian/kpresenter.lintian-overrides
   branches/kde4.2/packages/koffice/debian/krita-data.lintian-overrides
   branches/kde4.2/packages/koffice/debian/krita.lintian-overrides
   branches/kde4.2/packages/koffice/debian/kspread.lintian-overrides
   branches/kde4.2/packages/koffice/debian/kthesaurus.lintian-overrides
   branches/kde4.2/packages/koffice/debian/kword-data.lintian-overrides
   branches/kde4.2/packages/koffice/debian/kword.lintian-overrides
Removed:
   branches/kde4.2/packages/koffice/debian/karbon.lintian
   branches/kde4.2/packages/koffice/debian/kchart.lintian
   branches/kde4.2/packages/koffice/debian/koffice-libs.lintian
   branches/kde4.2/packages/koffice/debian/kplato.lintian
   branches/kde4.2/packages/koffice/debian/kpresenter.lintian
   branches/kde4.2/packages/koffice/debian/krita-data.lintian
   branches/kde4.2/packages/koffice/debian/krita.lintian
   branches/kde4.2/packages/koffice/debian/kspread.lintian
   branches/kde4.2/packages/koffice/debian/kthesaurus.lintian
   branches/kde4.2/packages/koffice/debian/kword-data.lintian
   branches/kde4.2/packages/koffice/debian/kword.lintian
Modified:
   branches/kde4.2/packages/akonadi/debian/
   branches/kde4.2/packages/akonadi/debian/changelog
   branches/kde4.2/packages/akonadi/debian/control
   branches/kde4.2/packages/akonadi/debian/rules
   branches/kde4.2/packages/blitz/debian/
   branches/kde4.2/packages/blitz/debian/changelog
   branches/kde4.2/packages/blitz/debian/control
   branches/kde4.2/packages/blitz/debian/rules
   branches/kde4.2/packages/decibel/debian/
   branches/kde4.2/packages/decibel/debian/changelog
   branches/kde4.2/packages/decibel/debian/control
   branches/kde4.2/packages/decibel/debian/rules
   branches/kde4.2/packages/eigen/debian/
   branches/kde4.2/packages/eigen/debian/changelog
   branches/kde4.2/packages/eigen/debian/compat
   branches/kde4.2/packages/eigen/debian/control
   branches/kde4.2/packages/eigen/debian/rules
   branches/kde4.2/packages/kdeaccessibility/debian/
   branches/kde4.2/packages/kdeaccessibility/debian/changelog
   branches/kde4.2/packages/kdeaccessibility/debian/control
   branches/kde4.2/packages/kdeaccessibility/debian/rules
   branches/kde4.2/packages/kdeadmin/debian/
   branches/kde4.2/packages/kdeadmin/debian/changelog
   branches/kde4.2/packages/kdeadmin/debian/control
   branches/kde4.2/packages/kdeadmin/debian/rules
   branches/kde4.2/packages/kdeartwork/debian/
   branches/kde4.2/packages/kdeartwork/debian/changelog
   branches/kde4.2/packages/kdeartwork/debian/control
   branches/kde4.2/packages/kdeartwork/debian/rules
   branches/kde4.2/packages/kdebase-runtime/debian/
   branches/kde4.2/packages/kdebase-runtime/debian/changelog
   branches/kde4.2/packages/kdebase-runtime/debian/control
   branches/kde4.2/packages/kdebase-runtime/debian/rules
   branches/kde4.2/packages/kdebase-workspace/debian/
   branches/kde4.2/packages/kdebase-workspace/debian/changelog
   branches/kde4.2/packages/kdebase-workspace/debian/control
   branches/kde4.2/packages/kdebase-workspace/debian/rules
   branches/kde4.2/packages/kdebase/debian/
   branches/kde4.2/packages/kdebase/debian/changelog
   branches/kde4.2/packages/kdebase/debian/control
   branches/kde4.2/packages/kdebase/debian/rules
   branches/kde4.2/packages/kdeedu/debian/
   branches/kde4.2/packages/kdeedu/debian/changelog
   branches/kde4.2/packages/kdeedu/debian/control
   branches/kde4.2/packages/kdeedu/debian/rules
   branches/kde4.2/packages/kdegames/debian/
   branches/kde4.2/packages/kdegames/debian/changelog
   branches/kde4.2/packages/kdegames/debian/control
   branches/kde4.2/packages/kdegames/debian/rules
   branches/kde4.2/packages/kdegraphics/debian/
   branches/kde4.2/packages/kdegraphics/debian/changelog
   branches/kde4.2/packages/kdegraphics/debian/control
   branches/kde4.2/packages/kdegraphics/debian/rules
   branches/kde4.2/packages/kdelibs/debian/
   branches/kde4.2/packages/kdelibs/debian/changelog
   branches/kde4.2/packages/kdelibs/debian/control
   branches/kde4.2/packages/kdelibs/debian/rules
   branches/kde4.2/packages/kdemultimedia/debian/
   branches/kde4.2/packages/kdemultimedia/debian/changelog
   branches/kde4.2/packages/kdemultimedia/debian/control
   branches/kde4.2/packages/kdemultimedia/debian/rules
   branches/kde4.2/packages/kdenetwork/debian/
   branches/kde4.2/packages/kdenetwork/debian/changelog
   branches/kde4.2/packages/kdenetwork/debian/control
   branches/kde4.2/packages/kdenetwork/debian/rules
   branches/kde4.2/packages/kdepim/debian/
   branches/kde4.2/packages/kdepim/debian/changelog
   branches/kde4.2/packages/kdepim/debian/control
   branches/kde4.2/packages/kdepim/debian/rules
   branches/kde4.2/packages/kdepimlibs/debian/
   branches/kde4.2/packages/kdepimlibs/debian/changelog
   branches/kde4.2/packages/kdepimlibs/debian/control
   branches/kde4.2/packages/kdepimlibs/debian/rules
   branches/kde4.2/packages/kdeplasma-addons/debian/
   branches/kde4.2/packages/kdeplasma-addons/debian/changelog
   branches/kde4.2/packages/kdeplasma-addons/debian/control
   branches/kde4.2/packages/kdeplasma-addons/debian/rules
   branches/kde4.2/packages/kdesdk/debian/
   branches/kde4.2/packages/kdesdk/debian/changelog
   branches/kde4.2/packages/kdesdk/debian/control
   branches/kde4.2/packages/kdesdk/debian/rules
   branches/kde4.2/packages/kdetoys/debian/
   branches/kde4.2/packages/kdetoys/debian/changelog
   branches/kde4.2/packages/kdetoys/debian/control
   branches/kde4.2/packages/kdetoys/debian/rules
   branches/kde4.2/packages/kdeutils/debian/
   branches/kde4.2/packages/kdeutils/debian/changelog
   branches/kde4.2/packages/kdeutils/debian/control
   branches/kde4.2/packages/kdeutils/debian/rules
   branches/kde4.2/packages/kdevelop/debian/
   branches/kde4.2/packages/kdevelop/debian/control
   branches/kde4.2/packages/kdevelop/debian/rules
   branches/kde4.2/packages/kdevplatform/debian/
   branches/kde4.2/packages/kdevplatform/debian/changelog
   branches/kde4.2/packages/kdevplatform/debian/control
   branches/kde4.2/packages/kdevplatform/debian/rules
   branches/kde4.2/packages/kdewebdev/debian/
   branches/kde4.2/packages/kdewebdev/debian/changelog
   branches/kde4.2/packages/kdewebdev/debian/control
   branches/kde4.2/packages/kdewebdev/debian/rules
   branches/kde4.2/packages/koffice/debian/
   branches/kde4.2/packages/koffice/debian/changelog
   branches/kde4.2/packages/koffice/debian/control
   branches/kde4.2/packages/koffice/debian/rules
   branches/kde4.2/packages/phonon/debian/
   branches/kde4.2/packages/phonon/debian/changelog
   branches/kde4.2/packages/phonon/debian/control
   branches/kde4.2/packages/phonon/debian/rules
   branches/kde4.2/packages/soprano/debian/
   branches/kde4.2/packages/soprano/debian/changelog
   branches/kde4.2/packages/soprano/debian/control
   branches/kde4.2/packages/soprano/debian/rules
Log:
This a huge commit which migrates all internal debian/cdbs "users" (with the
exception of kgraphviewer, what is this anyway?) in branches/kde4.2/packages
from the debian/cdbs to the one provided by pkg-kde-tools >= 0.4 at
/usr/share/pkg-kde-tools/qt-kde-team.  pkg-kde-tools 0.4.0 has just been
uploaded to experimental, but compatible version is available in kdetrunk in
the meantime.

After this update, all debian/cdbs svn:externals will become non-existant and
should (not really sure) show up as ? in svn status output. Then you can delete
them with something like:

svn status | grep '^?.*debian/cdbs' | awk '{print $2}' (preview)
svn status | grep '^?.*debian/cdbs' | awk '{print $2}' | xargs rm -rf




Property changes on: branches/kde4.2/packages/akonadi/debian
___________________________________________________________________
Name: svn:externals
   - cdbs svn://svn.debian.org/pkg-kde/branches/kde4.2/cdbs/


Modified: branches/kde4.2/packages/akonadi/debian/changelog
===================================================================

--- branches/kde4.2/packages/akonadi/debian/changelog	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/akonadi/debian/changelog	2009-01-25 11:42:14 UTC (rev 13526)
@@ -1,3 +1,15 @@
+akonadi (1.1.1-2~pre1) UNRELEASED; urgency=low
+
+  +++ Changes by Modestas Vainius:
+
+  * Switch from internal debian/cdbs/kde.mk to pkg-kde-tools:
+    - build depend on pkg-kde-tools 0.4;
+    - remove debian/cdbs directory;
+    - replace debian/cdbs/kde.mk with
+      /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk in debian/rules.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 24 Jan 2009 13:37:05 +0100
+
 akonadi (1.1.1-1) experimental; urgency=low
 
   * New upstream release.

Modified: branches/kde4.2/packages/akonadi/debian/control
===================================================================
--- branches/kde4.2/packages/akonadi/debian/control	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/akonadi/debian/control	2009-01-25 11:42:14 UTC (rev 13526)
@@ -4,7 +4,7 @@
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Sune Vuorela <debian at pusling.com>, Modestas Vainius <modestas at vainius.eu>,
  Ana Beatriz Guerrero Lopez <ana at debian.org>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), cmake (>= 2.6.2), automoc, quilt,
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), cmake (>= 2.6.2), automoc, quilt, pkg-kde-tools (>= 0.4),
  libqt4-dev (>> 4.4.0~), shared-mime-info, libmysqlclient15-dev,
  libxslt-dev, libsoprano-dev (>= 2.1.1), xsltproc, libdbus-1-dev, libboost-program-options-dev
 Standards-Version: 3.8.0

Modified: branches/kde4.2/packages/akonadi/debian/rules
===================================================================
--- branches/kde4.2/packages/akonadi/debian/rules	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/akonadi/debian/rules	2009-01-25 11:42:14 UTC (rev 13526)
@@ -6,6 +6,6 @@
 
 DEB_CMAKE_EXTRA_FLAGS += -DMYSQLD_EXECUTABLE=/usr/sbin/mysqld
 
-include debian/cdbs/kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 
 


Property changes on: branches/kde4.2/packages/blitz/debian
___________________________________________________________________
Name: svn:externals
   - cdbs svn://svn.debian.org/pkg-kde/branches/kde4.2/cdbs/


Modified: branches/kde4.2/packages/blitz/debian/changelog
===================================================================
--- branches/kde4.2/packages/blitz/debian/changelog	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/blitz/debian/changelog	2009-01-25 11:42:14 UTC (rev 13526)
@@ -2,6 +2,11 @@
 
   * Bump debian/compat and debhelper build dependency to v7 (to get more
     sophisticated debian/tmp handling).
+  * Switch from internal debian/cdbs/kde.mk to pkg-kde-tools:
+    - build depend on pkg-kde-tools 0.4;
+    - remove debian/cdbs directory;
+    - replace debian/cdbs/kde.mk with
+      /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk in debian/rules.
 
  -- Modestas Vainius <modestas at vainius.eu>  Sat, 24 Jan 2009 03:44:31 +0200
 

Modified: branches/kde4.2/packages/blitz/debian/control
===================================================================
--- branches/kde4.2/packages/blitz/debian/control	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/blitz/debian/control	2009-01-25 11:42:14 UTC (rev 13526)
@@ -3,7 +3,8 @@
 Section: libs
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Sune Vuorela <debian at pusling.com>, Matthew Rosewarne <mrosewarne at inoutbox.com>
-Build-Depends: debhelper (>= 7), cdbs, cmake, quilt, libqt4-dev (>= 4.4.0~)
+Build-Depends: debhelper (>= 7), cdbs, cmake, quilt, pkg-kde-tools (>= 0.4),
+ libqt4-dev (>= 4.4.0~)
 Standards-Version: 3.7.3
 Homepage: http://www.kde.org/
 

Modified: branches/kde4.2/packages/blitz/debian/rules
===================================================================
--- branches/kde4.2/packages/blitz/debian/rules	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/blitz/debian/rules	2009-01-25 11:42:14 UTC (rev 13526)
@@ -2,7 +2,7 @@
 
 THIS_SHOULD_GO_TO_UNSTABLE=1
 
-include debian/cdbs/kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 include debian/cpu-optimize.mk
 
 DEB_CMAKE_EXTRA_FLAGS += \


Property changes on: branches/kde4.2/packages/decibel/debian
___________________________________________________________________
Name: svn:externals
   - cdbs svn://svn.debian.org/pkg-kde/branches/kde4.2/cdbs/


Modified: branches/kde4.2/packages/decibel/debian/changelog
===================================================================
--- branches/kde4.2/packages/decibel/debian/changelog	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/decibel/debian/changelog	2009-01-25 11:42:14 UTC (rev 13526)
@@ -13,6 +13,11 @@
   * Add libdbus-1-dev to build depends. qdbusxml2cpp needs it.
   * Bump debian/compat and debhelper build dependency to v7 (to get more
     sophisticated debian/tmp handling).
+  * Switch from internal debian/cdbs/kde.mk to pkg-kde-tools:
+    - build depend on pkg-kde-tools 0.4;
+    - remove debian/cdbs directory;
+    - replace debian/cdbs/kde.mk with
+      /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk in debian/rules.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 24 Jan 2009 03:45:05 +0200
 

Modified: branches/kde4.2/packages/decibel/debian/control
===================================================================
--- branches/kde4.2/packages/decibel/debian/control	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/decibel/debian/control	2009-01-25 11:42:14 UTC (rev 13526)
@@ -2,8 +2,8 @@
 Priority: optional
 Section: libs
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Build-Depends: debhelper (>= 7), cdbs, cmake, libqt4-dev, quilt,
- libqttapioca-dev (>= 0.17.7~), libqttelepathy-dev (>= ~0.17.7~),
+Build-Depends: debhelper (>= 7), cdbs, cmake, quilt, pkg-kde-tools (>= 0.4),
+ libqt4-dev (>= 4.4.0), libqttapioca-dev (>= 0.17.7~), libqttelepathy-dev (>= ~0.17.7~),
  libdbus-1-dev
 Standards-Version: 3.8.0
 Homepage: http://decibel.kde.org

Modified: branches/kde4.2/packages/decibel/debian/rules
===================================================================
--- branches/kde4.2/packages/decibel/debian/rules	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/decibel/debian/rules	2009-01-25 11:42:14 UTC (rev 13526)
@@ -1,5 +1,5 @@
 #! /usr/bin/make -f
-include debian/cdbs/kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 DEB_QUILT_PATCHDIR_LINK:=debian/patches
 
 clean::


Property changes on: branches/kde4.2/packages/eigen/debian
___________________________________________________________________
Name: svn:externals
   - cdbs svn://svn.debian.org/pkg-kde/branches/kde4.2/cdbs/


Modified: branches/kde4.2/packages/eigen/debian/changelog
===================================================================
--- branches/kde4.2/packages/eigen/debian/changelog	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/eigen/debian/changelog	2009-01-25 11:42:14 UTC (rev 13526)
@@ -1,8 +1,13 @@
 eigen (1.0.5-3) UNRELEASED; urgency=low
 
-  * ...
+  * Switch from internal debian/cdbs/kde.mk to pkg-kde-tools:
+    - build depend on pkg-kde-tools 0.4;
+    - remove debian/cdbs directory;
+    - replace debian/cdbs/kde.mk with
+      /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk in debian/rules.
+  * Bump debhelper compat to v7.
 
- -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Sat, 02 Feb 2008 07:22:50 +0100
+ -- Modestas Vainius <modestas at vainius.eu>  Sat, 02 Feb 2008 07:22:50 +0100
 
 eigen (1.0.5-2) unstable; urgency=low
 

Modified: branches/kde4.2/packages/eigen/debian/compat
===================================================================
--- branches/kde4.2/packages/eigen/debian/compat	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/eigen/debian/compat	2009-01-25 11:42:14 UTC (rev 13526)
@@ -1 +1 @@
-6
+7

Modified: branches/kde4.2/packages/eigen/debian/control
===================================================================
--- branches/kde4.2/packages/eigen/debian/control	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/eigen/debian/control	2009-01-25 11:42:14 UTC (rev 13526)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Sune Vuorela <debian at pusling.com>
-Build-Depends: debhelper (>= 6), cdbs (>= 0.4.51), quilt, cmake
+Build-Depends: debhelper (>= 7), cdbs (>= 0.4.51), quilt, cmake, pkg-kde-tools (>= 0.4)
 Standards-Version: 3.7.3
 Homepage: http://eigen.tuxfamily.org
 

Modified: branches/kde4.2/packages/eigen/debian/rules
===================================================================
--- branches/kde4.2/packages/eigen/debian/rules	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/eigen/debian/rules	2009-01-25 11:42:14 UTC (rev 13526)
@@ -1,4 +1,4 @@
 #! /usr/bin/make -f
 
 THIS_SHOULD_GO_TO_UNSTABLE = 1
-include debian/cdbs/kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk


Property changes on: branches/kde4.2/packages/kdeaccessibility/debian
___________________________________________________________________
Name: svn:externals
   - cdbs svn://svn.debian.org/pkg-kde/branches/kde4.2/cdbs/


Modified: branches/kde4.2/packages/kdeaccessibility/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdeaccessibility/debian/changelog	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdeaccessibility/debian/changelog	2009-01-25 11:42:14 UTC (rev 13526)
@@ -17,6 +17,11 @@
 
   * Bump debian/compat and debhelper build dependency to v7 (to get more
     sophisticated debian/tmp handling).
+  * Switch from internal debian/cdbs/kde.mk to pkg-kde-tools:
+    - build depend on pkg-kde-tools 0.4;
+    - remove debian/cdbs directory;
+    - replace debian/cdbs/kde.mk with
+      /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk in debian/rules.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 24 Jan 2009 03:40:21 +0200
 

Modified: branches/kde4.2/packages/kdeaccessibility/debian/control
===================================================================
--- branches/kde4.2/packages/kdeaccessibility/debian/control	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdeaccessibility/debian/control	2009-01-25 11:42:14 UTC (rev 13526)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>
-Build-Depends: cdbs, debhelper (>= 7), quilt, 
+Build-Depends: cdbs, debhelper (>= 7), quilt, pkg-kde-tools (>= 0.4),
  kdelibs5-dev (>= 4:4.2.0), libxtst-dev, libxt-dev,
  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
 Standards-Version: 3.8.0

Modified: branches/kde4.2/packages/kdeaccessibility/debian/rules
===================================================================
--- branches/kde4.2/packages/kdeaccessibility/debian/rules	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdeaccessibility/debian/rules	2009-01-25 11:42:14 UTC (rev 13526)
@@ -1,3 +1,3 @@
 #!/usr/bin/make -f
   
-include debian/cdbs/kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk


Property changes on: branches/kde4.2/packages/kdeadmin/debian
___________________________________________________________________
Name: svn:externals
   - cdbs svn://svn.debian.org/pkg-kde/branches/kde4.2/cdbs/


Modified: branches/kde4.2/packages/kdeadmin/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdeadmin/debian/changelog	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdeadmin/debian/changelog	2009-01-25 11:42:14 UTC (rev 13526)
@@ -15,6 +15,11 @@
     - build depend on python-support.
   * Bump debian/compat and debhelper build dependency to v7 (to get more
     sophisticated debian/tmp handling).
+  * Switch from internal debian/cdbs/kde.mk to pkg-kde-tools:
+    - build depend on pkg-kde-tools 0.4;
+    - remove debian/cdbs directory;
+    - replace debian/cdbs/kde.mk with
+      /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk in debian/rules.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 24 Jan 2009 03:35:21 +0200
 

Modified: branches/kde4.2/packages/kdeadmin/debian/control
===================================================================
--- branches/kde4.2/packages/kdeadmin/debian/control	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdeadmin/debian/control	2009-01-25 11:42:14 UTC (rev 13526)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt,
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, pkg-kde-tools (>= 0.4),
  kdepimlibs5-dev (>= 4:4.2.0), docbook-to-man, python-support
 Standards-Version: 3.8.0
 Homepage: http://www.kde.org/

Modified: branches/kde4.2/packages/kdeadmin/debian/rules
===================================================================
--- branches/kde4.2/packages/kdeadmin/debian/rules	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdeadmin/debian/rules	2009-01-25 11:42:14 UTC (rev 13526)
@@ -2,7 +2,7 @@
 
 DEB_CMAKE_CUSTOM_FLAGS += -DINSTALL_SYSTEM_CONFIG_PRINTER:BOOL=TRUE
 
-include debian/cdbs/kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 
 binary-install/system-config-printer-kde::
 	dh_pysupport -p$(cdbs_curpkg)


Property changes on: branches/kde4.2/packages/kdeartwork/debian
___________________________________________________________________
Name: svn:externals
   - cdbs svn://svn.debian.org/pkg-kde/branches/kde4.2/cdbs/


Modified: branches/kde4.2/packages/kdeartwork/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdeartwork/debian/changelog	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdeartwork/debian/changelog	2009-01-25 11:42:14 UTC (rev 13526)
@@ -23,6 +23,11 @@
 
   * Bump debian/compat and debhelper build dependency to v7 (to get more
     sophisticated debian/tmp handling).
+  * Switch from internal debian/cdbs/kde.mk to pkg-kde-tools:
+    - build depend on pkg-kde-tools 0.4;
+    - remove debian/cdbs directory;
+    - replace debian/cdbs/kde.mk with
+      /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk in debian/rules.
 
   +++ Changes by Sune Vuorela:
 

Modified: branches/kde4.2/packages/kdeartwork/debian/control
===================================================================
--- branches/kde4.2/packages/kdeartwork/debian/control	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdeartwork/debian/control	2009-01-25 11:42:14 UTC (rev 13526)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt,
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, pkg-kde-tools (>= 0.4),
  kdebase-workspace-dev (>= 4:4.2.0), libxt-dev, libstreamanalyzer-dev (>= 0.6.3),
  xscreensaver, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl, xscreensaver-gl-extra, 
  libqt4-opengl-dev, libeigen2-dev

Modified: branches/kde4.2/packages/kdeartwork/debian/rules
===================================================================
--- branches/kde4.2/packages/kdeartwork/debian/rules	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdeartwork/debian/rules	2009-01-25 11:42:14 UTC (rev 13526)
@@ -1,4 +1,4 @@
 #!/usr/bin/make -f
 
-include debian/cdbs/kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 


Property changes on: branches/kde4.2/packages/kdebase/debian
___________________________________________________________________
Name: svn:externals
   - cdbs svn://svn.debian.org/pkg-kde/branches/kde4.2/cdbs/


Modified: branches/kde4.2/packages/kdebase/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdebase/debian/changelog	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdebase/debian/changelog	2009-01-25 11:42:14 UTC (rev 13526)
@@ -22,6 +22,11 @@
   * Rename debian/*.lintian to debian/*.lintian-overrides.
   * Bump debian/compat and debhelper build dependency to v7 (to get more
     sophisticated debian/tmp handling).
+  * Switch from internal debian/cdbs/kde.mk to pkg-kde-tools:
+    - build depend on pkg-kde-tools 0.4;
+    - remove debian/cdbs directory;
+    - replace debian/cdbs/kde.mk with
+      /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk in debian/rules.
 
   +++ Changes by Armin Berres:
 

Modified: branches/kde4.2/packages/kdebase/debian/control
===================================================================
--- branches/kde4.2/packages/kdebase/debian/control	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdebase/debian/control	2009-01-25 11:42:14 UTC (rev 13526)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Modestas Vainius <modestas at vainius.eu>, Matthew Rosewarne <mrosewarne at inoutbox.com>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt,
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, pkg-kde-tools (>= 0.4),
  kdelibs5-dev (>= 4:4.2.0), libphonon-dev (>= 4:4.3.0),
  libqimageblitz-dev (>= 1:0.0.4-2), libsmbclient-dev, libusb-dev, libxkbfile-dev,
  libraw1394-dev, libstreamanalyzer-dev (>= 0.6.3), libxrender-dev, zlib1g-dev, libglu1-mesa-dev,

Modified: branches/kde4.2/packages/kdebase/debian/rules
===================================================================
--- branches/kde4.2/packages/kdebase/debian/rules	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdebase/debian/rules	2009-01-25 11:42:14 UTC (rev 13526)
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
 
-include debian/cdbs/kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 
 DEB_INSTALL_DOCS_ALL=


Property changes on: branches/kde4.2/packages/kdebase-runtime/debian
___________________________________________________________________
Name: svn:externals
   - cdbs svn://svn.debian.org/pkg-kde/branches/kde4.2/cdbs/


Modified: branches/kde4.2/packages/kdebase-runtime/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdebase-runtime/debian/changelog	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdebase-runtime/debian/changelog	2009-01-25 11:42:14 UTC (rev 13526)
@@ -21,6 +21,11 @@
   * Switch to new installgen format.
   * Bump debian/compat and debhelper build dependency to v7 (to get more
     sophisticated debian/tmp handling).
+  * Switch from internal debian/cdbs/kde.mk to pkg-kde-tools:
+    - build depend on pkg-kde-tools 0.4;
+    - remove debian/cdbs directory;
+    - replace debian/cdbs/kde.mk with
+      /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk in debian/rules.
 
   +++ Changes by George Kiagiadakis:
 

Modified: branches/kde4.2/packages/kdebase-runtime/debian/control
===================================================================
--- branches/kde4.2/packages/kdebase-runtime/debian/control	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdebase-runtime/debian/control	2009-01-25 11:42:14 UTC (rev 13526)
@@ -4,7 +4,7 @@
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>,
  Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>, Modestas Vainius <modestas at vainius.eu>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt,
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, pkg-kde-tools (>= 0.4),
  kdelibs5-dev (>= 4:4.2.0), libphonon-dev (>= 4:4.3.0),
  libclucene-dev, libsmbclient-dev, libsoprano-dev (>= 2.1.64),
  libstreamanalyzer-dev (>= 0.6.3), libstrigiqtdbusclient-dev (>= 0.6.3),

Modified: branches/kde4.2/packages/kdebase-runtime/debian/rules
===================================================================
--- branches/kde4.2/packages/kdebase-runtime/debian/rules	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdebase-runtime/debian/rules	2009-01-25 11:42:14 UTC (rev 13526)
@@ -8,5 +8,5 @@
 
 DEB_FIXPERMS_EXCLUDE := usr/lib/kde4/libexec/kdesud
 
-include debian/cdbs/kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 


Property changes on: branches/kde4.2/packages/kdebase-workspace/debian
___________________________________________________________________
Name: svn:externals
   - cdbs svn://svn.debian.org/pkg-kde/branches/kde4.2/cdbs/


Modified: branches/kde4.2/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/changelog	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdebase-workspace/debian/changelog	2009-01-25 11:42:14 UTC (rev 13526)
@@ -51,6 +51,11 @@
   * Rename debian/*.lintian to debian/*.lintian-overrides.
   * Bump debian/compat and debhelper build dependency to v7 (to get more
     sophisticated debian/tmp handling).
+  * Switch from internal debian/cdbs/kde.mk to pkg-kde-tools:
+    - build depend on pkg-kde-tools 0.4;
+    - remove debian/cdbs directory;
+    - replace debian/cdbs/kde.mk with
+      /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk in debian/rules.
 
   +++ Changes by George Kiagiadakis:
 

Modified: branches/kde4.2/packages/kdebase-workspace/debian/control
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/control	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdebase-workspace/debian/control	2009-01-25 11:42:14 UTC (rev 13526)
@@ -3,9 +3,8 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Modestas Vainius <modestas at vainius.eu>, Matthew Rosewarne <mrosewarne at inoutbox.com>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt,
- kdelibs5-dev (>= 4:4.2.0),
- kdepimlibs5-dev (>= 4:4.2.0), libboost-dev,
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, pkg-kde-tools (>= 0.4),
+ kdelibs5-dev (>= 4:4.2.0), kdepimlibs5-dev (>= 4:4.2.0), libboost-dev,
  python-support (>= 0.6), python-dev,
  libbluetooth-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libcaptury-dev, libck-connector-dev, libdbus-1-dev, libnm-util-dev, network-manager-dev (>= 0.7.0),

Modified: branches/kde4.2/packages/kdebase-workspace/debian/rules
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/rules	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdebase-workspace/debian/rules	2009-01-25 11:42:14 UTC (rev 13526)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-include debian/cdbs/kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 
 #DEB_CMAKE_EXTRA_FLAGS += \
 #	-DINSTALL_PRINTER_APPLET=TRUE


Property changes on: branches/kde4.2/packages/kdeedu/debian
___________________________________________________________________
Name: svn:externals
   - cdbs svn://svn.debian.org/pkg-kde/branches/kde4.2/cdbs/


Modified: branches/kde4.2/packages/kdeedu/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdeedu/debian/changelog	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdeedu/debian/changelog	2009-01-25 11:42:14 UTC (rev 13526)
@@ -32,6 +32,11 @@
   * Rename debian/*.lintian to debian/*.lintian-overrides.
   * Bump debian/compat and debhelper build dependency to v7 (to get more
     sophisticated debian/tmp handling).
+  * Switch from internal debian/cdbs/kde.mk to pkg-kde-tools:
+    - build depend on pkg-kde-tools 0.4;
+    - remove debian/cdbs directory;
+    - replace debian/cdbs/kde.mk with
+      /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk in debian/rules.
 
   +++ Changes by Sune Vuorela:
 

Modified: branches/kde4.2/packages/kdeedu/debian/control
===================================================================
--- branches/kde4.2/packages/kdeedu/debian/control	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdeedu/debian/control	2009-01-25 11:42:14 UTC (rev 13526)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Daniel Schepler <schepler at debian.org>, Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt,
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, pkg-kde-tools (>= 0.4),
  kdelibs5-dev (>= 4:4.2.0), libphonon-dev (>= 4:4.3.0),
  libboost-python-dev, libcfitsio3-dev (>= 3.040),
  libglu1-mesa-dev, libgs-dev, libnova-dev, libqt4-opengl-dev,

Modified: branches/kde4.2/packages/kdeedu/debian/rules
===================================================================
--- branches/kde4.2/packages/kdeedu/debian/rules	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdeedu/debian/rules	2009-01-25 11:42:14 UTC (rev 13526)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-include debian/cdbs/kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 
 DEB_DH_MAKESHLIBS_ARGS_libkdeedu4 := -V
 DEB_DH_MAKESHLIBS_ARGS_libkiten4 := -V


Property changes on: branches/kde4.2/packages/kdegames/debian
___________________________________________________________________
Name: svn:externals
   - cdbs svn://svn.debian.org/pkg-kde/branches/kde4.2/cdbs/


Modified: branches/kde4.2/packages/kdegames/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdegames/debian/changelog	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdegames/debian/changelog	2009-01-25 11:42:14 UTC (rev 13526)
@@ -7,6 +7,11 @@
   * Use sameVersionDep for libkdegames-dev kdelibs5-dev dependency.
   * Bump debian/compat and debhelper build dependency to v7 (to get more
     sophisticated debian/tmp handling).
+  * Switch from internal debian/cdbs/kde.mk to pkg-kde-tools:
+    - build depend on pkg-kde-tools 0.4;
+    - remove debian/cdbs directory;
+    - replace debian/cdbs/kde.mk with
+      /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk in debian/rules.
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
 

Modified: branches/kde4.2/packages/kdegames/debian/control
===================================================================
--- branches/kde4.2/packages/kdegames/debian/control	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdegames/debian/control	2009-01-25 11:42:14 UTC (rev 13526)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Daniel Schepler <schepler at debian.org>, Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt,
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, pkg-kde-tools (>= 0.4),
  kdelibs5-dev (>= 4:4.2.0), libphonon-dev (>= 4:4.3.0), libqt4-opengl-dev,
  libglu1-mesa-dev, ggzcore-bin, libqca2-dev, zlib1g-dev
 Standards-Version: 3.8.0

Modified: branches/kde4.2/packages/kdegames/debian/rules
===================================================================
--- branches/kde4.2/packages/kdegames/debian/rules	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdegames/debian/rules	2009-01-25 11:42:14 UTC (rev 13526)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
  
-include debian/cdbs/kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := -DBIN_INSTALL_DIR=/usr/games
 


Property changes on: branches/kde4.2/packages/kdegraphics/debian
___________________________________________________________________
Name: svn:externals
   - cdbs svn://svn.debian.org/pkg-kde/branches/kde4.2/cdbs/


Modified: branches/kde4.2/packages/kdegraphics/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdegraphics/debian/changelog	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdegraphics/debian/changelog	2009-01-25 11:42:14 UTC (rev 13526)
@@ -16,6 +16,11 @@
   * Rename debian/*.lintian to debian/*.lintian-overrides.
   * Bump debian/compat and debhelper build dependency to v7 (to get more
     sophisticated debian/tmp handling).
+  * Switch from internal debian/cdbs/kde.mk to pkg-kde-tools:
+    - build depend on pkg-kde-tools 0.4;
+    - remove debian/cdbs directory;
+    - replace debian/cdbs/kde.mk with
+      /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk in debian/rules.
 
   +++ Changes by George Kiagiadakis:
 

Modified: branches/kde4.2/packages/kdegraphics/debian/control
===================================================================
--- branches/kde4.2/packages/kdegraphics/debian/control	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdegraphics/debian/control	2009-01-25 11:42:14 UTC (rev 13526)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt,
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, pkg-kde-tools (>= 0.4),
  kdelibs5-dev (>= 4:4.2.0), libphonon-dev (>= 4:4.3.0),
  libpoppler-qt4-dev (>= 0.8.0), libspectre-dev, libqca2-dev,
  libsane-dev, libtiff4-dev, libgphoto2-2-dev, libchm-dev, libdjvulibre-dev,

Modified: branches/kde4.2/packages/kdegraphics/debian/rules
===================================================================
--- branches/kde4.2/packages/kdegraphics/debian/rules	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdegraphics/debian/rules	2009-01-25 11:42:14 UTC (rev 13526)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
  
-include debian/cdbs/kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 
 DEB_DH_MAKESHLIBS_ARGS_libokularcore1 := -V #'libokularcore1 (>= 4:4.1.86)'
 DEB_DH_MAKESHLIBS_ARGS_libksane0 := -V #'libksane (>= 4:4.1.86)'


Property changes on: branches/kde4.2/packages/kdelibs/debian
___________________________________________________________________
Name: svn:externals
   - cdbs svn://svn.debian.org/pkg-kde/branches/kde4.2/cdbs/


Modified: branches/kde4.2/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/changelog	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdelibs/debian/changelog	2009-01-25 11:42:14 UTC (rev 13526)
@@ -1,4 +1,4 @@
-kde4libs (4:4.2.0-0r3) UNRELEASED; urgency=low
+kde4libs (4:4.2.0-0r4) UNRELEASED; urgency=low
 
   * New upstream release.
 
@@ -6,7 +6,6 @@
 
   TODO: remove plasma-abi-4.2-X for the first upload to the official
         archive (4:4.2.0-1). Not earlier.
-  TODO: copyright check.
 
   +++ Changes by Modestas Vainius:
 
@@ -90,7 +89,7 @@
 
   * Copyright file updates. Thanks to Modestas and his magic scripts.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 24 Jan 2009 03:36:12 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 24 Jan 2009 06:14:48 +0200
 
 kde4libs (4:4.1.3-2) experimental; urgency=low
 

Modified: branches/kde4.2/packages/kdelibs/debian/control
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/control	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdelibs/debian/control	2009-01-25 11:42:14 UTC (rev 13526)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>, Modestas Vainius <modestas at vainius.eu>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, cmake (>= 2.6.2-3~), pkg-kde-tools (>= 0.3),
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, cmake (>= 2.6.2-3~), pkg-kde-tools (>= 0.4),
  shared-mime-info (>= 0.20), libphonon-dev (>= 4:4.3.0),
  libcups2-dev, libdbus-1-dev, libqt4-dev (>= 4.4.3), libqt4-opengl-dev (>= 4.4.3),
  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],

Modified: branches/kde4.2/packages/kdelibs/debian/rules
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/rules	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdelibs/debian/rules	2009-01-25 11:42:14 UTC (rev 13526)
@@ -16,16 +16,7 @@
 # remove dependencies on kdebase-runtime and phonon (the metapackage)
 DEB_DH_SHLIBDEPS_ARGS_ALL := -- -xkdebase-runtime -xphonon
 
-include debian/cdbs/kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 
 binary-predeb/libplasma3::
 	echo plasma:abi-provides=$(PLASMA_ABI) >> debian/libplasma3.substvars
-
-binary-strip/libplasma3::
-	pkgkde-symbolshelper symbolfile -p $(cdbs_curpkg) -o debian/$(cdbs_curpkg).symbols.$(DEB_HOST_ARCH)
-
-binary-fixup/libplasma3::
-	pkgkde-symbolshelper postgensymbols -p $(cdbs_curpkg) -v
-
-clean::
-	rm -f debian/libplasma3.symbols.$(DEB_HOST_ARCH)


Property changes on: branches/kde4.2/packages/kdemultimedia/debian
___________________________________________________________________
Name: svn:externals
   - cdbs svn://svn.debian.org/pkg-kde/branches/kde4.2/cdbs/


Modified: branches/kde4.2/packages/kdemultimedia/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdemultimedia/debian/changelog	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdemultimedia/debian/changelog	2009-01-25 11:42:14 UTC (rev 13526)
@@ -19,6 +19,11 @@
     for now.
   * Bump debian/compat and debhelper build dependency to v7 (to get more
     sophisticated debian/tmp handling).
+  * Switch from internal debian/cdbs/kde.mk to pkg-kde-tools:
+    - build depend on pkg-kde-tools 0.4;
+    - remove debian/cdbs directory;
+    - replace debian/cdbs/kde.mk with
+      /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk in debian/rules.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 24 Jan 2009 03:36:31 +0200
 

Modified: branches/kde4.2/packages/kdemultimedia/debian/control
===================================================================
--- branches/kde4.2/packages/kdemultimedia/debian/control	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdemultimedia/debian/control	2009-01-25 11:42:14 UTC (rev 13526)
@@ -4,7 +4,7 @@
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>,
  Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>, Modestas Vainius <modestas at vainius.eu>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt,
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, pkg-kde-tools (>= 0.4),
  kdelibs5-dev (>= 4:4.2.0), libphonon-dev (>= 4:4.3.0),
  libasound2-dev (>= 1.0.14a) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libcdparanoia0-dev, libflac-dev, libmusicbrainz4-dev, libxine-dev,

Modified: branches/kde4.2/packages/kdemultimedia/debian/rules
===================================================================
--- branches/kde4.2/packages/kdemultimedia/debian/rules	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdemultimedia/debian/rules	2009-01-25 11:42:14 UTC (rev 13526)
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
  
-include debian/cdbs/kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 
 DEB_DH_MAKESHLIBS_ARGS_libkcddb4 := -V'libkcddb4 (>= 4:4.2.0)'


Property changes on: branches/kde4.2/packages/kdenetwork/debian
___________________________________________________________________
Name: svn:externals
   - cdbs svn://svn.debian.org/pkg-kde/branches/kde4.2/cdbs/


Modified: branches/kde4.2/packages/kdenetwork/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdenetwork/debian/changelog	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdenetwork/debian/changelog	2009-01-25 11:42:14 UTC (rev 13526)
@@ -27,6 +27,11 @@
     for now.
   * Bump debian/compat and debhelper build dependency to v7 (to get more
     sophisticated debian/tmp handling).
+  * Switch from internal debian/cdbs/kde.mk to pkg-kde-tools:
+    - build depend on pkg-kde-tools 0.4;
+    - remove debian/cdbs directory;
+    - replace debian/cdbs/kde.mk with
+      /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk in debian/rules.
 
   +++ Changes by George Kiagiadakis:
 

Modified: branches/kde4.2/packages/kdenetwork/debian/control
===================================================================
--- branches/kde4.2/packages/kdenetwork/debian/control	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdenetwork/debian/control	2009-01-25 11:42:14 UTC (rev 13526)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Modestas Vainius <modestas at vainius.eu>, Matthew Rosewarne <mrosewarne at inoutbox.com>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt,
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, pkg-kde-tools (>= 0.4),
  kdelibs5-dev (>= 4:4.2.0), kdepimlibs5-dev (>= 4:4.2.0),
  zlib1g-dev, libjpeg62-dev, libxml2-dev, libxslt1-dev, libssl-dev,
  libxdamage-dev, libxss-dev, libslp-dev, libiw-dev, libidn11-dev, libxtst-dev,

Modified: branches/kde4.2/packages/kdenetwork/debian/rules
===================================================================
--- branches/kde4.2/packages/kdenetwork/debian/rules	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdenetwork/debian/rules	2009-01-25 11:42:14 UTC (rev 13526)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-include debian/cdbs/kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 
 DEB_FIXPERMS_EXCLUDE := usr/bin/kppp
 


Property changes on: branches/kde4.2/packages/kdepim/debian
___________________________________________________________________
Name: svn:externals
   - cdbs svn://svn.debian.org/pkg-kde/branches/kde4.2/cdbs/


Modified: branches/kde4.2/packages/kdepim/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdepim/debian/changelog	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdepim/debian/changelog	2009-01-25 11:42:14 UTC (rev 13526)
@@ -38,6 +38,11 @@
   * Tweak kontact Recommends/Suggest a bit.
   * Bump debian/compat and debhelper build dependency to v7 (to get more
     sophisticated debian/tmp handling).
+  * Switch from internal debian/cdbs/kde.mk to pkg-kde-tools:
+    - build depend on pkg-kde-tools 0.4;
+    - remove debian/cdbs directory;
+    - replace debian/cdbs/kde.mk with
+      /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk in debian/rules.
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
 

Modified: branches/kde4.2/packages/kdepim/debian/control
===================================================================
--- branches/kde4.2/packages/kdepim/debian/control	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdepim/debian/control	2009-01-25 11:42:14 UTC (rev 13526)
@@ -4,7 +4,7 @@
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>,
  Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>, Modestas Vainius <modestas at vainius.eu>
-Build-Depends: cdbs, debhelper (>= 7), quilt,
+Build-Depends: cdbs, debhelper (>= 7), quilt, pkg-kde-tools (>= 0.4),
  kdelibs5-dev (>= 4:4.2.0), kdepimlibs5-dev (>= 4:4.2.0),
  libphonon-dev (>= 4:4.3.0),
  libgpgme11-dev, libboost-dev, libboost-graph-dev, libsasl2-dev,

Modified: branches/kde4.2/packages/kdepim/debian/rules
===================================================================
--- branches/kde4.2/packages/kdepim/debian/rules	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdepim/debian/rules	2009-01-25 11:42:14 UTC (rev 13526)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-include debian/cdbs/kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 
 DEBIANVERSION ?= $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: //')
 


Property changes on: branches/kde4.2/packages/kdepimlibs/debian
___________________________________________________________________
Name: svn:externals
   - cdbs svn://svn.debian.org/pkg-kde/branches/kde4.2/cdbs/


Modified: branches/kde4.2/packages/kdepimlibs/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdepimlibs/debian/changelog	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdepimlibs/debian/changelog	2009-01-25 11:42:14 UTC (rev 13526)
@@ -15,6 +15,11 @@
   * Switch to new installgen format.
   * Bump debian/compat and debhelper build dependency to v7 (to get more
     sophisticated debian/tmp handling).
+  * Switch from internal debian/cdbs/kde.mk to pkg-kde-tools:
+    - build depend on pkg-kde-tools 0.4;
+    - remove debian/cdbs directory;
+    - replace debian/cdbs/kde.mk with
+      /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk in debian/rules.
 
   +++ Changes by George Kiagiadakis:
 

Modified: branches/kde4.2/packages/kdepimlibs/debian/control
===================================================================
--- branches/kde4.2/packages/kdepimlibs/debian/control	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdepimlibs/debian/control	2009-01-25 11:42:14 UTC (rev 13526)
@@ -4,7 +4,7 @@
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>,
  Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>, Modestas Vainius <modestas at vainius.eu>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt,
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, pkg-kde-tools (>= 0.4),
  kdelibs5-dev (>= 4:4.2.0), libboost-dev, libgpgme11-dev, libldap2-dev, libsasl2-dev,
  libakonadi-dev (>= 1.1.1), libical-dev (>= 0.33)
 Standards-Version: 3.8.0

Modified: branches/kde4.2/packages/kdepimlibs/debian/rules
===================================================================
--- branches/kde4.2/packages/kdepimlibs/debian/rules	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdepimlibs/debian/rules	2009-01-25 11:42:14 UTC (rev 13526)
@@ -9,4 +9,4 @@
 # get rid of the dependency on kdebase-runtime
 DEB_DH_SHLIBDEPS_ARGS_ALL:=-- -xkdebase-runtime
 
-include debian/cdbs/kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk


Property changes on: branches/kde4.2/packages/kdeplasma-addons/debian
___________________________________________________________________
Name: svn:externals
   - cdbs svn://svn.debian.org/pkg-kde/branches/kde4.2/cdbs/


Modified: branches/kde4.2/packages/kdeplasma-addons/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdeplasma-addons/debian/changelog	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdeplasma-addons/debian/changelog	2009-01-25 11:42:14 UTC (rev 13526)
@@ -21,6 +21,11 @@
     for now.
   * Bump debian/compat and debhelper build dependency to v7 (to get more
     sophisticated debian/tmp handling).
+  * Switch from internal debian/cdbs/kde.mk to pkg-kde-tools:
+    - build depend on pkg-kde-tools 0.4;
+    - remove debian/cdbs directory;
+    - replace debian/cdbs/kde.mk with
+      /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk in debian/rules.
 
   ++ Changes by George Kiagiadakis:
 

Modified: branches/kde4.2/packages/kdeplasma-addons/debian/control
===================================================================
--- branches/kde4.2/packages/kdeplasma-addons/debian/control	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdeplasma-addons/debian/control	2009-01-25 11:42:14 UTC (rev 13526)
@@ -4,7 +4,7 @@
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>,
  Armin Berres <trigger+debian at space-based.de>, Modestas Vainius <modestas at vainius.eu>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt,
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, pkg-kde-tools (>= 0.4),
  kdelibs5-dev (>= 4:4.2.0), kdepimlibs5-dev (>= 4:4.2.0), libqt4-opengl-dev,
  kdebase-workspace-dev (>= 4:4.2.0), libboost-dev, libkexiv2-7-dev, python
 Standards-Version: 3.8.0

Modified: branches/kde4.2/packages/kdeplasma-addons/debian/rules
===================================================================
--- branches/kde4.2/packages/kdeplasma-addons/debian/rules	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdeplasma-addons/debian/rules	2009-01-25 11:42:14 UTC (rev 13526)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-include debian/cdbs/kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 
 DEB_DH_MAKESHLIBS_ARGS_liblancelot0 := -V
 


Property changes on: branches/kde4.2/packages/kdesdk/debian
___________________________________________________________________
Name: svn:externals
   - cdbs svn://svn.debian.org/pkg-kde/branches/kde4.2/cdbs/


Modified: branches/kde4.2/packages/kdesdk/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdesdk/debian/changelog	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdesdk/debian/changelog	2009-01-25 11:42:14 UTC (rev 13526)
@@ -21,6 +21,11 @@
   * Rename debian/*.lintian to debian/*.lintian-overrides.
   * Bump debian/compat and debhelper build dependency to v7 (to get more
     sophisticated debian/tmp handling).
+  * Switch from internal debian/cdbs/kde.mk to pkg-kde-tools:
+    - build depend on pkg-kde-tools 0.4;
+    - remove debian/cdbs directory;
+    - replace debian/cdbs/kde.mk with
+      /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk in debian/rules.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 24 Jan 2009 03:39:28 +0200
 

Modified: branches/kde4.2/packages/kdesdk/debian/control
===================================================================
--- branches/kde4.2/packages/kdesdk/debian/control	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdesdk/debian/control	2009-01-25 11:42:14 UTC (rev 13526)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Fathi Boudra <fabo at debian.org>, Sune Vuorela <debian at pusling.com>, Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt,
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, pkg-kde-tools (>= 0.4),
  kdepimlibs5-dev (>= 4:4.2.0), libphonon-dev (>= 4:4.3.0),
  libsvn-dev, libstreamanalyzer-dev (>= 0.6.3), libxslt1-dev, libboost-dev, binutils-dev
 Standards-Version: 3.8.0

Modified: branches/kde4.2/packages/kdesdk/debian/rules
===================================================================
--- branches/kde4.2/packages/kdesdk/debian/rules	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdesdk/debian/rules	2009-01-25 11:42:14 UTC (rev 13526)
@@ -1,4 +1,4 @@
 #!/usr/bin/make -f
 
-include debian/cdbs/kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 


Property changes on: branches/kde4.2/packages/kdetoys/debian
___________________________________________________________________
Name: svn:externals
   - cdbs svn://svn.debian.org/pkg-kde/branches/kde4.2/cdbs/


Modified: branches/kde4.2/packages/kdetoys/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdetoys/debian/changelog	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdetoys/debian/changelog	2009-01-25 11:42:14 UTC (rev 13526)
@@ -1,4 +1,4 @@
-kdetoys (4:4.2.0-0r1) UNRELEASED; urgency=low
+kdetoys (4:4.2.0-0r2) UNRELEASED; urgency=low
 
   * New upstream release.
 
@@ -14,6 +14,11 @@
     for now.
   * Bump debian/compat and debhelper build dependency to v7 (to get more
     sophisticated debian/tmp handling).
+  * Switch from internal debian/cdbs/kde.mk to pkg-kde-tools:
+    - build depend on pkg-kde-tools 0.4;
+    - remove debian/cdbs directory;
+    - replace debian/cdbs/kde.mk with
+      /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk in debian/rules.
 
   +++ Changes by Sune Vuorela:
 

Modified: branches/kde4.2/packages/kdetoys/debian/control
===================================================================
--- branches/kde4.2/packages/kdetoys/debian/control	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdetoys/debian/control	2009-01-25 11:42:14 UTC (rev 13526)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt,
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, pkg-kde-tools (>= 0.4),
  kdebase-workspace-dev (>= 4:4.2.0),
  libphonon-dev (>> 4:4.3.0), libx11-dev, libxrender-dev, libxrandr-dev, 
  libstreamanalyzer-dev (>= 0.6.3), libqimageblitz-dev

Modified: branches/kde4.2/packages/kdetoys/debian/rules
===================================================================
--- branches/kde4.2/packages/kdetoys/debian/rules	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdetoys/debian/rules	2009-01-25 11:42:14 UTC (rev 13526)
@@ -1,4 +1,4 @@
 #!/usr/bin/make -f
 
-include debian/cdbs/kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 


Property changes on: branches/kde4.2/packages/kdeutils/debian
___________________________________________________________________
Name: svn:externals
   - cdbs svn://svn.debian.org/pkg-kde/branches/kde4.2/cdbs/


Modified: branches/kde4.2/packages/kdeutils/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdeutils/debian/changelog	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdeutils/debian/changelog	2009-01-25 11:42:14 UTC (rev 13526)
@@ -18,6 +18,11 @@
     for now.
   * Bump debian/compat and debhelper build dependency to v7 (to get more
     sophisticated debian/tmp handling).
+  * Switch from internal debian/cdbs/kde.mk to pkg-kde-tools:
+    - build depend on pkg-kde-tools 0.4;
+    - remove debian/cdbs directory;
+    - replace debian/cdbs/kde.mk with
+      /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk in debian/rules.
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
 

Modified: branches/kde4.2/packages/kdeutils/debian/control
===================================================================
--- branches/kde4.2/packages/kdeutils/debian/control	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdeutils/debian/control	2009-01-25 11:42:14 UTC (rev 13526)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Fathi Boudra <fabo at debian.org>, Matthew Rosewarne <mrosewarne at inoutbox.com>, Sune Vuorela <debian at pusling.com>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt,
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, pkg-kde-tools (>= 0.4),
  kdelibs5-dev (>= 4:4.2.0), kdepimlibs5-dev (>= 4:4.2.0),
  libgmp3-dev, libqimageblitz-dev (>= 1:0.0.4-2), libsnmp-dev, libzip-dev,
  libarchive-dev, libx11-dev, libxrender-dev, python-support

Modified: branches/kde4.2/packages/kdeutils/debian/rules
===================================================================
--- branches/kde4.2/packages/kdeutils/debian/rules	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdeutils/debian/rules	2009-01-25 11:42:14 UTC (rev 13526)
@@ -2,7 +2,7 @@
 
 DEB_CMAKE_CUSTOM_FLAGS += -DINSTALL_PRINTER_APPLET:BOOL=TRUE
 
-include debian/cdbs/kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 
 binary-install/printer-applet::
 	dh_pysupport -pprinter-applet


Property changes on: branches/kde4.2/packages/kdevelop/debian
___________________________________________________________________
Name: svn:externals
   - cdbs svn://svn.debian.org/pkg-kde/branches/kde4.2/cdbs/


Modified: branches/kde4.2/packages/kdevelop/debian/control
===================================================================
--- branches/kde4.2/packages/kdevelop/debian/control	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdevelop/debian/control	2009-01-25 11:42:14 UTC (rev 13526)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>, Jeremy Lainé <jeremy.laine at m4x.org>
-Build-Depends: cdbs, debhelper (>= 7), quilt, cmake (>= 2.6),
+Build-Depends: cdbs, debhelper (>= 7), quilt, cmake (>= 2.6.2), pkg-kde-tools (>= 0.4),
  kdevplatform-dev
 Standards-Version: 3.8.0
 Homepage: http://www.kdevelop.org/

Modified: branches/kde4.2/packages/kdevelop/debian/rules
===================================================================
--- branches/kde4.2/packages/kdevelop/debian/rules	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdevelop/debian/rules	2009-01-25 11:42:14 UTC (rev 13526)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-include debian/cdbs/kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 
 binary-install/kdevelop::
 	install -D -p -m0644 debian/kdevelop.xpm \


Property changes on: branches/kde4.2/packages/kdevplatform/debian
___________________________________________________________________
Name: svn:externals
   - cdbs svn://svn.debian.org/pkg-kde/branches/kde4.2/cdbs/


Modified: branches/kde4.2/packages/kdevplatform/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdevplatform/debian/changelog	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdevplatform/debian/changelog	2009-01-25 11:42:14 UTC (rev 13526)
@@ -3,4 +3,3 @@
   * New svn snapshot.
 
  -- Fathi Boudra <fabo at debian.org>  Wed, 31 Dec 2008 12:00:01 +0100
-

Modified: branches/kde4.2/packages/kdevplatform/debian/control
===================================================================
--- branches/kde4.2/packages/kdevplatform/debian/control	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdevplatform/debian/control	2009-01-25 11:42:14 UTC (rev 13526)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>, Jeremy Lainé <jeremy.laine at m4x.org>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, cmake (>= 2.6),
- kdelibs5-dev (>= 4:4.1.96), libcommoncpp2-dev,
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, cmake (>= 2.6.2), pkg-kde-tools (>= 0.4),
+ kdelibs5-dev (>= 4:4.2.0), libcommoncpp2-dev,
  libboost-iostreams-dev, libboost-serialization-dev,
  libsvn-dev
 Standards-Version: 3.8.0

Modified: branches/kde4.2/packages/kdevplatform/debian/rules
===================================================================
--- branches/kde4.2/packages/kdevplatform/debian/rules	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdevplatform/debian/rules	2009-01-25 11:42:14 UTC (rev 13526)
@@ -8,5 +8,5 @@
 
 DEB_DH_STRIP_ARGS := --keep-debug
 
-include debian/cdbs/kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 


Property changes on: branches/kde4.2/packages/kdewebdev/debian
___________________________________________________________________
Name: svn:externals
   - cdbs svn://svn.debian.org/pkg-kde/branches/kde4.2/cdbs/


Modified: branches/kde4.2/packages/kdewebdev/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdewebdev/debian/changelog	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdewebdev/debian/changelog	2009-01-25 11:42:14 UTC (rev 13526)
@@ -14,6 +14,11 @@
   * Add debian/installgen.
   * Bump debian/compat and debhelper build dependency to v7 (to get more
     sophisticated debian/tmp handling).
+  * Switch from internal debian/cdbs/kde.mk to pkg-kde-tools:
+    - build depend on pkg-kde-tools 0.4;
+    - remove debian/cdbs directory;
+    - replace debian/cdbs/kde.mk with
+      /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk in debian/rules.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 24 Jan 2009 03:38:56 +0200
 

Modified: branches/kde4.2/packages/kdewebdev/debian/control
===================================================================
--- branches/kde4.2/packages/kdewebdev/debian/control	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdewebdev/debian/control	2009-01-25 11:42:14 UTC (rev 13526)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Xavier Vello <xavier.vello at gmail.com>
-Build-Depends: cdbs, debhelper (>= 7), quilt, 
+Build-Depends: cdbs, debhelper (>= 7), quilt, pkg-kde-tools (>= 0.4),
  kdelibs5-dev (>= 4:4.2.0), kdepimlibs5-dev (>= 4:4.2.0),
  libtidy-dev, zlib1g-dev, libboost-dev, libxslt-dev
 Standards-Version: 3.8.0

Modified: branches/kde4.2/packages/kdewebdev/debian/rules
===================================================================
--- branches/kde4.2/packages/kdewebdev/debian/rules	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/kdewebdev/debian/rules	2009-01-25 11:42:14 UTC (rev 13526)
@@ -1,4 +1,4 @@
 #!/usr/bin/make -f
 
-include debian/cdbs/kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 


Property changes on: branches/kde4.2/packages/koffice/debian
___________________________________________________________________
Name: svn:externals
   - cdbs svn://svn.debian.org/pkg-kde/branches/kde4.2/cdbs/


Modified: branches/kde4.2/packages/koffice/debian/changelog
===================================================================
--- branches/kde4.2/packages/koffice/debian/changelog	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/koffice/debian/changelog	2009-01-25 11:42:14 UTC (rev 13526)
@@ -1,3 +1,20 @@
+koffice (1:1.9.98.1-2) UNRELEASED; urgency=low
+
+  +++ Changes by Modestas Vainius:
+
+  * Switch from internal debian/cdbs/kde.mk to pkg-kde-tools:
+    - build depend on pkg-kde-tools 0.4;
+    - remove debian/cdbs directory;
+    - replace debian/cdbs/kde.mk with
+      /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk in debian/rules.
+  * Rename debian/*.lintian to debian/*.lintian-overrides.
+
+  +++ Changes by Ana Beatriz Guerrero Lopez:
+  
+  * ...
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 24 Jan 2009 06:14:48 +0200
+
 koffice (1:1.9.98.1-1) experimental; urgency=low
 
   * New upstream release, second beta.

Modified: branches/kde4.2/packages/koffice/debian/control
===================================================================
--- branches/kde4.2/packages/koffice/debian/control	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/koffice/debian/control	2009-01-25 11:42:14 UTC (rev 13526)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Raúl Sánchez Siles <rasasi78 at gmail.com>
-Build-Depends: cdbs, debhelper (>= 7), quilt, cmake (>= 2.6), 
+Build-Depends: cdbs, debhelper (>= 7), quilt, cmake (>= 2.6), pkg-kde-tools (>= 0.4),
  kdepimlibs5-dev (>= 4:4.1.0), libphonon-dev (>= 4:4.1.0),
  libboost-dev, libopenexr-dev, libeigen2-dev,
  libqimageblitz-dev, libqca2-dev, libglew1.5-dev,

Deleted: branches/kde4.2/packages/koffice/debian/karbon.lintian

Copied: branches/kde4.2/packages/koffice/debian/karbon.lintian-overrides (from rev 13519, branches/kde4.2/packages/koffice/debian/karbon.lintian)
===================================================================
--- branches/kde4.2/packages/koffice/debian/karbon.lintian-overrides	                        (rev 0)
+++ branches/kde4.2/packages/koffice/debian/karbon.lintian-overrides	2009-01-25 11:42:14 UTC (rev 13526)
@@ -0,0 +1,6 @@
+karbon: shlib-missing-in-control-file libkdeinit4_karbon.so for usr/lib/libkdeinit4_karbon.so
+karbon: package-name-doesnt-match-sonames libkarboncommon5 libkarbonui5 libkdeinit4-karbon
+karbon: no-symbols-control-file usr/lib/libkdeinit4_karbon.so
+karbon: no-symbols-control-file usr/lib/libkarboncommon.so.5.0.0
+karbon: no-symbols-control-file usr/lib/libkarbonui.so.5.0.0
+


Property changes on: branches/kde4.2/packages/koffice/debian/karbon.lintian-overrides
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: branches/kde4.2/packages/koffice/debian/kchart.lintian

Copied: branches/kde4.2/packages/koffice/debian/kchart.lintian-overrides (from rev 13519, branches/kde4.2/packages/koffice/debian/kchart.lintian)
===================================================================
--- branches/kde4.2/packages/koffice/debian/kchart.lintian-overrides	                        (rev 0)
+++ branches/kde4.2/packages/koffice/debian/kchart.lintian-overrides	2009-01-25 11:42:14 UTC (rev 13526)
@@ -0,0 +1,7 @@
+kchart: shlib-missing-in-control-file libkdeinit4_kchart.so for usr/lib/libkdeinit4_kchart.so
+kchart: package-name-doesnt-match-sonames libchartshapelib5 libkchartcommon5 libkdchart5 libkdeinit4-kchart
+kchart: no-symbols-control-file usr/lib/libkdeinit4_kchart.so
+kchart: no-symbols-control-file usr/lib/libkdchart.so.5.0.0
+kchart: no-symbols-control-file usr/lib/libkchartcommon.so.5.0.0
+kchart: no-symbols-control-file usr/lib/libchartshapelib.so.5.0.0
+


Property changes on: branches/kde4.2/packages/koffice/debian/kchart.lintian-overrides
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: branches/kde4.2/packages/koffice/debian/koffice-libs.lintian

Copied: branches/kde4.2/packages/koffice/debian/koffice-libs.lintian-overrides (from rev 13519, branches/kde4.2/packages/koffice/debian/koffice-libs.lintian)
===================================================================
--- branches/kde4.2/packages/koffice/debian/koffice-libs.lintian-overrides	                        (rev 0)
+++ branches/kde4.2/packages/koffice/debian/koffice-libs.lintian-overrides	2009-01-25 11:42:14 UTC (rev 13526)
@@ -0,0 +1,17 @@
+koffice-libs: package-name-doesnt-match-sonames libflake5 libkisexiv2-5 libkochart5 libkoffice-graya-u16-5 libkofficegrayau8colorspace5 libkoguiutils5 libkokross5 libkomain5 libkoodf5 libkopageapp5 libkoresources5 libkostore5 libkotext5 libkowmf5 libkwmf5 libkwordexportfilters5 libpigmentcms5
+koffice-libs: no-symbols-control-file usr/lib/libkwmf.so.5.0.0
+koffice-libs: no-symbols-control-file usr/lib/libkoodf.so.5.0.0
+koffice-libs: no-symbols-control-file usr/lib/libkoresources.so.5.0.0
+koffice-libs: no-symbols-control-file usr/lib/libkochart.so.5.0.0
+koffice-libs: no-symbols-control-file usr/lib/libflake.so.5.0.0
+koffice-libs: no-symbols-control-file usr/lib/libkoffice_graya_u16.so.5.0.0
+koffice-libs: no-symbols-control-file usr/lib/libkotext.so.5.0.0
+koffice-libs: no-symbols-control-file usr/lib/libkofficegrayau8colorspace.so.5.0.0
+koffice-libs: no-symbols-control-file usr/lib/libkisexiv2.so.5.0.0
+koffice-libs: no-symbols-control-file usr/lib/libkomain.so.5.0.0
+koffice-libs: no-symbols-control-file usr/lib/libkokross.so.5.0.0
+koffice-libs: no-symbols-control-file usr/lib/libkwordexportfilters.so.5.0.0
+koffice-libs: no-symbols-control-file usr/lib/libkowmf.so.5.0.0
+koffice-libs: no-symbols-control-file usr/lib/libkoguiutils.so.5.0.0
+koffice-libs: no-symbols-control-file usr/lib/libkopageapp.so.5.0.0
+


Property changes on: branches/kde4.2/packages/koffice/debian/koffice-libs.lintian-overrides
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: branches/kde4.2/packages/koffice/debian/kplato.lintian

Copied: branches/kde4.2/packages/koffice/debian/kplato.lintian-overrides (from rev 13519, branches/kde4.2/packages/koffice/debian/kplato.lintian)
===================================================================
--- branches/kde4.2/packages/koffice/debian/kplato.lintian-overrides	                        (rev 0)
+++ branches/kde4.2/packages/koffice/debian/kplato.lintian-overrides	2009-01-25 11:42:14 UTC (rev 13526)
@@ -0,0 +1,18 @@
+kplato: unusual-interpreter ./usr/share/kde4/apps/kplato/scripts/extensions/busyinfoclear.py #!kross
+kplato: unusual-interpreter ./usr/share/kde4/apps/kplato/scripts/extensions/busyinfoexport.py #!kross
+kplato: unusual-interpreter ./usr/share/kde4/apps/kplato/scripts/extensions/busyinfoimport.py #!kross
+kplato: unusual-interpreter ./usr/share/kde4/apps/kplato/scripts/extensions/resourcesimport.py #!kross
+kplato: unusual-interpreter ./usr/share/kde4/apps/kplato/scripts/samples/sample_busyinfocheck.py #!kross
+kplato: unusual-interpreter ./usr/share/kde4/apps/kplato/scripts/samples/sample_project.py #!kross
+kplato: shlib-missing-in-control-file libkdeinit4_kplato.so for usr/lib/libkdeinit4_kplato.so
+kplato: shlib-missing-in-control-file libkdeinit4_kplatowork.so for usr/lib/libkdeinit4_kplatowork.so
+kplato: package-name-doesnt-match-sonames libkdeinit4-kplato libkdeinit4-kplatowork libkplatokernel5 libkplatomodels5 libkplatoprivate5 libkplatoui5 libkplatoworkapp5 libkplatoworkfactory5
+kplato: no-symbols-control-file usr/lib/libkdeinit4_kplato.so
+kplato: no-symbols-control-file usr/lib/libkplatokernel.so.5.0.0
+kplato: no-symbols-control-file usr/lib/libkplatoprivate.so.5.0.0
+kplato: no-symbols-control-file usr/lib/libkdeinit4_kplatowork.so
+kplato: no-symbols-control-file usr/lib/libkplatomodels.so.5.0.0
+kplato: no-symbols-control-file usr/lib/libkplatoworkapp.so.5.0.0
+kplato: no-symbols-control-file usr/lib/libkplatoworkfactory.so.5.0.0
+kplato: no-symbols-control-file usr/lib/libkplatoui.so.5.0.0
+


Property changes on: branches/kde4.2/packages/koffice/debian/kplato.lintian-overrides
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: branches/kde4.2/packages/koffice/debian/kpresenter.lintian

Copied: branches/kde4.2/packages/koffice/debian/kpresenter.lintian-overrides (from rev 13519, branches/kde4.2/packages/koffice/debian/kpresenter.lintian)
===================================================================
--- branches/kde4.2/packages/koffice/debian/kpresenter.lintian-overrides	                        (rev 0)
+++ branches/kde4.2/packages/koffice/debian/kpresenter.lintian-overrides	2009-01-25 11:42:14 UTC (rev 13526)
@@ -0,0 +1,5 @@
+kpresenter: shlib-missing-in-control-file libkdeinit4_kpresenter.so for usr/lib/libkdeinit4_kpresenter.so
+kpresenter: package-name-doesnt-match-sonames libkdeinit4-kpresenter libkpresenterprivate5
+kpresenter: no-symbols-control-file usr/lib/libkpresenterprivate.so.5.0.0
+kpresenter: no-symbols-control-file usr/lib/libkdeinit4_kpresenter.so
+


Property changes on: branches/kde4.2/packages/koffice/debian/kpresenter.lintian-overrides
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: branches/kde4.2/packages/koffice/debian/krita-data.lintian

Copied: branches/kde4.2/packages/koffice/debian/krita-data.lintian-overrides (from rev 13519, branches/kde4.2/packages/koffice/debian/krita-data.lintian)
===================================================================
--- branches/kde4.2/packages/koffice/debian/krita-data.lintian-overrides	                        (rev 0)
+++ branches/kde4.2/packages/koffice/debian/krita-data.lintian-overrides	2009-01-25 11:42:14 UTC (rev 13526)
@@ -0,0 +1,9 @@
+krita-data: desktop-command-not-in-package /usr/share/applications/kde4/krita.desktop krita
+krita-data: desktop-command-not-in-package /usr/share/applications/kde4/krita_bmp.desktop krita
+krita-data: desktop-command-not-in-package /usr/share/applications/kde4/krita_jpeg.desktop krita
+krita-data: desktop-command-not-in-package /usr/share/applications/kde4/krita_ora.desktop krita
+krita-data: desktop-command-not-in-package /usr/share/applications/kde4/krita_pdf.desktop krita
+krita-data: desktop-command-not-in-package /usr/share/applications/kde4/krita_png.desktop krita
+krita-data: desktop-command-not-in-package /usr/share/applications/kde4/krita_tiff.desktop krita
+krita-data: desktop-command-not-in-package /usr/share/applications/kde4/krita_magick.desktop krita
+


Property changes on: branches/kde4.2/packages/koffice/debian/krita-data.lintian-overrides
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: branches/kde4.2/packages/koffice/debian/krita.lintian

Copied: branches/kde4.2/packages/koffice/debian/krita.lintian-overrides (from rev 13519, branches/kde4.2/packages/koffice/debian/krita.lintian)
===================================================================
--- branches/kde4.2/packages/koffice/debian/krita.lintian-overrides	                        (rev 0)
+++ branches/kde4.2/packages/koffice/debian/krita.lintian-overrides	2009-01-25 11:42:14 UTC (rev 13526)
@@ -0,0 +1,12 @@
+krita: menu-icon-missing /usr/share/pixmaps/krita.xpm
+krita: shlib-missing-in-control-file libkdeinit4_krita.so for usr/lib/libkdeinit4_krita.so
+krita: no-symbols-control-file usr/lib/libkritaimage.so.5.0.0
+krita: no-symbols-control-file usr/lib/libkritabasicdynamiccoloringprogram.so.5.0.0
+krita: no-symbols-control-file usr/lib/libkritadynamicbrush.so.5.0.0
+krita: no-symbols-control-file usr/lib/libkrita_xyz_u16.so.5.0.0
+krita: no-symbols-control-file usr/lib/libkritabasicdynamicshapeprogram.so.5.0.0
+krita: no-symbols-control-file usr/lib/libkdeinit4_krita.so
+krita: no-symbols-control-file usr/lib/libkritagrayscale.so.5.0.0
+krita: no-symbols-control-file usr/lib/libkrossmodulekrita.so.5.0.0
+krita: no-symbols-control-file usr/lib/libkritaui.so.5.0.0
+krita: package-name-doesnt-match-sonames libKritaRulerAssistantCommon libkdeinit4-krita libkrita-xyz-u16-5 libkritabasicdynamiccoloringprogram5 libkritabasicdynamicshapeprogram5 libkritadynamicbrush5 libkritagrayscale5 libkritaimage5 libkritalibpaintop5 libkritaui5 libkrossmodulekrita5


Property changes on: branches/kde4.2/packages/koffice/debian/krita.lintian-overrides
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: branches/kde4.2/packages/koffice/debian/kspread.lintian

Copied: branches/kde4.2/packages/koffice/debian/kspread.lintian-overrides (from rev 13519, branches/kde4.2/packages/koffice/debian/kspread.lintian)
===================================================================
--- branches/kde4.2/packages/koffice/debian/kspread.lintian-overrides	                        (rev 0)
+++ branches/kde4.2/packages/koffice/debian/kspread.lintian-overrides	2009-01-25 11:42:14 UTC (rev 13526)
@@ -0,0 +1,22 @@
+kspread: shlib-missing-in-control-file libkdeinit4_kspread.so for usr/lib/libkdeinit4_kspread.so
+kspread: package-name-doesnt-match-sonames libkdeinit4-kspread libkspreadcommon5
+kspread: no-symbols-control-file usr/lib/libkdeinit4_kspread.so
+kspread: no-symbols-control-file usr/lib/libkspreadcommon.so.5.0.0
+kspread: unusual-interpreter ./usr/share/kde4/apps/kspread/scripts/docker/consoledocker.py #!kross
+kspread: unusual-interpreter ./usr/share/kde4/apps/kspread/scripts/extensions/csvexport.py #!kross
+kspread: unusual-interpreter ./usr/share/kde4/apps/kspread/scripts/extensions/csvimport.py #!kross
+kspread: unusual-interpreter ./usr/share/kde4/apps/kspread/scripts/extensions/htmlexport.py #!kross
+kspread: unusual-interpreter ./usr/share/kde4/apps/kspread/scripts/extensions/kexidbexport.py #!kross
+kspread: unusual-interpreter ./usr/share/kde4/apps/kspread/scripts/extensions/kexidbimport.py #!kross
+kspread: unusual-interpreter ./usr/share/kde4/apps/kspread/scripts/extensions/logger.py #!kross
+kspread: unusual-interpreter ./usr/share/kde4/apps/kspread/scripts/extensions/myorca.py #!kross
+kspread: unusual-interpreter ./usr/share/kde4/apps/kspread/scripts/extensions/odfpyexport.py #!kross
+kspread: unusual-interpreter ./usr/share/kde4/apps/kspread/scripts/extensions/vcardimport.py #!kross
+kspread: unusual-interpreter ./usr/share/kde4/apps/kspread/scripts/extensions/xmlviewer.py #!kross
+kspread: unusual-interpreter ./usr/share/kde4/apps/kspread/scripts/functions/functions.py #!kross
+kspread: unusual-interpreter ./usr/share/kde4/apps/kspread/scripts/functions/pyregexp.py #!kross
+kspread: unusual-interpreter ./usr/share/kde4/apps/kspread/scripts/functions/pytime.py #!kross
+kspread: unusual-interpreter ./usr/share/kde4/apps/kspread/scripts/functions/rpyfunctions.py #!kross
+kspread: unusual-interpreter ./usr/share/kde4/apps/kspread/scripts/functions/yfinance.py #!kross
+kspread: unusual-interpreter ./usr/share/kde4/apps/kspread/scripts/functions/yweather.py #!kross
+


Property changes on: branches/kde4.2/packages/koffice/debian/kspread.lintian-overrides
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: branches/kde4.2/packages/koffice/debian/kthesaurus.lintian

Copied: branches/kde4.2/packages/koffice/debian/kthesaurus.lintian-overrides (from rev 13519, branches/kde4.2/packages/koffice/debian/kthesaurus.lintian)
===================================================================
--- branches/kde4.2/packages/koffice/debian/kthesaurus.lintian-overrides	                        (rev 0)
+++ branches/kde4.2/packages/koffice/debian/kthesaurus.lintian-overrides	2009-01-25 11:42:14 UTC (rev 13526)
@@ -0,0 +1,6 @@
+kthesaurus: postinst-must-call-ldconfig usr/lib/libkdeinit4_kthesaurus.so
+kthesaurus: postrm-should-call-ldconfig usr/lib/libkdeinit4_kthesaurus.so
+kthesaurus: no-shlibs-control-file usr/lib/libkdeinit4_kthesaurus.so
+kthesaurus: package-name-doesnt-match-sonames libkdeinit4-kthesaurus
+kthesaurus: no-symbols-control-file usr/lib/libkdeinit4_kthesaurus.so
+


Property changes on: branches/kde4.2/packages/koffice/debian/kthesaurus.lintian-overrides
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: branches/kde4.2/packages/koffice/debian/kword-data.lintian

Copied: branches/kde4.2/packages/koffice/debian/kword-data.lintian-overrides (from rev 13519, branches/kde4.2/packages/koffice/debian/kword-data.lintian)
===================================================================
--- branches/kde4.2/packages/koffice/debian/kword-data.lintian-overrides	                        (rev 0)
+++ branches/kde4.2/packages/koffice/debian/kword-data.lintian-overrides	2009-01-25 11:42:14 UTC (rev 13526)
@@ -0,0 +1,21 @@
+kword-data: script-not-executable ./usr/share/kde4/apps/kword/scripts/extensions/doctree.rb
+kword-data: unusual-interpreter ./usr/share/kde4/apps/kword/scripts/extensions/doctree.rb #!kross
+kword-data: unusual-interpreter ./usr/share/kde4/apps/kword/scripts/extensions/exportfile.py #!kross
+kword-data: unusual-interpreter ./usr/share/kde4/apps/kword/scripts/extensions/importfile.py #!kross
+kword-data: unusual-interpreter ./usr/share/kde4/apps/kword/scripts/extensions/kwreportlab.py #!kross
+kword-data: unusual-interpreter ./usr/share/kde4/apps/kword/scripts/extensions/ooimport.py #!kross
+kword-data: unusual-interpreter ./usr/share/kde4/apps/kword/scripts/extensions/xmlviewer.py #!kross
+kword-data: unusual-interpreter ./usr/share/kde4/apps/kword/scripts/samples/sample_actions.py #!kross
+kword-data: unusual-interpreter ./usr/share/kde4/apps/kword/scripts/samples/sample_allshapes.py #!kross
+kword-data: script-not-executable ./usr/share/kde4/apps/kword/scripts/samples/sample_cursor.rb
+kword-data: unusual-interpreter ./usr/share/kde4/apps/kword/scripts/samples/sample_cursor.rb #!kross
+kword-data: unusual-interpreter ./usr/share/kde4/apps/kword/scripts/samples/sample_insertshape.py #!kross
+kword-data: unusual-interpreter ./usr/share/kde4/apps/kword/scripts/samples/sample_lists_cursor.py #!kross
+kword-data: unusual-interpreter ./usr/share/kde4/apps/kword/scripts/samples/sample_lists_html.py #!kross
+kword-data: unusual-interpreter ./usr/share/kde4/apps/kword/scripts/samples/sample_progressbar.py #!kross
+kword-data: unusual-interpreter ./usr/share/kde4/apps/kword/scripts/samples/sample_tables.py #!kross
+kword-data: unusual-interpreter ./usr/share/kde4/apps/kword/scripts/samples/sample_text.py #!kross
+kword-data: unusual-interpreter ./usr/share/kde4/apps/kword/scripts/samples/sample_toolactions.py #!kross
+kword-data: unusual-interpreter ./usr/share/kde4/apps/kword/scripts/samples/sample_variables.py #!kross
+kword-data: desktop-command-not-in-package /usr/share/applications/kde4/kword.desktop kword
+


Property changes on: branches/kde4.2/packages/koffice/debian/kword-data.lintian-overrides
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: branches/kde4.2/packages/koffice/debian/kword.lintian

Copied: branches/kde4.2/packages/koffice/debian/kword.lintian-overrides (from rev 13519, branches/kde4.2/packages/koffice/debian/kword.lintian)
===================================================================
--- branches/kde4.2/packages/koffice/debian/kword.lintian-overrides	                        (rev 0)
+++ branches/kde4.2/packages/koffice/debian/kword.lintian-overrides	2009-01-25 11:42:14 UTC (rev 13526)
@@ -0,0 +1,6 @@
+kword: shlib-missing-in-control-file libkdeinit4_kword.so for usr/lib/libkdeinit4_kword.so
+kword: package-name-doesnt-match-sonames libkdeinit4-kword libkwordprivate5
+kword: menu-icon-missing /usr/share/pixmaps/kword.xpm
+kword: no-symbols-control-file usr/lib/libkwordprivate.so.5.0.0
+kword: no-symbols-control-file usr/lib/libkdeinit4_kword.so
+


Property changes on: branches/kde4.2/packages/koffice/debian/kword.lintian-overrides
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: branches/kde4.2/packages/koffice/debian/rules
===================================================================
--- branches/kde4.2/packages/koffice/debian/rules	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/koffice/debian/rules	2009-01-25 11:42:14 UTC (rev 13526)
@@ -1,3 +1,3 @@
 #!/usr/bin/make -f
 
-include debian/cdbs/kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk


Property changes on: branches/kde4.2/packages/phonon/debian
___________________________________________________________________
Name: svn:externals
   - cdbs svn://svn.debian.org/pkg-kde/branches/kde4.2/cdbs/


Modified: branches/kde4.2/packages/phonon/debian/changelog
===================================================================
--- branches/kde4.2/packages/phonon/debian/changelog	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/phonon/debian/changelog	2009-01-25 11:42:14 UTC (rev 13526)
@@ -1,9 +1,15 @@
-phonon (4:4.3.0-2) UNRELEASED; urgency=low
+phonon (4:4.3.0-2~pre1) UNRELEASED; urgency=low
 
   +++ Changes by Modestas Vainius
 
   * Bump debian/compat and debhelper build dependency to v7 (to get more
     sophisticated debian/tmp handling).
+  * Switch from internal debian/cdbs/kde.mk to pkg-kde-tools:
+    - bump pkg-kde-tools build depend to 0.4;
+    - remove debian/cdbs directory;
+    - replace debian/cdbs/kde.mk with
+      /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk in debian/rules;
+    - remove custom symbolshelper rules from debian/rules.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 24 Jan 2009 03:46:50 +0200
 

Modified: branches/kde4.2/packages/phonon/debian/control
===================================================================
--- branches/kde4.2/packages/phonon/debian/control	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/phonon/debian/control	2009-01-25 11:42:14 UTC (rev 13526)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Modestas Vainius <modestas at vainius.eu>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, cmake (>= 2.6.2), pkg-kde-tools (>= 0.3),
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, cmake (>= 2.6.2), pkg-kde-tools (>= 0.4),
  libqt4-dev, automoc, libglu1-mesa-dev, libqt4-opengl-dev, libxml2-dev, libglib2.0-dev,
  libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libxine-dev,
  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]

Modified: branches/kde4.2/packages/phonon/debian/rules
===================================================================
--- branches/kde4.2/packages/phonon/debian/rules	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/phonon/debian/rules	2009-01-25 11:42:14 UTC (rev 13526)
@@ -1,18 +1,9 @@
 #!/usr/bin/make -f
 THIS_SHOULD_GO_TO_UNSTABLE=0
 
-include debian/cdbs/kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 
 #PHONON_MINIMUM_VERSION := 4:4.2.0
 #DEB_DH_MAKESHLIBS_ARGS_libphonon4 = -V'libphonon4 (>> $(PHONON_MINIMUM_VERSION)), phonon(>> $(PHONON_MINIMUM_VERSION))'
 
 DEB_DH_SHLIBDEPS_ARGS_ALL = -- -xphonon
-
-binary-strip/libphonon4::
-	pkgkde-symbolshelper symbolfile -p $(cdbs_curpkg) -o debian/$(cdbs_curpkg).symbols.$(DEB_HOST_ARCH)
-
-binary-fixup/libphonon4::
-	pkgkde-symbolshelper postgensymbols -p $(cdbs_curpkg) -v
-
-clean::
-	rm -f debian/libphonon4.symbols.$(DEB_HOST_ARCH)


Property changes on: branches/kde4.2/packages/soprano/debian
___________________________________________________________________
Name: svn:externals
   - cdbs svn://svn.debian.org/pkg-kde/branches/kde4.2/cdbs/


Modified: branches/kde4.2/packages/soprano/debian/changelog
===================================================================
--- branches/kde4.2/packages/soprano/debian/changelog	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/soprano/debian/changelog	2009-01-25 11:42:14 UTC (rev 13526)
@@ -6,6 +6,12 @@
   * Rename debian/*.lintian to debian/*.lintian-overrides.
   * Bump debian/compat and debhelper build dependency to v7 (to get more
     sophisticated debian/tmp handling).
+  * Switch from internal debian/cdbs/kde.mk to pkg-kde-tools:
+    - bump pkg-kde-tools build depend to 0.4;
+    - remove debian/cdbs directory;
+    - replace debian/cdbs/kde.mk with
+      /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk in debian/rules;
+    - remove custom symbolshelper rules from debian/rules.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 24 Jan 2009 03:47:56 +0200
 

Modified: branches/kde4.2/packages/soprano/debian/control
===================================================================
--- branches/kde4.2/packages/soprano/debian/control	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/soprano/debian/control	2009-01-25 11:42:14 UTC (rev 13526)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Sune Vuorela <debian at pusling.com>, Ana Beatriz Guerrero Lopez <ana at debian.org>, Armin Berres <trigger+debian at space-based.de>, Fathi Boudra <fabo at debian.org>, Matthew Rosewarne <mrosewarne at inoutbox.com>, Modestas Vainius <modestas at vainius.eu>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), cmake (>= 2.6.2), quilt, pkg-kde-tools (>= 0.3.1),
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), cmake (>= 2.6.2), quilt, pkg-kde-tools (>= 0.4),
  libclucene-dev, libqt4-dev (>= 4.4.0), librdf0-dev, doxygen, graphviz
 Standards-Version: 3.8.0
 Homepage: http://soprano.sourceforge.net

Modified: branches/kde4.2/packages/soprano/debian/rules
===================================================================
--- branches/kde4.2/packages/soprano/debian/rules	2009-01-25 11:21:23 UTC (rev 13525)
+++ branches/kde4.2/packages/soprano/debian/rules	2009-01-25 11:42:14 UTC (rev 13526)
@@ -1,9 +1,9 @@
 #!/usr/bin/make -f
 THIS_SHOULD_GO_TO_UNSTABLE=0
 
-include debian/cdbs/kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 
-DEB_DH_MAKESHLIBS_ARGS_libsoprano4 = -V'libsoprano4 (>= 2.1.67)'
+#DEB_DH_MAKESHLIBS_ARGS_libsoprano4 = -V'libsoprano4 (>= 2.1.67)'
 
 build/libsoprano-doc::
 	cp qt4.tag $(DEB_BUILDDIR)/qt4.tag
@@ -21,16 +21,6 @@
 	doxytag -t debian/$(cdbs_curpkg)/usr/share/soprano/doc/soprano.tag \
 		$(DEB_DESTDIR)/usr/share/soprano/doc/html
 
-# Symbol file handling
-binary-strip/libsoprano4::
-	pkgkde-symbolshelper symbolfile -p $(cdbs_curpkg) -o debian/$(cdbs_curpkg).symbols.$(DEB_HOST_ARCH)
-
-binary-fixup/libsoprano4::
-	pkgkde-symbolshelper postgensymbols -p $(cdbs_curpkg) -v
-
-clean::
-	rm -f debian/libsoprano4.symbols.$(DEB_HOST_ARCH)
-
 prune-nonfree:
 	# Deleting binary blobs
 	find \( -name *.jar -o -name *.class \) -print -delete


