[med-svn] [poa] 01/03: Apply patch by Helmut Grohe

[Andreas Tille]

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

tille pushed a commit to tag debian/2.0+20060928-6
in repository poa.

commit edc9e87ac26dfc084a87c76add871a966ba1b208
Author: Andreas Tille <tille at debian.org>
Date:   Thu Sep 14 09:48:39 2017 +0200

    Apply patch by Helmut Grohe
---
 debian/changelog | 9 +++++++++
 debian/control   | 2 +-
 debian/rules     | 4 +++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a44e06b..b3e7554 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+poa (2.0+20060928-6) UNRELEASED; urgency=medium
+
+  [ Helmut Grohne ]
+  * Fix FTCBFS: (Closes: #864558)
+    + Let dh_auto_build pass cross compilers.
+    + Honour DEB_BUILD_OPTIONS=nocheck.
+
+ -- Andreas Tille <tille at debian.org>  Thu, 14 Sep 2017 09:47:08 +0200
+
 poa (2.0+20060928-5) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 9db4f52..4b2bdae 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Uploaders: Charles Plessy <plessy at debian.org>,
 Section: science
 Priority: optional
 Build-Depends: debhelper (>= 10)
-Standards-Version: 4.0.0
+Standards-Version: 4.1.0
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/poa.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/poa.git
 Homepage: http://poamsa.sourceforge.net/
diff --git a/debian/rules b/debian/rules
index 879cefe..32cee93 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,8 +16,9 @@ $(DEB_SOURCE).1: debian/$(DEB_SOURCE).1.xml
 	$(XP) $(DB2MAN) $<
 
 override_dh_auto_build:
-	$(MAKE) poa
+	dh_auto_build -- poa
 
+ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
 override_dh_auto_test:
 	tmpfile=`mktemp` ; \
 	./$(DEB_SOURCE) -read_fasta multidom.seq -clustal $$tmpfile -v blosum80.mat ; \
@@ -29,3 +30,4 @@ override_dh_auto_test:
 	    echo "File $$tmpfile is different from $(CURDIR)/multidom.clustal" ; \
 	    exit 1 ; \
 	fi
+endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/poa.git