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

[Andreas Tille]

Author: tille
Date: 2009-09-28 19:36:29 +0000 (Mon, 28 Sep 2009)
New Revision: 4061

Modified:
   trunk/packages/mafft/trunk/debian/changelog
   trunk/packages/mafft/trunk/debian/control
   trunk/packages/mafft/trunk/debian/links
   trunk/packages/mafft/trunk/debian/rules
Log:
Strip unneded code from rules file; prevent copies of man pages at wrong place; Recommends: ruby - a ruby script is places in /usr/bin so in principle we should even depend from ruby, alternatively we might "hide" the script if it is of minor use in /usr/lib/mafft.


Modified: trunk/packages/mafft/trunk/debian/changelog
===================================================================
--- trunk/packages/mafft/trunk/debian/changelog	2009-09-28 13:10:21 UTC (rev 4060)
+++ trunk/packages/mafft/trunk/debian/changelog	2009-09-28 19:36:29 UTC (rev 4061)
@@ -9,9 +9,11 @@
   * debian/control:
     - Standards-Version: 3.8.3 (no changes needed)
     - s/Debian-Med/Debian Med/
+    - Recommends: ruby (instead of Suggests - we have a Ruby script in
+      /usr/bin -  so we might even choose Depends, or move the script out
+      of /usr/bin to not to force people installing Ruby
   * 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
 

Modified: trunk/packages/mafft/trunk/debian/control
===================================================================
--- trunk/packages/mafft/trunk/debian/control	2009-09-28 13:10:21 UTC (rev 4060)
+++ trunk/packages/mafft/trunk/debian/control	2009-09-28 19:36:29 UTC (rev 4061)
@@ -14,7 +14,8 @@
 Package: mafft
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: ruby, lynx, blast2
+Recommends: ruby
+Suggests: lynx, blast2
 Enhances: t-coffee
 Description: Multiple alignment program for amino acid or nucleotide sequences
  MAFFT is a multiple sequence alignment program which offers three

Modified: trunk/packages/mafft/trunk/debian/links
===================================================================
--- trunk/packages/mafft/trunk/debian/links	2009-09-28 13:10:21 UTC (rev 4060)
+++ trunk/packages/mafft/trunk/debian/links	2009-09-28 19:36:29 UTC (rev 4061)
@@ -11,3 +11,4 @@
 usr/share/man/man1/mafft.1	    usr/share/man/man1/mafft-profile.1
 
 usr/lib/mafft/bin/mafft-homologs.rb usr/bin/mafft-homologs
+usr/lib/mafft/bin/mafft             usr/bin/mafft

Modified: trunk/packages/mafft/trunk/debian/rules
===================================================================
--- trunk/packages/mafft/trunk/debian/rules	2009-09-28 13:10:21 UTC (rev 4060)
+++ trunk/packages/mafft/trunk/debian/rules	2009-09-28 19:36:29 UTC (rev 4061)
@@ -7,14 +7,6 @@
 
 include /usr/share/quilt/quilt.make
 
-XP=xsltproc  \
-      -''-nonet \
-      -''-param man.charmap.use.subset "0" \
-      -''-param make.year.ranges "1" \
-      -''-param make.single.year.ranges "1" \
-      -o debian/
-
-
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -23,12 +15,6 @@
 	CFLAGS += -O2
 endif
 
-mafft.1: debian/mafft.1.xml
-	$(XP) $<
-
-mafft-homologs.1: debian/mafft-homologs.1.xml
-	$(XP) $<
-
 build: patch build-stamp
 build-stamp:
 	dh_testdir
@@ -57,7 +43,7 @@
 	dh_testroot
 	dh_clean
 	dh_installdirs
-	$(MAKE) -C core PREFIX=$(CURDIR)/debian/mafft/usr/lib/mafft install
+	$(MAKE) -C core PREFIX=$(CURDIR)/debian/mafft/usr/lib/mafft MANDIR=$(CURDIR)/debian/mafft/usr/share/man/man1 install
 
 binary-indep: build install
 binary-arch: build install