[opengm] 385/386: Assorted enhancements to rules file:

[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 opengm.

commit 8d3ce3988e89ba0b6aa65afb8e38772c1699d1a0
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Tue Aug 30 16:00:49 2016 +0100

    Assorted enhancements to rules file:
    
    - Add missing DEB_CXXFLAGS_MAINT_APPEND option.
    - Simplify and correct dh_auto_test override.
    - Remove superfluous comments.
    - Wrap, sort and format.
    
    Gbp-Dch: Full
---
 debian/rules | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/debian/rules b/debian/rules
index cace79a..bfbcee1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,24 +6,24 @@
 # Hardening options.
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
+export DEB_CXXFLAGS_MAINT_APPEND = -Wall -pedantic
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 # Set the build directory explicitly.
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_GNU_TYPE := $(shell dpkg-architecture --query DEB_HOST_GNU_TYPE)
 BUILDDIR = $(CURDIR)/obj-$(DEB_HOST_GNU_TYPE)
 
-# Build options common to -arch and -indep configurations.
 BUILD_OPTIONS = \
+	-DBUILD_COMMANDLINE=ON \
+	-DBUILD_CONVERTER=ON \
 	-DBUILD_EXAMPLES=OFF \
+	-DBUILD_PYTHON_WRAPPER=ON \
 	-DBUILD_TUTORIALS=OFF \
-	-DBUILD_COMMANDLINE=ON \
+	-DCMAKE_SKIP_RPATH=ON \
 	-DWITH_BOOST=ON \
 	-DWITH_HDF5=ON \
 	-DWITH_OPENMP=ON \
-	-DWITH_VIGRA=OFF \
-	-DBUILD_CONVERTER=ON \
-	-DBUILD_PYTHON_WRAPPER=ON \
-	-DCMAKE_SKIP_RPATH=ON
+	-DWITH_VIGRA=OFF
 
 # Build tests subject to nocheck.
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
@@ -36,22 +36,18 @@ endif
 	dh $@ --parallel --builddirectory=$(BUILDDIR) --with python2
 
 override_dh_auto_configure-arch:
-	dh_auto_configure -- \
-		$(BUILD_OPTIONS) \
+	dh_auto_configure -- $(BUILD_OPTIONS) \
 		-DBUILD_DOCS=OFF \
 		-DBUILD_PYTHON_DOCS=OFF
 
 override_dh_auto_configure-indep:
-	dh_auto_configure -- \
-		$(BUILD_OPTIONS) \
+	dh_auto_configure -- $(BUILD_OPTIONS) \
 		-DBUILD_DOCS=ON \
 		-DBUILD_PYTHON_DOCS=ON
 
 override_dh_auto_test:
+	dh_auto_test
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	# Run the library testsuite.
-	CTEST_OUTPUT_ON_FAILURE=1 dh_auto_test
-	# Run the Python testsuite.
 	make --directory=$(BUILDDIR) test-python-wrapper
 endif
 

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