Source: keepassx
Version: 2.0.3-1
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

keepassx fails to cross build from source, because its test suite fails
executing host architecture binaries. The test suite is run despite
setting DEB_BUILD_OPTIONS=nocheck. After honouring the nocheck value,
keepassx cross builds successfully. Please consider applying the
attached patch.

Helmut
diff --minimal -Nru keepassx-2.0.3/debian/changelog 
keepassx-2.0.3/debian/changelog
--- keepassx-2.0.3/debian/changelog     2017-01-10 22:33:14.000000000 +0100
+++ keepassx-2.0.3/debian/changelog     2017-01-23 23:02:26.000000000 +0100
@@ -1,3 +1,10 @@
+keepassx (2.0.3-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Support DEB_BUILD_OPTIONS=nocheck. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Mon, 23 Jan 2017 23:02:26 +0100
+
 keepassx (2.0.3-1) unstable; urgency=medium
 
   * New upstream release. (Closes: #845163)
diff --minimal -Nru keepassx-2.0.3/debian/rules keepassx-2.0.3/debian/rules
--- keepassx-2.0.3/debian/rules 2016-02-04 21:27:52.000000000 +0100
+++ keepassx-2.0.3/debian/rules 2017-01-23 23:02:22.000000000 +0100
@@ -9,9 +9,11 @@
 override_dh_auto_configure:
        dh_auto_configure -- -DWITH_GUI_TESTS=ON -DWITH_CXX11=ON
 
+ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
 override_dh_auto_test:
        dh_auto_test -- ARGS+="-E testgui"
        xvfb-run -a --server-args="-screen 0 800x600x24" dh_auto_test -- 
ARGS+="-R testgui"
+endif
 
 override_dh_makeshlibs:
        # keepassx only ships plugins

Reply via email to