[med-svn] [fastx-toolkit] 03/05: do not parse d/changelog

Andreas Tille tille at debian.org
Fri Aug 25 11:37:35 UTC 2017


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

tille pushed a commit to tag debian/0.0.14-5
in repository fastx-toolkit.

commit 169c756497ae7abe004e01c2ef6b08b50cd953ff
Author: Andreas Tille <tille at debian.org>
Date:   Fri Aug 25 10:22:06 2017 +0200

    do not parse d/changelog
---
 debian/changelog |  1 +
 debian/rules     | 51 +++++++++++++++++++++++++--------------------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a8effe2..118de04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ fastx-toolkit (0.0.14-5) UNRELEASED; urgency=low
   * Exit after usage to make sure gcc-7 will not assume that code falls
     through case statement.
     Closes: #853396
+  * d/rules: do not parse d/changelog
 
  -- Andreas Tille <tille at debian.org>  Fri, 25 Aug 2017 10:13:28 +0200
 
diff --git a/debian/rules b/debian/rules
index 34e96b2..14ef127 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,13 +2,12 @@
 
 export DH_VERBOSE=1
 
-:export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-pkg := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
-ver := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(\([0-9]\+\):\)\?\(.*\)-.*/\3/p')
+include /usr/share/dpkg/default.mk
 
-mandir := $(CURDIR)/debian/$(pkg)/usr/share/man/man1
-bindir := $(CURDIR)/debian/$(pkg)/usr/bin
+mandir := $(CURDIR)/debian/$(DEB_SOURCE)/usr/share/man/man1
+bindir := $(CURDIR)/debian/$(DEB_SOURCE)/usr/bin
 
 %:
 	dh $@ --with autotools_dev
@@ -19,7 +18,7 @@ override_dh_auto_configure:
 
 override_dh_install:
 	dh_install
-	rm --recursive $(CURDIR)/debian/$(pkg)/usr/share/aclocal
+	rm --recursive $(CURDIR)/debian/$(DEB_SOURCE)/usr/share/aclocal
 
 override_dh_installchangelogs:
 	dh_installchangelogs -k NEWS
@@ -34,81 +33,81 @@ override_dh_installman:
 	#   http://hannonlab.cshl.edu/fastx_toolkit/ (Section "Available Tools")
 	# and
 	#   http://hannonlab.cshl.edu/fastx_toolkit/commandline.html
-	help2man --no-info --no-discard-stderr --version-string='$(ver)' --help-option='-h' \
+	help2man --no-info --no-discard-stderr --version-string='$(DEB_VERSION_UPSTREAM)' --help-option='-h' \
 	   --name='changes the width of sequences line in a FASTA file' \
 	   $(bindir)/fasta_formatter > $(mandir)/fasta_formatter.1
-	help2man --no-info --no-discard-stderr --version-string='$(ver)' --help-option='-h' \
+	help2man --no-info --no-discard-stderr --version-string='$(DEB_VERSION_UPSTREAM)' --help-option='-h' \
 	   --name='Convets FASTA sequences from/to RNA/DNA' \
 	   $(bindir)/fasta_nucleotide_changer > $(mandir)/fasta_nucleotide_changer.1
-	help2man --no-info --no-discard-stderr --version-string='$(ver)' --help-option='-h' \
+	help2man --no-info --no-discard-stderr --version-string='$(DEB_VERSION_UPSTREAM)' --help-option='-h' \
 	   --name="Masks nucleotides with 'N' (or other character) based on quality" \
 	   $(bindir)/fastq_masker > $(mandir)/fastq_masker.1
 
 	# FIXME: The tool `fasta_quality_converter` was NOT described at the URLs above
-	help2man --no-info --no-discard-stderr --version-string='$(ver)' --help-option='-h' \
+	help2man --no-info --no-discard-stderr --version-string='$(DEB_VERSION_UPSTREAM)' --help-option='-h' \
 	   --name='Converts sequences based on quality' \
 	   $(bindir)/fastq_quality_converter > $(mandir)/fastq_quality_converter.1
 
-	help2man --no-info --no-discard-stderr --version-string='$(ver)' --help-option='-h' \
+	help2man --no-info --no-discard-stderr --version-string='$(DEB_VERSION_UPSTREAM)' --help-option='-h' \
 	   --name='Filters sequences based on quality' \
 	   $(bindir)/fastq_quality_filter > $(mandir)/fastq_quality_filter.1
 
 # FIXME: For some very strange reason this conversion fails
 #
-#	help2man --no-info --no-discard-stderr --version-string='$(ver)' --help-option='-h' \
+#	help2man --no-info --no-discard-stderr --version-string='$(DEB_VERSION_UPSTREAM)' --help-option='-h' \
 #	   --name='Filters sequences based on quality' \
 #	   $(bindir)/fastq_quality_trimmer > $(mandir)/fastq_quality_trimmer .1
 # lets simply use what works perfectly at command line
 	dh_installman debian/fastq_quality_trimmer.1
 
-	help2man --no-info --no-discard-stderr --version-string='$(ver)' --help-option='-h' \
+	help2man --no-info --no-discard-stderr --version-string='$(DEB_VERSION_UPSTREAM)' --help-option='-h' \
 	   --name='Convert FASTQ files to FASTA files' \
 	   $(bindir)/fastq_to_fasta > $(mandir)/fastq_to_fasta.1
-	help2man --no-info --no-discard-stderr --version-string='$(ver)' --help-option='-h' \
+	help2man --no-info --no-discard-stderr --version-string='$(DEB_VERSION_UPSTREAM)' --help-option='-h' \
 	   --name='FASTQ/A Artifacts Filter' \
 	   $(bindir)/fastx_artifacts_filter > $(mandir)/fastx_artifacts_filter.1
-	help2man --no-info --no-discard-stderr --version-string='$(ver)' --help-option='-h' \
+	help2man --no-info --no-discard-stderr --version-string='$(DEB_VERSION_UPSTREAM)' --help-option='-h' \
 	   --name='FASTA/Q Clipper' \
 	   $(bindir)/fastx_clipper > $(mandir)/fastx_clipper.1
-	help2man --no-info --no-discard-stderr --version-string='$(ver)' --help-option='-h' \
+	help2man --no-info --no-discard-stderr --version-string='$(DEB_VERSION_UPSTREAM)' --help-option='-h' \
 	   --name='FASTA/Q Collapser' \
 	   $(bindir)/fastx_collapser > $(mandir)/fastx_collapser.1
-	help2man --no-info --no-discard-stderr --version-string='$(ver)' --help-option='-h' \
+	help2man --no-info --no-discard-stderr --version-string='$(DEB_VERSION_UPSTREAM)' --help-option='-h' \
 	   --name='FASTX Statistics' \
 	   $(bindir)/fastx_quality_stats > $(mandir)/fastx_quality_stats.1
-	help2man --no-info --no-discard-stderr --version-string='$(ver)' --help-option='-h' \
+	help2man --no-info --no-discard-stderr --version-string='$(DEB_VERSION_UPSTREAM)' --help-option='-h' \
 	   --name='FASTA/Q Renamer' \
 	   $(bindir)/fastx_renamer > $(mandir)/fastx_renamer.1
-	help2man --no-info --no-discard-stderr --version-string='$(ver)' --help-option='-h' \
+	help2man --no-info --no-discard-stderr --version-string='$(DEB_VERSION_UPSTREAM)' --help-option='-h' \
 	   --name='FASTQ/A Reverse Complement' \
 	   $(bindir)/fastx_reverse_complement > $(mandir)/fastx_reverse_complement.1
-	help2man --no-info --no-discard-stderr --version-string='$(ver)' --help-option='-h' \
+	help2man --no-info --no-discard-stderr --version-string='$(DEB_VERSION_UPSTREAM)' --help-option='-h' \
 	   --name='FASTA/Q Trimmer' \
 	   $(bindir)/fastx_trimmer > $(mandir)/fastx_trimmer.1
-	help2man --no-info --no-discard-stderr --version-string='$(ver)' --help-option='-h' \
+	help2man --no-info --no-discard-stderr --version-string='$(DEB_VERSION_UPSTREAM)' --help-option='-h' \
 	   --name='FASTA/Q Uncollapser' \
 	   $(bindir)/fastx_uncollapser > $(mandir)/fastx_uncollapser.1
 
 	# Perl scripts add the full path to usage advise which needs to be removed
 	# The script fasta_clipping_histogram.pl does not feature a '-h' option
-	help2man --no-info --no-discard-stderr --version-string='$(ver)' -h '' \
+	help2man --no-info --no-discard-stderr --version-string='$(DEB_VERSION_UPSTREAM)' -h '' \
 	   --name='Create a Linker Clipping Information Histogram' \
 	   $(bindir)/fasta_clipping_histogram.pl | \
 	   sed -e 's?^usage: .*\([^/]\+\.pl\)?usage: \1?' \
 	   > $(mandir)/fasta_clipping_histogram.pl.1
-	help2man --no-info --no-discard-stderr --version-string='$(ver)' --help-option='-h' \
+	help2man --no-info --no-discard-stderr --version-string='$(DEB_VERSION_UPSTREAM)' --help-option='-h' \
 	   --name='FASTX Barcode Splitter' \
 	   $(bindir)/fastx_barcode_splitter.pl | \
 	   sed -e 's?^usage: .*\([^/]\+\.pl\)?usage: \1?' \
 	   > $(mandir)/fastx_barcode_splitter.pl.1
 
-	help2man --no-info --no-discard-stderr --version-string='$(ver)' --help-option='-h' \
+	help2man --no-info --no-discard-stderr --version-string='$(DEB_VERSION_UPSTREAM)' --help-option='-h' \
 	   --name='Solexa-Quality BoxPlot plotter' \
 	   $(bindir)/fastq_quality_boxplot_graph.sh > $(mandir)/fastq_quality_boxplot_graph.sh.1
-	help2man --no-info --no-discard-stderr --version-string='$(ver)' --help-option='-h' \
+	help2man --no-info --no-discard-stderr --version-string='$(DEB_VERSION_UPSTREAM)' --help-option='-h' \
 	   --name='FASTA/Q Nucleotide Distribution Plotter' \
 	   $(bindir)/fastx_nucleotide_distribution_graph.sh > $(mandir)/fastx_nucleotide_distribution_graph.sh.1
-	help2man --no-info --no-discard-stderr --version-string='$(ver)' --help-option='-h' \
+	help2man --no-info --no-discard-stderr --version-string='$(DEB_VERSION_UPSTREAM)' --help-option='-h' \
 	   --name='FASTA/Q Nucleotide Distribution Plotter' \
 	   $(bindir)/fastx_nucleotide_distribution_line_graph.sh > $(mandir)/fastx_nucleotide_distribution_line_graph.sh.1
 

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



More information about the debian-med-commit mailing list