[med-svn] [bowtie2] 03/04: d/changelog: new upstream version d/patches/hardening.patch: refreshed d/filter.pl: strip unnecessary lines from help2man output d/help2man-wrapper: pipe through d/filter.pl

[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 477dbc3d7e9fd929a32514d9acd17193966b3ffa
Author: Alexandre Mestiashvili <alex at biotec.tu-dresden.de>
Date:   Wed Mar 18 10:40:39 2015 +0100

    d/changelog: new upstream version
    d/patches/hardening.patch: refreshed
    d/filter.pl: strip unnecessary lines from help2man output
    d/help2man-wrapper: pipe through d/filter.pl
---
 debian/changelog               |  6 ++++++
 debian/filter.pl               | 15 +++++++++++++++
 debian/help2man-wrapper        |  2 +-
 debian/patches/hardening.patch |  2 +-
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 57b602e..6443eed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+bowtie2 (2.2.5-1) UNRELEASED; urgency=medium
+
+  * Imported Upstream version 2.2.5
+
+ -- Alexandre Mestiashvili <alex at biotec.tu-dresden.de>  Wed, 18 Mar 2015 10:09:35 +0100
+
 bowtie2 (2.2.4-2) unstable; urgency=medium
 
   * d/control: add python dependency, needed to build bowtie2-build man page
diff --git a/debian/filter.pl b/debian/filter.pl
new file mode 100755
index 0000000..f05daf8
--- /dev/null
+++ b/debian/filter.pl
@@ -0,0 +1,15 @@
+#!/usr/bin/perl
+# filter of help2man output
+use strict;
+use warnings;
+
+while ( <STDIN> ) {
+    #multiline regex
+    undef $/;
+    # substitude unrecognized version string with the version
+    $_ =~ s/.*(\soutput\sfile\sspecified\!|No\sindex\sname\sgiven\!)//g;
+    $_ =~ s/\(ERR\):.*$//g;
+    $_ =~ s/(Usage:\n\.IP)/.SH\nUSAGE/g;
+    $_ =~ s/\*\*\*\sWarning.*\sinstead\.//gxms;
+    print $_;
+}
diff --git a/debian/help2man-wrapper b/debian/help2man-wrapper
index a301c66..85ca236 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 > $mandir/${binname}.1
+help2man --no-info --help-option="''" --no-discard-stderr --name="$2" --version-string="${version}" $tmpbin | debian/filter.pl > $mandir/${binname}.1
 rm -rf $tmpdir
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
index 60a5021..be2f347 100644
--- a/debian/patches/hardening.patch
+++ b/debian/patches/hardening.patch
@@ -5,7 +5,7 @@ Last-Update: Mon, 30 Jul 2012 13:51:31 +0200
 
 --- bowtie2.orig/Makefile
 +++ bowtie2/Makefile
-@@ -222,7 +222,8 @@
+@@ -232,7 +232,8 @@
       $(FILE_FLAGS) \
       $(PREF_DEF) \
       $(MM_DEF) \

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