[med-svn] r6524 - in trunk/packages/cdbfasta/trunk/debian: . patches

[Timothy Booth]

Author: tbooth-guest
Date: 2011-04-11 13:33:27 +0000 (Mon, 11 Apr 2011)
New Revision: 6524

Removed:
   trunk/packages/cdbfasta/trunk/debian/cdbfasta.manpages
Modified:
   trunk/packages/cdbfasta/trunk/debian/changelog
   trunk/packages/cdbfasta/trunk/debian/patches/add-install-target-to-makefile
   trunk/packages/cdbfasta/trunk/debian/rules
Log:
Fixed manpage generation with help from Charles.
Still need to look into the Zlib Lintian report.



Deleted: trunk/packages/cdbfasta/trunk/debian/cdbfasta.manpages
===================================================================
--- trunk/packages/cdbfasta/trunk/debian/cdbfasta.manpages	2011-04-11 11:59:20 UTC (rev 6523)
+++ trunk/packages/cdbfasta/trunk/debian/cdbfasta.manpages	2011-04-11 13:33:27 UTC (rev 6524)
@@ -1,2 +0,0 @@
-cdbfasta.1
-cdbyank.1

Modified: trunk/packages/cdbfasta/trunk/debian/changelog
===================================================================
--- trunk/packages/cdbfasta/trunk/debian/changelog	2011-04-11 11:59:20 UTC (rev 6523)
+++ trunk/packages/cdbfasta/trunk/debian/changelog	2011-04-11 13:33:27 UTC (rev 6524)
@@ -1,3 +1,9 @@
+cdbfasta (0.981-20100722-1ubuntu3) lucid; urgency=low
+
+  * Moved manpage generation to debian/rules as per advice from Charles Plessy 
+
+ -- Tim Booth <tbooth at ceh.ac.uk>  Mon, 11 Apr 2011 10:13:37 +0100
+
 cdbfasta (0.981-20100722-1ubuntu2) lucid; urgency=low
 
   * Continued work on package - added basic manapages 

Modified: trunk/packages/cdbfasta/trunk/debian/patches/add-install-target-to-makefile
===================================================================
--- trunk/packages/cdbfasta/trunk/debian/patches/add-install-target-to-makefile	2011-04-11 11:59:20 UTC (rev 6523)
+++ trunk/packages/cdbfasta/trunk/debian/patches/add-install-target-to-makefile	2011-04-11 13:33:27 UTC (rev 6524)
@@ -5,11 +5,11 @@
  
  .PHONY : all
 -all:    cdbfasta cdbyank 
-+all:    cdbfasta cdbyank manpages
++all:    cdbfasta cdbyank
  debug:  all
  nommap: all
  cdbfasta:  ./cdbfasta.o ./gcdbz.o $(LIBS) ${GCLDIR}/gcdb.o ${GCLDIR}/GBase.o ${GCLDIR}/GStr.o ${GCLDIR}/GArgs.o
-@@ -74,12 +74,17 @@
+@@ -74,12 +74,14 @@
  
  .PHONY : tidy
  tidy::
@@ -26,6 +26,3 @@
 +install : all
 +	install -m 755 cdbfasta cdbyank $(DESTDIR)/usr/bin
  
-+manpages : cdbfasta.1 cdbyank.1
-+%.1 : %
-+	help2man --no-discard-stderr --version-option=-v $< | sed 's/^Invalid argument:.*//' > $@

Modified: trunk/packages/cdbfasta/trunk/debian/rules
===================================================================
--- trunk/packages/cdbfasta/trunk/debian/rules	2011-04-11 11:59:20 UTC (rev 6523)
+++ trunk/packages/cdbfasta/trunk/debian/rules	2011-04-11 13:33:27 UTC (rev 6524)
@@ -11,3 +11,14 @@
 
 %:
 	dh $@ 
+
+override_dh_installman:
+	help2man --no-info --no-discard-stderr --version-option=-v cdbfasta |\
+	    sed 's/^Invalid argument:.*//' |\
+	    sed 's/manual page for cdbfasta version .*/Creates an index file for records from a multi-fasta file./' \
+	    > cdbfasta.1
+	help2man --no-info --no-discard-stderr --version-option=-v cdbyank |\
+	    sed 's/^Invalid argument:.*//' |\
+	    sed 's/manual page for cdbyank version .*/Query an index file created with cdbfasta./' \
+	    > cdbyank.1
+	dh_installman cdbfasta.1 cdbyank.1