This is an automated email from the git hooks/post-receive script. sascha-guest pushed a commit to branch master in repository ariba.
commit 585e9914943b46fbd9c5f4580d3c088d9ee07fa7 Author: Sascha Steinbiss <[email protected]> Date: Fri May 27 15:39:34 2016 +0000 adjust man page building --- debian/extra-man-info.txt | 11 +++++++++++ debian/make_man | 10 +++++----- debian/rules | 4 ++-- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/debian/extra-man-info.txt b/debian/extra-man-info.txt new file mode 100644 index 0000000..16ac644 --- /dev/null +++ b/debian/extra-man-info.txt @@ -0,0 +1,11 @@ +[DESCRIPTION] + +ARIBA is a tool that identifies antibiotic resistance genes by running local assemblies. + +More information on the individual subtools can be found on the ARIBA wiki: +https://github.com/sanger-pathogens/ariba/wiki + +[COPYRIGHT] + +This tool is developed and maintained by the Pathogen Informatics group at the +Wellcome Trust Sanger Institute under the GNU General Public License, version 3. diff --git a/debian/make_man b/debian/make_man index e80eeca..44470bd 100755 --- a/debian/make_man +++ b/debian/make_man @@ -1,12 +1,12 @@ #!/usr/bin/perl -my $v = `PYTHONPATH=. scripts/ariba version`; +my $v = `grep -Po "(?<=version=')([0-9.]+)" setup.py`; while(<>) { chomp; my ($name, $desc) = split(/\s{2,}/); - my $uname = uc($name); - `PYTHONPATH=. help2man -N -o ./debian/man/ariba-$name.1 -n '$desc' --version-string='$v' 'scripts/ariba $name'`; - `sed -i 's/.TH ARIBA /.TH ARIBA-$uname /' debian/man/ariba-$name.1`; + `echo '#!/bin/sh\ncat <<HERE\n' > ariba-$name;PYTHONPATH=. scripts/ariba $name --help 2>&1 | sed 's/usage/Usage/g' | egrep -v '^ARIBA:' >> ariba-$name; echo "HERE\n" >> ariba-$name; chmod +x ariba-$name`; + `help2man -I debian/extra-man-info.txt -n '$desc' --version-string='$v' -N ./ariba-$name > debian/man/ariba-$name.1`; `sed -i 's/ariba $name/ariba_$name/' debian/man/ariba-$name.1`; -} \ No newline at end of file + `rm ariba-$name`; +} diff --git a/debian/rules b/debian/rules index 20880fd..7f2af08 100755 --- a/debian/rules +++ b/debian/rules @@ -15,8 +15,8 @@ override_dh_installman: -n 'Antibiotic Resistance Identification by Assembly' \ --no-discard-stderr \ --version-string="$(ARIBA_VERSION)" scripts/ariba - sed -i 's/.SH DESCRIPTION/.SH DESCRIPTION\\n.nf/' $(mandir)/ariba.1 - scripts/ariba 2>&1 | tail -n +13 | debian/make_man + sed -i 's/.SH DESCRIPTION/.SH DESCRIPTION\\n/' $(mandir)/ariba.1 + scripts/ariba 2>&1 | tail -n +13 | head -n 12 | debian/make_man dh_installman -- override_dh_auto_test: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ariba.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
