[asl] 03/10: Improve generation of -doc package: - Move doxygen to Build-Depends-Indep. - Use arch-indep targets to configure and install. - Install examples.

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/master
in repository asl.

commit 5ef28abbe5dc923c1946b838e94fbc3d36eed348
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Thu May 5 20:04:27 2016 +0100

    Improve generation of -doc package:
    - Move doxygen to Build-Depends-Indep.
    - Use arch-indep targets to configure and install.
    - Install examples.
---
 debian/control             |  2 +-
 debian/libasl-doc.examples |  1 +
 debian/rules               | 27 +++++++++++++++++++--------
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index ae1bc11..dedc0da 100644
--- a/debian/control
+++ b/debian/control
@@ -5,13 +5,13 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
 Uploaders: Ghislain Antony Vaillant <ghisvail at gmail.com>
 Build-Depends: cmake,
                debhelper (>=9),
-               doxygen,
                libboost-filesystem-dev (>= 1.55),
                libboost-program-options-dev (>= 1.55),
                libboost-system-dev (>= 1.55),
                libmatio-dev,
                libvtk6-dev (>= 6.1),
                ocl-icd-opencl-dev | opencl-dev
+Build-Depends-Indep: doxygen
 Standards-Version: 3.9.6
 Homepage: http://asl.org.il
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/asl.git
diff --git a/debian/libasl-doc.examples b/debian/libasl-doc.examples
new file mode 100644
index 0000000..e39721e
--- /dev/null
+++ b/debian/libasl-doc.examples
@@ -0,0 +1 @@
+examples/*
diff --git a/debian/rules b/debian/rules
index b7e3f5c..f357ea3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,17 +7,28 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
+BUILD_OPTIONS = \
+	-DBUILD_SHARED_LIBS=ON \
+	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+	-DCMAKE_LIBRARY_ARCHITECTURE="$(DEB_TARGET_MULTIARCH)" \
+	-DWITH_EXAMPLES=OFF \
+	-DWITH_MATIO=ON
+
 %:
 	dh $@ --parallel 
 
-override_dh_auto_configure:
-	dh_auto_configure -- \
-		-DBUILD_SHARED_LIBS=ON \
-		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-		-DCMAKE_LIBRARY_ARCHITECTURE="$(DEB_TARGET_MULTIARCH)" \
-		-DWITH_API_DOC=ON \
-		-DWITH_EXAMPLES=OFF \
-		-DWITH_MATIO=ON
+override_dh_auto_configure-arch:
+	dh_auto_configure -- $(BUILD_OPTIONS) -DWITH_API_DOC=OFF
+
+override_dh_auto_configure-indep:
+	dh_auto_configure -- $(BUILD_OPTIONS) -DWITH_API_DOC=ON
+
+override_dh_installdocs-indep:
+	dh_installdocs --indep
+	dh_doxygen --indep
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS.md
+
+override_dh_compress:
+	dh_compress --exclude=examples

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/asl.git