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

[Andreas Tille]

Author: tille
Date: 2009-09-28 11:43:36 +0000 (Mon, 28 Sep 2009)
New Revision: 4058

Added:
   trunk/packages/mafft/trunk/debian/patches/
   trunk/packages/mafft/trunk/debian/patches/20_manpages_are_no_binaries.patch
   trunk/packages/mafft/trunk/debian/patches/series
Modified:
   trunk/packages/mafft/trunk/debian/control
   trunk/packages/mafft/trunk/debian/rules
Log:
Bring back quilt: The upstream Makefile handles manpages as binaries ... ugh


Modified: trunk/packages/mafft/trunk/debian/control
===================================================================
--- trunk/packages/mafft/trunk/debian/control	2009-09-28 11:26:12 UTC (rev 4057)
+++ trunk/packages/mafft/trunk/debian/control	2009-09-28 11:43:36 UTC (rev 4058)
@@ -5,7 +5,7 @@
 DM-Upload-Allowed: yes
 Uploaders: Charles Plessy <plessy at debian.org>,
  Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 7.1)
+Build-Depends: debhelper (>= 7.1), quilt
 Standards-Version: 3.8.3
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/mafft/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/mafft/trunk/

Added: trunk/packages/mafft/trunk/debian/patches/20_manpages_are_no_binaries.patch
===================================================================
--- trunk/packages/mafft/trunk/debian/patches/20_manpages_are_no_binaries.patch	                        (rev 0)
+++ trunk/packages/mafft/trunk/debian/patches/20_manpages_are_no_binaries.patch	2009-09-28 11:43:36 UTC (rev 4058)
@@ -0,0 +1,22 @@
+Author: Andreas Tille <tille at debian.org>
+Description: Prevent upstream Makefile from handling manpages as binaries
+--- mafft-6.713-without-extensions.orig/core/Makefile
++++ mafft-6.713-without-extensions/core/Makefile
+@@ -107,7 +107,7 @@
+ all : $(PROGS) $(SCRIPTS)
+ 	cp $(SCRIPTS) ../scripts
+ 	chmod 755 ../scripts/*
+-	cp $(PROGS) $(MANPAGES) ../binaries
++	cp $(PROGS) ../binaries
+ 	chmod 755 ../binaries/*
+ 	@echo done.
+ 
+@@ -484,7 +484,7 @@
+ 	chmod 755 $(SCRIPTS)
+ 	$(INSTALL) $(SCRIPTS)  $(BINDIR)
+ 	chmod 755 $(PROGS)
+-	$(INSTALL) $(PROGS) $(MANPAGES) $(LIBDIR)
++	$(INSTALL) $(PROGS) $(LIBDIR)
+ 	( cd $(BINDIR); \
+ rm -f linsi ginsi einsi fftns fftnsi nwns nwnsi xinsi qinsi; \
+ rm -f mafft-linsi mafft-ginsi mafft-einsi mafft-fftns mafft-fftnsi mafft-nwns mafft-nwnsi mafft-xinsi mafft-qinsi; \

Added: trunk/packages/mafft/trunk/debian/patches/series
===================================================================
--- trunk/packages/mafft/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/mafft/trunk/debian/patches/series	2009-09-28 11:43:36 UTC (rev 4058)
@@ -0,0 +1 @@
+20_manpages_are_no_binaries.patch

Modified: trunk/packages/mafft/trunk/debian/rules
===================================================================
--- trunk/packages/mafft/trunk/debian/rules	2009-09-28 11:26:12 UTC (rev 4057)
+++ trunk/packages/mafft/trunk/debian/rules	2009-09-28 11:43:36 UTC (rev 4058)
@@ -5,7 +5,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# include /usr/share/quilt/quilt.make
+include /usr/share/quilt/quilt.make
 
 XP=xsltproc  \
       -''-nonet \
@@ -29,7 +29,7 @@
 mafft-homologs.1: debian/mafft-homologs.1.xml
 	$(XP) $<
 
-build: build-stamp
+build: patch build-stamp
 build-stamp:
 	dh_testdir
 	$(MAKE) -C core PREFIX=/usr/lib/mafft
@@ -45,17 +45,17 @@
 	-$(MAFFT) --localpair			test/sample | diff test/sample.lins1 -
 	-$(MAFFT) --localpair --maxiterate 100	test/sample | diff test/sample.linsi -
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	[ ! -f core/Makefile ] || $(MAKE) -C core clean
-	# rm -rf binaries/*
+	rm -rf binaries/* scripts/*
 	dh_clean build-stamp
 
 install: build-stamp test
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_clean
 	dh_installdirs
 	$(MAKE) -C core PREFIX=$(CURDIR)/debian/mafft/usr/lib/mafft install