[Pkg-emboss-commits] r83 - emboss/trunk/debian

[charles-guest at alioth.debian.org]

Author: charles-guest
Date: 2007-07-19 06:08:13 +0000 (Thu, 19 Jul 2007)
New Revision: 83

Modified:
   emboss/trunk/debian/README.debian
   emboss/trunk/debian/rules
Log:
fixing a typo for the  renamed binaries and adopting a new strategy to give them links to manpages

Modified: emboss/trunk/debian/README.debian
===================================================================
--- emboss/trunk/debian/README.debian	2007-07-19 04:57:19 UTC (rev 82)
+++ emboss/trunk/debian/README.debian	2007-07-19 06:08:13 UTC (rev 83)
@@ -7,7 +7,7 @@
 Some programs in EMBOSS have a name which is also used by other programs from
 other packages. The Debian distribution does not allow two packages to conflict
 in this way. Therfore 'cons' has been renamed 'em_cons' and 'pscan has been
-renamed 'em_scan'.
+renamed 'em_pscan'.
 
 There is a directory in which the program names are guaranteed to be always
 unchanged, /usr/lib/emboss. You can prepend it to your PATH, with a command

Modified: emboss/trunk/debian/rules
===================================================================
--- emboss/trunk/debian/rules	2007-07-19 04:57:19 UTC (rev 82)
+++ emboss/trunk/debian/rules	2007-07-19 06:08:13 UTC (rev 83)
@@ -3,7 +3,7 @@
 #export DH_VERBOSE=1
 
 VERSION := $(shell dpkg-parsechangelog | grep Ver | cut -d' ' -f2 | cut -d- -f1)
-RENAMED := cons scan
+RENAMED := cons pscan
 
 config.status:
 	dh_testdir
@@ -72,9 +72,10 @@
 		for i in * ; \
 		do ln -sf ../lib/emboss/$$i ../../bin/$$i ; \
 		done
+
+	# Renaming conflicting binaries (see also in binary-arch)
 	for i in $(RENAMED) ; \
 		do mv $(CURDIR)/debian/emboss_tmp/usr/bin/$$i $(CURDIR)/debian/emboss_tmp/usr/bin/em_$$i ; \
-		ln -sf $(CURDIR)/debian/emboss/usr/share/man/man1/$$i.1.gz em_$$i.1.gz ; \
 		done
 
 	$(MAKE) -C ajax install DESTDIR=$(CURDIR)/debian/emboss-lib
@@ -102,6 +103,9 @@
 #	dh_installmenu
 	dh_install
 	dh_installman -p emboss
+	for i in $(RENAMED) ; \
+		dh_link usr/share/man/man1/$$i.1.gz usr/share/man/man1/em_$$i.1.gz ; \
+		done
 	dh_installchangelogs 
 	dh_strip
 	dh_compress