[med-svn] r18862 - trunk/packages/mafft/trunk/debian

[Timothy Booth]

Author: tbooth-guest
Date: 2015-02-26 14:51:38 +0000 (Thu, 26 Feb 2015)
New Revision: 18862

Modified:
   trunk/packages/mafft/trunk/debian/changelog
   trunk/packages/mafft/trunk/debian/links
   trunk/packages/mafft/trunk/debian/rules
Log:
The latest version of MAFFT leaves an empty file in the bin directory.
Presumably at some point this will actually contain code, so I've added
a rule to remove the file but only if it is actually empty.  In the next
version if the file is non-empty you'll get an error.
Also I think it is worth having mafft-profile in /usr/bin.  QIIME expects it
in the path.
Other than that, a basic version bump.


Modified: trunk/packages/mafft/trunk/debian/changelog
===================================================================
--- trunk/packages/mafft/trunk/debian/changelog	2015-02-25 22:07:51 UTC (rev 18861)
+++ trunk/packages/mafft/trunk/debian/changelog	2015-02-26 14:51:38 UTC (rev 18862)
@@ -1,3 +1,11 @@
+mafft (7.215-0biolinux1) trusty; urgency=medium
+
+  * New upstream.
+  * Add convoluted cleanup of zero-byte file
+  * Add mafft-profile to /usr/bin.
+
+ -- Tim Booth <tbooth at ceh.ac.uk>  Thu, 26 Feb 2015 12:00:41 +0000
+
 mafft (7.205-1) unstable; urgency=medium
 
   * New upstream version

Modified: trunk/packages/mafft/trunk/debian/links
===================================================================
--- trunk/packages/mafft/trunk/debian/links	2015-02-25 22:07:51 UTC (rev 18861)
+++ trunk/packages/mafft/trunk/debian/links	2015-02-26 14:51:38 UTC (rev 18862)
@@ -12,6 +12,7 @@
 
 usr/lib/mafft/bin/mafft-homologs.rb usr/bin/mafft-homologs
 usr/lib/mafft/bin/mafft             usr/bin/mafft
+usr/lib/mafft/bin/mafft-profile     usr/bin/mafft-profile
 
 # override broken symlinks created in Makefile
 usr/lib/mafft/lib/mafft/mafft-distance usr/lib/mafft/bin/mafft-distance

Modified: trunk/packages/mafft/trunk/debian/rules
===================================================================
--- trunk/packages/mafft/trunk/debian/rules	2015-02-25 22:07:51 UTC (rev 18861)
+++ trunk/packages/mafft/trunk/debian/rules	2015-02-26 14:51:38 UTC (rev 18862)
@@ -25,7 +25,12 @@
 
 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 $(CURDIR)/debian/mafft/usr/lib/mafft/lib/mafft/*.1
+	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