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

[Andreas Tille]

Author: tille
Date: 2009-09-28 11:07:18 +0000 (Mon, 28 Sep 2009)
New Revision: 4053

Modified:
   trunk/packages/mafft/trunk/debian/changelog
   trunk/packages/mafft/trunk/debian/dirs
   trunk/packages/mafft/trunk/debian/rules
   trunk/packages/mafft/trunk/debian/watch
Log:
Use versionmangle to differentiate upstreams with*-extensions; let package compile cleanly - further verification whether everything is in place is needed, lintian warnings have to be handled


Modified: trunk/packages/mafft/trunk/debian/changelog
===================================================================
--- trunk/packages/mafft/trunk/debian/changelog	2009-09-28 09:16:13 UTC (rev 4052)
+++ trunk/packages/mafft/trunk/debian/changelog	2009-09-28 11:07:18 UTC (rev 4053)
@@ -12,6 +12,8 @@
   * debhelper 7
   * No need for debian/patches/Securisation-by-mktemp-usage.patch any more
   * Removed quilt dependency
+  * debian/watch: Handle -with.*-extensions naming - we are dealing
+    with the without-extensions tarball in Debian
 
  -- Andreas Tille <tille at debian.org>  Mon, 28 Sep 2009 09:02:30 +0200
 

Modified: trunk/packages/mafft/trunk/debian/dirs
===================================================================
--- trunk/packages/mafft/trunk/debian/dirs	2009-09-28 09:16:13 UTC (rev 4052)
+++ trunk/packages/mafft/trunk/debian/dirs	2009-09-28 11:07:18 UTC (rev 4053)
@@ -1,2 +1,3 @@
+usr/bin
 usr/lib/mafft
 usr/share/doc/mafft/test/

Modified: trunk/packages/mafft/trunk/debian/rules
===================================================================
--- trunk/packages/mafft/trunk/debian/rules	2009-09-28 09:16:13 UTC (rev 4052)
+++ trunk/packages/mafft/trunk/debian/rules	2009-09-28 11:07:18 UTC (rev 4053)
@@ -32,7 +32,7 @@
 build: build-stamp
 build-stamp:
 	dh_testdir
-	$(MAKE) -C src PREFIX=/usr/lib/mafft
+	$(MAKE) -C core PREFIX=/usr/lib/mafft
 	touch $@
 
 MAFFT = MAFFT_BINARIES=$(CURDIR)/binaries scripts/mafft
@@ -48,7 +48,7 @@
 clean:
 	dh_testdir
 	dh_testroot
-	[ ! -f Makefile ] || $(MAKE) -C src clean
+	[ ! -f Makefile ] || $(MAKE) -C core clean
 	dh_clean build-stamp
 
 install: build-stamp test
@@ -56,8 +56,8 @@
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
-	$(MAKE) -C src PREFIX=$(CURDIR)/debian/mafft/usr/lib/mafft install
-	mv debian/mafft/usr/bin/mafft-homologs.rb debian/mafft/usr/bin/mafft-homologs
+	$(MAKE) -C core PREFIX=$(CURDIR)/debian/mafft/usr/lib/mafft install
+	mv core/mafft-homologs.rb debian/mafft/usr/bin/mafft-homologs
 
 binary-indep: build install
 binary-arch: build install

Modified: trunk/packages/mafft/trunk/debian/watch
===================================================================
--- trunk/packages/mafft/trunk/debian/watch	2009-09-28 09:16:13 UTC (rev 4052)
+++ trunk/packages/mafft/trunk/debian/watch	2009-09-28 11:07:18 UTC (rev 4053)
@@ -1,2 +1,3 @@
 version=3
-http://align.bmr.kyushu-u.ac.jp/mafft/software/source.html mafft-(.*)-src\.tgz
+opts=uversionmangle=s/-with-extensions-src//,dversionmangle=s/([\d.]+)/$1-without-extensions/ \
+ http://align.bmr.kyushu-u.ac.jp/mafft/software/source.html mafft-(.*)-src\.tgz