[med-svn] [bowtie2] 01/01: d/filter: brush up help2man output d/help2man-wrapper: use -h help option d/rules: add --parallel, enable TBB for amd64 only d/changelog: upload to unstable

[Alex Mestiashvili]

This is an automated email from the git hooks/post-receive script.

malex-guest pushed a commit to branch master
in repository bowtie2.

commit a0c51615f4ef29e4c0f5e1382a74e748917eee0a
Author: Alexandre Mestiashvili <alex at biotec.tu-dresden.de>
Date:   Fri Aug 28 13:10:18 2015 +0200

    d/filter: brush up help2man output
    d/help2man-wrapper: use -h help option
    d/rules: add --parallel, enable TBB for amd64 only
    d/changelog: upload to unstable
---
 debian/changelog        |  2 +-
 debian/filter.pl        | 14 +++++++++++++-
 debian/help2man-wrapper |  2 +-
 debian/rules            | 12 ++++++++++--
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 39a7784..427b09a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-bowtie2 (2.2.6-1) UNRELEASED; urgency=medium
+bowtie2 (2.2.6-1) unstable; urgency=medium
 
   * Imported Upstream version 2.2.6
   * d/rules: WITH_TBB=1
diff --git a/debian/filter.pl b/debian/filter.pl
index f05daf8..0e902d1 100755
--- a/debian/filter.pl
+++ b/debian/filter.pl
@@ -7,9 +7,21 @@ while ( <STDIN> ) {
     #multiline regex
     undef $/;
     # substitude unrecognized version string with the version
+    $_ =~ s/(\.SH\sDESCRIPTION\n)(No\sinput\ssequence.*?)(\n)/$1\.TP$3/gxms;
+    $_ =~ s/(\*{3}\n)(Options):\n\.TP/$1.'.SH '.uc($2)/gmsex;
+    $_ =~ s/(\.PP\n)(Options)(\s.*?):(\n)/$1.'.SH '.uc($2).$3.$4/msex;
+    $_ =~ s{(\.IP\n)(Input|Presets|Alignment|Scoring|Reporting|
+	Effort|Paired-end|Output|Performance|Other)(:\n)(\.TP|\.HP\n)}
+	{.SS $2$3$4}gmsx;
+    $_ =~ s/(\.TP\n)(Presets:)\n/\.SS $2\n/xms;
+    $_ =~ s{(\(Note:\sfor.*?\.)(\n\.IP)}{
+		my ($p,$q) = ($1,$2);
+		$p =~ s/(\n)/$1 /gxms;
+		$p = ' '.$p.$q;
+	   }msex;
     $_ =~ s/.*(\soutput\sfile\sspecified\!|No\sindex\sname\sgiven\!)//g;
     $_ =~ s/\(ERR\):.*$//g;
     $_ =~ s/(Usage:\n\.IP)/.SH\nUSAGE/g;
-    $_ =~ s/\*\*\*\sWarning.*\sinstead\.//gxms;
+    $_ =~ s/\*{3}\sWarning.*\sinstead\.//gxms;
     print $_;
 }
diff --git a/debian/help2man-wrapper b/debian/help2man-wrapper
index 85ca236..859fb12 100755
--- a/debian/help2man-wrapper
+++ b/debian/help2man-wrapper
@@ -18,5 +18,5 @@ echo "#!/bin/sh" > $tmpbin
 echo "cat <<EOT" >> $tmpbin
 ${PWD}/debian/${pkg}/usr/bin/$binname 2>> $tmpbin
 chmod 755 $tmpbin
-help2man --no-info --help-option="''" --no-discard-stderr --name="$2" --version-string="${version}" $tmpbin | debian/filter.pl > $mandir/${binname}.1
+help2man --no-info --help-option="h" --no-discard-stderr --name="$2" --version-string="${version}" $tmpbin | debian/filter.pl > $mandir/${binname}.1
 rm -rf $tmpdir
diff --git a/debian/rules b/debian/rules
index a99fe7e..15a869a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,11 +6,19 @@ CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
 LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
 EXTRA_FLAGS := $(LDFLAGS)
 
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+EXTRA_OPTIONS =
+ifeq ($(DEB_HOST_ARCH),amd64)
+        EXTRA_OPTIONS = WITH_TBB=1
+endif
+export EXTRA_OPTIONS
+
+
 %:
-	dh $@
+	dh $@ --parallel
 
 override_dh_auto_build:
-	dh_auto_build -- EXTRA_FLAGS=$(EXTRA_FLAGS) CPPFLAGS=$(CPPFLAGS) WITH_TBB=1
+	dh_auto_build -- EXTRA_FLAGS=$(EXTRA_FLAGS) CPPFLAGS=$(CPPFLAGS) $(EXTRA_OPTIONS)
 
 override_dh_installman:
 	mkdir -p $(CURDIR)/debian/$(pkg)/usr/share/man/man1/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/bowtie2.git