[SCM] KDE PIM Libraries module packaging branch, master, updated. debian/4.4.5-2-54-geee0785
Modestas Vainius
modax at alioth.debian.org
Sun Mar 27 18:58:25 UTC 2011
The following commit has been merged in the master branch:
commit f6f92cba240b9f1cd2dcd5174f0dbb5763c196b6
Author: Modestas Vainius <modax at debian.org>
Date: Sun Mar 27 20:15:14 2011 +0300
Switch debian/rules engine to dhmk based qt-kde-team/2/*.
---
debian/changelog | 1 +
debian/control | 2 +-
debian/rules | 37 ++++++++++++++++++++++---------------
3 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index dd33edf..4ef9ec2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,7 @@ kdepimlibs (4:4.6.1-0r1) UNRELEASED; urgency=low
[ Modestas Vainius ]
* Drop kdepimlibs5 transitional package.
+ * Switch debian/rules engine to dhmk based qt-kde-team/2/*.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 01 Aug 2010 10:41:56 +0300
diff --git a/debian/control b/debian/control
index 1ad98d8..df7e51e 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Sune Vuorela <debian at pusling.com>, 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.2.3), pkg-kde-tools (>= 0.9), dpkg-dev (>= 1.15.5),
+ cmake, debhelper (>= 7.2.3), pkg-kde-tools (>= 0.12), dpkg-dev (>= 1.15.5),
kdelibs5-dev (>= 4:4.6), libgpgme11-dev, libldap2-dev, libsasl2-dev,
libboost-dev, libboost-graph-dev, shared-mime-info,
libakonadi-dev (>= 1.5.0), libical-dev (>= 0.42),
diff --git a/debian/rules b/debian/rules
index 5308304..e338610 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,26 +1,33 @@
#!/usr/bin/make -f
-DEB_DH_MAKESHLIBS_ARGS_ALL = -u-c0
+include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+libpkgs_addsubst_allLibraries = kdepimlibs5-dev kdepimlibs-dbg
+libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
+include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk
# Get rid of the dependency on kde{base,pim}-runtime
-DEB_DH_SHLIBDEPS_ARGS_ALL:=-- -xkdebase-runtime -xkdepim-runtime -xkdepimlibs-kio-plugins
+override_dh_shlibdeps:
+ $(overriden_command) -- -xkdebase-runtime -xkdepim-runtime -xkdepimlibs-kio-plugins
-DEB_ALL_LIBRARIES_SUBST_PACKAGES = kdepimlibs5-dev kdepimlibs-dbg
-DEB_STRICT_LOCAL_SHLIBS_PACKAGES = $(DEB_LIBRARY_PACKAGES)
-
-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
+override_dh_strip:
+ $(overriden_command) --dbg-package=kdepimlibs-dbg
# Inject kdepimlibs-kio-plugins and kdepim-runtime via shlibs as well. Get
# packages from symbol files
-# Must go below library-packages.mk include due to DEB_LIBRARY_PACKAGES usage
+# Must go below library-packages.mk include due to $(libpkgs_...) usage
UPSTREAMVERSION := $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: //' | sed 's/^\(.*\)-.*/\1/')
-DEB_LIBRARIES_WITH_KDEPIM_RUNTIME := $(shell grep -l 'kdepim-runtime' debian/*.symbols | awk '-F[./]' '{ print $$2 }')
-DEB_LIBRARIES_WITH_KIO_PLUGINS := $(shell grep -l 'kdepimlibs-kio-plugins' debian/*.symbols | awk '-F[./]' '{ print $$2 }')
+libs_with_kdepim_runtime := $(shell grep -l 'kdepim-runtime' debian/*.symbols | awk '-F[./]' '{ print $$2 }')
+libs_with_kio_plugins := $(shell grep -l 'kdepimlibs-kio-plugins' debian/*.symbols | awk '-F[./]' '{ print $$2 }')
comma = ,
+define dh_makeshlibs_with_extra_shlibs
+$(overriden_command) -p$1 -V'$1 (>= $(UPSTREAMVERSION))\
+ $(and $(filter $1,$(libs_with_kdepim_runtime)),$(comma) kdepim-runtime)\
+ $(and $(filter $1,$(libs_with_kio_plugins)),$(comma) kdepimlibs-kio-plugins)'\
+ -- -c0
+
+endef
-$(foreach pkg,$(DEB_LIBRARY_PACKAGES), $(eval \
- DEB_DH_MAKESHLIBS_ARGS_$(pkg) += -V'$(pkg) (>= $(UPSTREAMVERSION)) \
- $(if $(filter $(pkg),$(DEB_LIBRARIES_WITH_KDEPIM_RUNTIME)),$(comma) kdepim-runtime,) \
- $(if $(filter $(pkg),$(DEB_LIBRARIES_WITH_KIO_PLUGINS)),$(comma) kdepimlibs-kio-plugins,)' \
-))
+override_dh_makeshlibs:
+ $(foreach p,$(filter $(libs_with_kdepim_runtime) $(libs_with_kio_plugins),$(libpkgs_all_packages)),\
+ $(call dh_makeshlibs_with_extra_shlibs,$p))
+ $(overriden_command) -V --remaining-packages -- -c0
--
KDE PIM Libraries module packaging
More information about the pkg-kde-commits
mailing list