[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.4.5-2+squeeze1-119-g8489bf3

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 23597aea9839588f1f21296d8d089588f963ab0f
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Mar 27 14:05:52 2011 +0300

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

diff --git a/debian/changelog b/debian/changelog
index bbd2fd7..e7ea781 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ kde4libs (4:4.6.1-0r1) UNRELEASED; urgency=low
 
   [ Modestas Vainius ]
   * Bump Standards-Version to 3.9.1: add Breaks next to Replaces where needed.
+  * 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 5912a45..c32bb8c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 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: cdbs (>= 0.4.51), debhelper (>= 7.2.3), cmake (>= 2.6.4), pkg-kde-tools (>= 0.9), po-debconf,
+Build-Depends: debhelper (>= 7.2.3), cmake (>= 2.6.4), pkg-kde-tools (>= 0.11), po-debconf,
  shared-mime-info (>= 0.30), dpkg-dev (>= 1.15.5), libphonon-dev (>= 4:4.6.0really4.3.80),
  libqt4-dev (>= 4:4.7.0~rc1), libqt4-opengl-dev (>= 4:4.7.0~rc1), libqtwebkit-dev,
  libpng-dev, libssl-dev, libsm-dev, flex, bison,
diff --git a/debian/rules b/debian/rules
index c6a70ea..9446784 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,41 +4,41 @@ BINARYVERSION ?= $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Versi
 UPSTREAMVERSION ?= $(shell echo '$(BINARYVERSION)' | sed 's/^\(.*\)-.*/\1/')
 UPSTREAMVERSION := $(UPSTREAMVERSION)
 #UPSTREAMVERSION ?= 4:4.2.0
-#PLASMA_ABI=$(shell grep 'plasma-abi-' debian/libplasma3.symbols.in | head -n1 | sed 's/^.*\(plasma-abi-\S\+\).*/\1/')
 RUNTIME_DEPS := kdebase-runtime
 
-DEB_DBG_PACKAGE_ALL := kdelibs5-dbg
+include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+
+# Fixes FTBFS (4:4.3.4-2) on ia64 (khtml code is too large to fit):
+#   html/khtmlview.cpp:3623: relocation truncated to fit: GPREL22 against `.rodata'
+# etc. We will have to reevalute if this is still needed some time later.
+ifeq (ia64,$(shell dpkg-architecture -qDEB_HOST_ARCH))
+    export CFLAGS += -ffunction-sections
+    export CXXFLAGS += -ffunction-sections
+endif
+
+override_dh_auto_install:
+	$(overriden_command)
+	chmod a+x debian/tmp/usr/share/kde4/apps/kconf_update/ksslcertificatemanager.upd.sh
 
 #bump version for every new upstream version!
-DEB_DH_MAKESHLIBS_ARGS_libkdecore5 := -V'libkdecore5 (>= $(UPSTREAMVERSION)), $(RUNTIME_DEPS)'
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V -u-c0
-#DEB_DH_MAKESHLIBS_ARGS_libplasma3 := -V'libplasma3 (>= $(UPSTREAMVERSION)), $(PLASMA_ABI)'
+override_dh_makeshlibs:
+	$(overriden_command) -plibkdecore5 -V'libkdecore5 (>= $(UPSTREAMVERSION)), $(RUNTIME_DEPS)' -- -c0
+	$(overriden_command) -V --remaining-packages -- -c0
+
+override_dh_strip:
+	$(overriden_command) --dbg-package=kdelibs5-dbg
 
 # remove dependencies on kdebase-runtime and phonon (the metapackage)
-DEB_DH_SHLIBDEPS_ARGS_ALL := -- -xkdebase-runtime -xphonon
+override_dh_shlibdeps:
+	$(overriden_command) -- -xkdebase-runtime -xphonon
 
-# Libraries stuff
-DEB_KDE43_LIBRARY_PACKAGES := libkdecore5 libkdeui5 libkde3support4 libkdesu5 libkdnssd4 \
+# Library stuff
+libpkgs_kde43_packages := libkdecore5 libkdeui5 libkde3support4 libkdesu5 libkdnssd4 \
     libkfile4 libkhtml5 libkimproxy4 libkio5 libkjsapi4 libkjsembed4 libkmediaplayer4 \
     libknewstuff2-4 libknotifyconfig4 libkntlm4 libkparts4 libkpty4 libkrosscore4 libkrossui4 \
     libktexteditor4 libkutils4 libnepomuk4 libsolid4 libthreadweaver4
-DEB_ALL_LIBRARIES_SUBST_PACKAGES = kdelibs5-dev kdelibs5-dbg
-DEB_KDE43_LIBRARIES_SUBST_PACKAGES = kdelibs5
-DEB_STRICT_LOCAL_SHLIBS_PACKAGES = $(DEB_LIBRARY_PACKAGES)
-
-# Fixes FTBFS (4:4.3.4-2) on ia64 (khtml code is too large to fit):
-#   html/khtmlview.cpp:3623: relocation truncated to fit: GPREL22 against `.rodata'
-# etc. We will have to reevalute if this is still needed some time later.
-ifeq (ia64,$(DEB_HOST_ARCH))
-    CFLAGS += -ffunction-sections
-    CXXFLAGS += -ffunction-sections
-endif
-
-include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
-include /usr/share/pkg-kde-tools/qt-kde-team/1/library-packages.mk
-
-binary-post-install/kdelibs5-data::
-	chmod a+x debian/kdelibs5-data/usr/share/kde4/apps/kconf_update/ksslcertificatemanager.upd.sh
+libpkgs_addsubst_kde43Libraries = kdelibs5
+libpkgs_addsubst_allLibraries = kdelibs5-dev kdelibs5-dbg
+libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
+include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk
 
-#binary-predeb/libplasma3::
-#	echo plasma:abi-provides=$(PLASMA_ABI) >> debian/libplasma3.substvars

-- 
KDE Development Platform Libraries module packaging