[SCM] QCA2 library packaging branch, master, updated. debian/2.0.2-1-17-gb6b3613

[Felix Geyer]

The following commit has been merged in the master branch:
commit b5a788bb3d8bac7373afbf58faeb1f00b3946038
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Sun May 29 18:36:04 2011 +0200

    Switch debian/rules engine to dhmk.
---
 debian/changelog                     |    3 ++
 debian/control                       |    2 +-
 debian/libqca2-dbg.install           |    2 -
 debian/libqca2-dbg.lintian-overrides |    5 ----
 debian/rules                         |   44 +++++++++++----------------------
 5 files changed, 19 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ca22b70..44902de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ qca2 (2.0.3-1) UNRELEASED; urgency=low
 
   [ Felix Geyer ]
   * Switch to source format 3.0 (quilt).
+  * Switch debian/rules engine to dhmk.
+  * Pass --no-separate-debug-info to configure and let dh_strip handle
+    the debug symbol seperation.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 29 May 2011 17:30:46 +0200
 
diff --git a/debian/control b/debian/control
index a48b5c9..27f53ef 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Section: libs
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Jan Niehusmann <jan at debian.org>, Matthew Rosewarne <mrosewarne at inoutbox.com>
 Build-Depends: ca-certificates,
- cdbs (>= 0.4.51),
+ pkg-kde-tools (>= 0.12),
  debhelper (>= 6),
  libqt4-dev (>= 4.4.0)
 Build-Conflicts: libqca2-dev, qca-dev
diff --git a/debian/libqca2-dbg.install b/debian/libqca2-dbg.install
deleted file mode 100644
index fb2cecf..0000000
--- a/debian/libqca2-dbg.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/bin/qcatool2.debug
-debian/tmp/usr/lib/libqca.so.*.debug
diff --git a/debian/libqca2-dbg.lintian-overrides b/debian/libqca2-dbg.lintian-overrides
deleted file mode 100644
index 7f7c64d..0000000
--- a/debian/libqca2-dbg.lintian-overrides
+++ /dev/null
@@ -1,5 +0,0 @@
-libqca2-dbg: binary-without-manpage usr/bin/qcatool2.debug
-libqca2-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libqca.so.2.0.2.debug
-libqca2-dbg: binary-with-bad-dynamic-table ./usr/lib/libqca.so.2.0.2.debug
-libqca2-dbg: statically-linked-binary ./usr/bin/qcatool2.debug
-libqca2-dbg: shared-lib-without-dependency-information ./usr/lib/libqca.so.2.0.2.debug
diff --git a/debian/rules b/debian/rules
index c04f873..b9873c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,36 +1,22 @@
 #!/usr/bin/make -f
-  
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/class/makefile.mk
 
-# QMake targets
-DEB_MAKE_INSTALL_TARGET = install INSTALL_ROOT=$(DEB_DESTDIR)
-DEB_MAKE_CLEAN_TARGET = distclean
+CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
 
-# QConf breaks with CDBS default DEB_MAKE_INVOKE
-DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) make -C $(DEB_BUILDDIR)
+include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
-# QConf configure script rule derived from qmake.mk
-# DEB_BUILD_OPTIONS is not supported!
-common-configure-arch common-configure-indep:: common-configure-impl
-common-configure-impl:: $(DEB_BUILDDIR)/Makefile
-$(DEB_BUILDDIR)/Makefile:
-	cd $(DEB_BUILDDIR) && ./configure --prefix=/usr --qtdir=/usr/share/qt4 --disable-tests
+dh += --buildsystem=qmake
 
-# Clean up QConf
-clean::
-	rm -rf confapp_unix.pri conf.log conf.pri crypto.prf lib/
+override_dh_auto_configure:
+	./configure --verbose --prefix=/usr --qtdir=/usr/share/qt4 --debug --no-separate-debug-info
+	echo QMAKE_CFLAGS_DEBUG="$(CFLAGS)" >> conf.pri
+	echo QMAKE_CXXFLAGS_DEBUG="$(CXXFLAGS)" >> conf.pri
+	echo QMAKE_LDFLAGS_DEBUG="$(LDFLAGS)" >> conf.pri
 
-# Point links in API documentation towards qt4-doc
-build/libqca2-doc::
-	if test ! -d apidocs.orig; then \
-	  cp -a apidocs apidocs.orig; \
-	fi
-	apidocs/html/installdox -q -lqt.tag@/usr/share/qt4/doc/html apidocs/html/*.html
+override_dh_strip:
+	$(overridden_command) --dbg-package=libqca2-dbg
 
-cleanbuilddir/libqca2-doc::
-	if test -d apidocs.orig; then \
-	  rm -rf apidocs; \
-	  mv apidocs.orig apidocs; \
-	fi
+override_dh_clean:
+	$(overridden_command)
+	rm -rf confapp_unix.pri conf.log conf.pri crypto.prf lib/

-- 
QCA2 library packaging