[med-svn] [Git][med-team/mafft][master] 3 commits: Let dh_auto_build pass cross tools to make

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / mafft


Commits:
2f378f26 by Andreas Tille at 2018-12-02T10:39:16Z
Let dh_auto_build pass cross tools to make

- - - - -
f351c918 by Andreas Tille at 2018-12-02T10:39:45Z
Remove trailing whitespace in debian/changelog

- - - - -
32eca76e by Andreas Tille at 2018-12-02T10:42:25Z
Upload to unstable

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+mafft (7.407-2) unstable; urgency=medium
+
+  [ Helmut Grohne ]
+  * Fix FTCBFS: Let dh_auto_build pass cross tools to make. (Closes: #914715)
+  * Also simplify debian/rules using --sourcedirectory.
+
+  [ Andreas Tille ]
+  * Remove trailing whitespace in debian/changelog
+
+ -- Andreas Tille <tille at debian.org>  Sun, 02 Dec 2018 11:39:45 +0100
+
 mafft (7.407-1) unstable; urgency=medium
 
   * Team upload.
@@ -135,7 +146,7 @@ mafft (7.158-1) unstable; urgency=medium
 
 mafft (7.157-1) unstable; urgency=medium
 
-  * New upstream release. 
+  * New upstream release.
   * debian/control
     - Added substitution variable ${perl:Depends}, used by Debhelper.
     - Recommend libwww-perl used by the script ‘seekquencer_premafft.pl’.
@@ -144,7 +155,7 @@ mafft (7.157-1) unstable; urgency=medium
 
 mafft (7.149-1) unstable; urgency=medium
 
-  * New upstream release. 
+  * New upstream release.
 
  -- Charles Plessy <plessy at debian.org>  Sat, 12 Apr 2014 13:46:13 +0900
 


=====================================
debian/rules
=====================================
@@ -8,10 +8,10 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@
+	dh $@ --sourcedirectory=core
 
 override_dh_auto_build:
-	$(MAKE) -C core \
+	dh_auto_build -- \
 	  PREFIX=/usr/lib/mafft \
 	  ENABLE_MULTITHREAD=-Denablemultithread \
 	  LIBDIR=/usr/lib/mafft/lib/mafft \
@@ -19,14 +19,13 @@ override_dh_auto_build:
 	  LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS)"
 
 override_dh_clean:
-	[ ! -f core/Makefile ] || $(MAKE) -C core clean
 	rm -rf binaries/* scripts/*
 	dh_clean
 
 MAFFT = MAFFT_BINARIES=$(CURDIR)/binaries scripts/mafft
 
-override_dh_install:
-	$(MAKE) -C core PREFIX=$(CURDIR)/debian/mafft/usr/lib/mafft MANDIR=$(CURDIR)/debian/mafft/usr/share/man/man1 LIBDIR=$(CURDIR)/debian/mafft/usr/lib/mafft/lib/mafft install
+override_dh_auto_install:
+	dh_auto_install -- PREFIX=/usr/lib/mafft MANDIR=/usr/share/man/man1 LIBDIR=/usr/lib/mafft/lib/mafft
 	rm debian/mafft/usr/lib/mafft/lib/mafft/*.1
 
 override_dh_compress:



View it on GitLab: https://salsa.debian.org/med-team/mafft/compare/31d2e64a240a431bb4cf6865cce9c2be3aba62ae...32eca76e73edc5434f277552eef1a02ec9a674d4

-- 
View it on GitLab: https://salsa.debian.org/med-team/mafft/compare/31d2e64a240a431bb4cf6865cce9c2be3aba62ae...32eca76e73edc5434f277552eef1a02ec9a674d4
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20181202/565df405/attachment-0001.html>