[SCM] QJson library packaging branch, master, updated. debian/0.8.1-3-10-g9821a72

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/qjson.git;a=commitdiff;h=9821a72

The following commit has been merged in the master branch:
commit 9821a721107b4c367664315c648374ec46d6b44b
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Nov 10 16:33:33 2015 -0300

    Tweak debian/rules in order to allow both qt4 and qt5 builds.
---
 debian/changelog |  1 +
 debian/rules     | 32 +++++++++++++++++++++++++-------
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6458621..9115e4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ qjson (0.8.1+git103-gee054a7-1) UNRELEASED; urgency=medium
     own implementation, but this might help in getting things ported
     faster.
     - Create compile_qt5_with_fpic.patch in order to use -fPIC with Qt5.
+    - Tweak debian/rules in order to allow both qt4 and qt5 builds.
   * Remove unnecesary .dirs files.
 
  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Sun, 09 Mar 2014 00:18:52 -0300
diff --git a/debian/rules b/debian/rules
index 0c753b5..7f158c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,17 +4,35 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export DEB_CXXFLAGS_MAINT_APPEND = -fvisibility=hidden \
-        -fvisibility-inlines-hidden
-export QT_SELECT := qt4
+export DEB_CXXFLAGS_MAINT_APPEND = -fvisibility=hidden -fvisibility-inlines-hidden
 
 %:
-	dh $@ --dbg-package=libqjson-dbg \
-	--with=pkgkde-symbolshelper \
-	--parallel
+	dh $@ --with=pkgkde-symbolshelper --parallel
+
+override_dh_auto_clean:
+	dh_auto_clean
+	dh_auto_clean --builddirectory=build-qt5
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DQJSON_BUILD_TESTS=ON
+	dh_auto_configure -- -DQJSON_BUILD_TESTS=ON -DQT4_BUILD=ON
+	dh_auto_configure --builddirectory=build-qt5 -- -DQJSON_BUILD_TESTS=ON
+
+override_dh_auto_build:
+	dh_auto_build
+	dh_auto_build --builddirectory=build-qt5
+
+override_dh_auto_install:
+	dh_auto_install
+	dh_auto_install --builddirectory=build-qt5
 
 override_dh_install:
 	dh_install --fail-missing
+	dh_install --builddirectory=build-qt5
+
+override_dh_strip:
+	dh_strip -p libqjson0 --dbg-package=libqjson-dbg
+	dh_strip --remaining-packages --dbg-package=libqjson-qt5-dbg
+
+override_dh_auto_test:
+	xvfb-run -a dh_auto_test
+	xvfb-run -a dh_auto_test --builddirectory=build-qt5

-- 
QJson library packaging