[SCM] KDE Base Runtime module packaging branch, master, updated. debian/4.4.5-1-69-g10dbf24

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 4e44c6346beededa4ad5dbd3f6b911766c76cf06
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Mar 27 22:20:28 2011 +0300

    Switch debian/rules engine to dhmk based qt-kde-team/2/*.
---
 debian/changelog |    1 +
 debian/control   |    2 +-
 debian/rules     |   24 +++++++++++++++---------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a319141..a8ad8c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ kdebase-runtime (4:4.6.1-0r1) UNRELEASED; urgency=low
 
   [ Modestas Vainius ]
   * Point debian/control Vcs fields to the new Git repository.
+  * Switch debian/rules engine to dhmk based qt-kde-team/2/*.
 
   [ George Kiagiadakis ]
   * Change my email address in uploaders.
diff --git a/debian/control b/debian/control
index e5e95e3..1d939d5 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Sune Vuorela <sune at debian.org>, Fathi Boudra <fabo at debian.org>,
  Armin Berres <armin+debian at space-based.de>, Modestas Vainius <modax at debian.org>, George Kiagiadakis <kiagiadakis.george at gmail.com>,
  José Manuel Santamaría Lema <panfaust at gmail.com>
 Build-Depends: kde-sc-dev-latest (>= 4:4.6.1),
- cdbs (>= 0.4.51), cmake, debhelper (>= 7), pkg-kde-tools (>= 0.9),
+ cmake, debhelper (>= 7), pkg-kde-tools (>= 0.11),
  kdelibs5-dev (>= 4:4.6), libphonon-dev (>= 4:4.6.0really4.4.3), kdelibs5-plugins,
  libsmbclient-dev, libsoprano-dev (>= 2.5.63),
  libstreamanalyzer-dev (>= 0.6.3), libstrigiqtdbusclient-dev (>= 0.6.3),
diff --git a/debian/rules b/debian/rules
index 6ad18ea..26c7c6b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,23 @@
 #!/usr/bin/make -f
 
-# don't use the debugging symbols from kdebase-runtime-kde4. othwerwise we have a conflict with kdebase-dbg from KDE 3
-DEB_DBG_PACKAGE_kdebase-runtime := kdebase-runtime-dbg
+dh = --with=xine
+
+include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+
+override_dh_makeshlibs:
+	$(overriden_command) -Xusr/lib/attica_kde.so
 
 # exclude dependency on phonon metapackage. KDE4 does its own phonon setup
-DEB_DH_SHLIBDEPS_ARGS_ALL := -u-xphonon
-DEB_DH_SHLIBDEPS_ARGS_plasma-scriptengine-javascript := -u-xkdebase-runtime
+override_dh_shlibdeps:
+	$(overriden_command) -pplasma-scriptengine-javascript -- -xkdebase-runtime -xphonon
+	$(overriden_command) --remaining-packages -- -xphonon
 
-DEB_FIXPERMS_EXCLUDE := usr/lib/kde4/libexec/kdesud
+override_dh_fixperms:
+	$(overriden_command) -Xusr/lib/kde4/libexec/kdesud
 
-DEB_DH_MAKESHLIBS_ARGS_kdebase-runtime = -Xusr/lib/attica_kde.so
+override_dh_strip:
+	$(overriden_command) --dbg-package=kdebase-runtime-dbg
 
-include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
+override_dh_xine:
+	$(overriden_command) -pkde-config-phonon-xine
 
-install/kde-config-phonon-xine::
-	dh_xine

-- 
KDE Base Runtime module packaging