[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.4.5-7+squeeze1-99-g6e10c83

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 1be343275588006f40fce8a0d4493cfa91bb7ff6
Author: Modestas Vainius <modax at debian.org>
Date:   Mon Mar 28 01:22:21 2011 +0300

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

diff --git a/debian/changelog b/debian/changelog
index 9a961a5..ef2a33d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -116,6 +116,7 @@ kdebase-workspace (4:4.6.1-0r2) UNRELEASED; urgency=low
   * Drop 34_backport_krunner_crash_fix_threading.diff patch, it was stolen from
     upstream.
   * Replace /usr/share/common-licenses/BSD with verbatim license text.
+  * Switch debian/rules engine to dhmk based qt-kde-team/2/*.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 31 Jul 2010 16:41:50 +0300
 
diff --git a/debian/control b/debian/control
index 445046f..58d389e 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
  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), dpkg-dev (>= 1.15.5),
+ cmake, debhelper (>= 7), pkg-kde-tools (>= 0.12), dpkg-dev (>= 1.15.5),
  kdelibs5-dev (>= 4:4.6), kdepimlibs5-dev (>= 4:4.6),
  libstrigiqtdbusclient-dev (>= 0.6.3), libstreamanalyzer-dev (>= 0.6.3),
  libqimageblitz-dev (>= 1:0.0.4-2),
diff --git a/debian/rules b/debian/rules
index 36abcb7..269296b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,41 +1,47 @@
 #!/usr/bin/make -f
 
-DEB_ALL_LIBRARIES_SUBST_PACKAGES = kdebase-workspace-dev
-DEB_STRICT_LOCAL_SHLIBS_PACKAGES = $(DEB_LIBRARY_PACKAGES)
-BINARYVERSION := $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: //')
-
-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
-
-#DEB_CMAKE_EXTRA_FLAGS += \
-#	-DINSTALL_PRINTER_APPLET=TRUE
-
-DEB_CMAKE_EXTRA_FLAGS += -DKDE4_KDM_PAM_SERVICE=kdm -DKDE4_COMMON_PAM_SERVICE=kdm
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V -u-c0
-
-# Private shared libraries which do not install headers
-DEB_DH_MAKESHLIBS_ARGS_libplasmagenericshell4 := '-Vlibplasmagenericshell4 (= $(BINARYVERSION))'
-
-DEB_DH_MAKESHLIBS_ARGS_plasma-desktop := -Xlibkickoff.so
+dh = --with=python-support
 
-DEB_DH_SHLIBDEPS_ARGS_kdebase-workspace-bin := -- -xksysguard
-DEB_DH_SHLIBDEPS_ARGS_kdebase-workspace-dev := -- -xkdebase-runtime
-
-# For kdm: prevent it from stopping kdm in prerm ever (--no-restart-on-upgrade
-# is not enough)
-DEB_DH_INSTALLINIT_ARGS = --noscripts
-
-$(foreach p,$(filter lib%, $(DEB_ARCH_PACKAGES)),$(eval DEB_DH_SHLIBDEPS_ARGS_$(p) := -- -xkdebase-runtime))
-
-binary-install/kdm::
-	install -p -D -m644 debian/kdm-np.pam debian/kdm/etc/pam.d/kdm-np
-	install -p -D -m644 debian/kdm.insserv debian/kdm/etc/insserv.conf.d/kdm
-
-binary-install/plasma-scriptengine-python::
-	dh_pysupport -p$(cdbs_curpkg) /usr/share/kde4/apps/plasma_scriptengine_python
+include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+libpkgs_addsubst_allLibraries = kdebase-workspace-dev
+libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
+include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk
 
+BINARYVERSION := $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: //')
+DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
+override_dh_auto_configure:
+	$(overriden_command) -- -DKDE4_KDM_PAM_SERVICE=kdm -DKDE4_COMMON_PAM_SERVICE=kdm
+
+override_dh_strip:
+	$(overriden_command) --dbg-package=kdebase-workspace-dbg
+
+override_dh_makeshlibs:
+	# Private shared libraries which do not install headers
+	$(overriden_command) -plibplasmagenericshell4 '-Vlibplasmagenericshell4 (= $(BINARYVERSION))'
+	$(overriden_command) -pplasma-desktop -Xlibkickoff.so
+	$(overriden_command) --remaining-packages -V -- -c0
+
+override_dh_shlibdeps:
+	$(overriden_command) -pkdebase-workspace-bin -- -xksysguard
+	$(overriden_command) -pkdebase-workspace-dev -- -xkdebase-runtime
+	$(overriden_command) $(foreach p,$(filter lib%,$(shell dh_listpackages -a)),-p$p) -- -xkdebase-runtime
+	$(overriden_command) --remaining-packages
+
+# Prevent it from stopping kdm in prerm ever (--no-restart-on-upgrade is not
+# enough)
+override_dh_installinit:
+	$(overriden_command) -pkdm --noscripts
+	$(overriden_command) --remaining-packages
+
+pkgs_with_install_linux = $(patsubst debian/%.install.linux,%,$(wildcard debian/*.install.linux))
+override_dh_install:
+	$(overriden_command)
 ifeq ($(DEB_HOST_ARCH_OS),linux)
-install/kdebase-workspace-bin install/kdebase-workspace-data install/kinfocenter::
-	# Install common files
-	dh_install -p$(cdbs_curpkg) --ignore=debian/$(cdbs_curpkg).install.linux
+	# Also install common files in place of debian/*.install.linux variants
+	dh_install $(foreach p,$(pkgs_with_install_linux),-p$p --ignore=debian/$p.install.linux)
 endif
+	if [ -d debian/kdm ]; then \
+		install -p -D -m644 debian/kdm-np.pam debian/kdm/etc/pam.d/kdm-np && \
+		install -p -D -m644 debian/kdm.insserv debian/kdm/etc/insserv.conf.d/kdm; \
+    fi

-- 
KDE Base Workspace module packaging