[med-svn] r21971 - in trunk/packages/mafft/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2016-05-18 16:16:15 +0000 (Wed, 18 May 2016)
New Revision: 21971

Modified:
   trunk/packages/mafft/trunk/debian/changelog
   trunk/packages/mafft/trunk/debian/control
   trunk/packages/mafft/trunk/debian/patches/fix_bashism.patch
   trunk/packages/mafft/trunk/debian/rules
Log:
  * New upstream version
  * cme fix dpkg-control
  * /usr/bin/mafft-sparsecore.rb is non-zero - remove the test in debian/rules
  * Better hardening



Modified: trunk/packages/mafft/trunk/debian/changelog
===================================================================
--- trunk/packages/mafft/trunk/debian/changelog	2016-05-18 11:21:06 UTC (rev 21970)
+++ trunk/packages/mafft/trunk/debian/changelog	2016-05-18 16:16:15 UTC (rev 21971)
@@ -1,3 +1,12 @@
+mafft (7.294-1) unstable; urgency=medium
+
+  * New upstream version
+  * cme fix dpkg-control
+  * /usr/bin/mafft-sparsecore.rb is non-zero - remove the test in debian/rules
+  * Better hardening
+
+ -- Andreas Tille <tille at debian.org>  Wed, 18 May 2016 17:59:56 +0200
+
 mafft (7.271-1) unstable; urgency=medium
 
   * New upstream version

Modified: trunk/packages/mafft/trunk/debian/control
===================================================================
--- trunk/packages/mafft/trunk/debian/control	2016-05-18 11:21:06 UTC (rev 21970)
+++ trunk/packages/mafft/trunk/debian/control	2016-05-18 16:16:15 UTC (rev 21971)
@@ -3,10 +3,9 @@
 Uploaders: Charles Plessy <plessy at debian.org>,
            Andreas Tille <tille at debian.org>
 Section: science
-Testsuite: autopkgtest
 Priority: optional
 Build-Depends: debhelper (>= 9)
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/viewvc/debian-med/trunk/packages/mafft/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/mafft/trunk/
 Homepage: http://mafft.cbrc.jp/alignment/software/

Modified: trunk/packages/mafft/trunk/debian/patches/fix_bashism.patch
===================================================================
--- trunk/packages/mafft/trunk/debian/patches/fix_bashism.patch	2016-05-18 11:21:06 UTC (rev 21970)
+++ trunk/packages/mafft/trunk/debian/patches/fix_bashism.patch	2016-05-18 16:16:15 UTC (rev 21971)
@@ -5,7 +5,7 @@
 
 --- a/core/mafft.tmpl
 +++ b/core/mafft.tmpl
-@@ -1874,7 +1874,7 @@ if [ $# -gt 0 ]; then
+@@ -1979,7 +1979,7 @@ if [ $# -gt 0 ]; then
  
  		if [ $enrich -eq 1 ]; then
  			if [ $ownlist != "/dev/null" ]; then

Modified: trunk/packages/mafft/trunk/debian/rules
===================================================================
--- trunk/packages/mafft/trunk/debian/rules	2016-05-18 11:21:06 UTC (rev 21970)
+++ trunk/packages/mafft/trunk/debian/rules	2016-05-18 16:16:15 UTC (rev 21971)
@@ -5,6 +5,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
 %:
 	dh $@
 
@@ -26,11 +28,6 @@
 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
 	rm debian/mafft/usr/lib/mafft/lib/mafft/*.1
-	# Remove zero-sized file but if it's not zero-sized that's an error.
-	# If the file doesn't exist that's OK.
-	! cd debian/mafft/usr/lib/mafft/bin/ || \
-	    ! test -s mafft-sparsecore.rb && \
-	    rm -f mafft-sparsecore.rb
 
 override_dh_compress:
 	dh_compress -X test/sample