[SCM] QCA2 OpenSSL plugin packaging branch, master, updated. debian/0.1-20070904-3-18-g53fea5d

[Felix Geyer]

The following commit has been merged in the master branch:
commit 0863e853596b7fa7ad83916c780fdd25529f805d
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Mon May 30 00:54:43 2011 +0200

    Switch debian/rules engine to dhmk.
---
 debian/changelog             |    1 +
 debian/control               |    2 +-
 debian/rules                 |   30 ++++++++++--------------------
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 28c31e0..8857f17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ qca2-plugin-ossl (2.0.0~beta3-1) UNRELEASED; urgency=low
   * Switch to source format 3.0 (quilt).
     - Turn changes from the last revision into a proper patch:
       remove_whirlpool_algo.diff
+  * Switch debian/rules engine to dhmk.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 29 May 2011 23:15:26 +0200
 
diff --git a/debian/control b/debian/control
index f05f606..90e5bf5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Jan Niehusmann <jan at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libqca2-dev (>=2.0.0), libssl-dev
+Build-Depends: debhelper (>= 5), pkg-kde-tools (>= 0.12), libqca2-dev (>=2.0.0), libssl-dev
 Standards-Version: 3.7.2
 Homepage: http://delta.affinix.com/qca/
 
diff --git a/debian/rules b/debian/rules
index e4479e4..0c5fec1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,25 +1,15 @@
 #!/usr/bin/make -f
-  
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/qmake.mk
 
-DEB_MAKE_CLEAN_TARGET    = clean
-DEB_MAKE_BUILD_TARGET    = all
-DEB_MAKE_INSTALL_TARGET  = install INSTALL_ROOT=$(CURDIR)/debian/tmp/
-DEB_DH_INSTALL_SOURCEDIR = debian/tmp
-# no check for this software
-# DEB_MAKE_CHECK_TARGET   =
+CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
 
-common-configure-arch common-configure-indep:: common-configure-impl
+include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
-common-configure-impl:: $(DEB_BUILDDIR)/Makefile
-
-$(DEB_BUILDDIR)/Makefile:
-	cd $(DEB_BUILDDIR) && ./configure
-
-clean::
-	rm -f $(DEB_BUILDDIR)/Makefile $(DEB_BUILDDIR)/.qmake.internal.cache
-	rm -f $(DEB_BUILDDIR)/lib/libqca-ossl.so*
-	rm -f $(DEB_BUILDDIR)/conf.log
-	rm -f $(DEB_BUILDDIR)/conf.pri
+dh += --buildsystem=qmake
 
+override_dh_auto_configure:
+	./configure --verbose ---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
diff --git a/debian/stamp-autotools-files b/debian/stamp-autotools-files
deleted file mode 100644
index e69de29..0000000

-- 
QCA2 OpenSSL plugin packaging