[med-svn] [Git][med-team/epcr][master] 4 commits: Versioned Build-Depends: debhelper (>= 11~) to enable easy backports
Andreas Tille
gitlab at salsa.debian.org
Sat Oct 13 23:26:02 BST 2018
Andreas Tille pushed to branch master at Debian Med / epcr
Commits:
87ef3511 by Andreas Tille at 2018-10-13T22:01:14Z
Versioned Build-Depends: debhelper (>= 11~) to enable easy backports
- - - - -
bd920231 by Andreas Tille at 2018-10-13T22:12:34Z
Fix spelling
- - - - -
f3109119 by Andreas Tille at 2018-10-13T22:23:32Z
Do not parse d/changelog
- - - - -
e2cca774 by Andreas Tille at 2018-10-13T22:25:22Z
Upload to unstable
- - - - -
5 changed files:
- debian/changelog
- debian/control
- debian/patches/series
- + debian/patches/spelling.patch
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-epcr (2.3.12-1-6.1) UNRELEASED; urgency=medium
+epcr (2.3.12-1-6) unstable; urgency=medium
[ Andreas Tille ]
* debian/upstream/metadata
@@ -10,7 +10,12 @@ epcr (2.3.12-1-6.1) UNRELEASED; urgency=medium
* Debhelper bumped
* Standard version updated
- -- Manas Kashyap <manaskashyaptech at gmail.com> Tue, 02 Oct 2018 14:53:57 +0000
+ [ Andreas Tille ]
+ * Versioned Build-Depends: debhelper (>= 11~) to enable easy backports
+ * Fix spelling
+ * Do not parse d/changelog
+
+ -- Andreas Tille <tille at debian.org> Sun, 14 Oct 2018 00:23:48 +0200
epcr (2.3.12-1-5) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -5,7 +5,7 @@ Uploaders: Steffen Moeller <moeller at debian.org>,
Charles Plessy <plessy at debian.org>
Section: science
Priority: optional
-Build-Depends: debhelper (>= 11)
+Build-Depends: debhelper (>= 11~)
Standards-Version: 4.2.1
Vcs-Browser: https://salsa.debian.org/med-team/epcr
Vcs-Git: https://salsa.debian.org/med-team/epcr.git
=====================================
debian/patches/series
=====================================
@@ -3,3 +3,4 @@ fix_header_location.patch
ensure_build_options.patch
use-dpkg-buildflags.patch
mayhem.patch
+spelling.patch
=====================================
debian/patches/spelling.patch
=====================================
@@ -0,0 +1,55 @@
+Description: Fix spelling
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Sat, 13 Oct 2018 23:57:40 +0200
+
+--- a/README.txt
++++ b/README.txt
+@@ -37,7 +37,7 @@ where posix-options are:
+ -p +- Turn hits postprocess on/off
+ -v +- Verbose on/Off
+ -a a|f Use presize alignmens (only if gaps>0), slow
+- a - Allways or f - as Fallback
++ a - Always or f - as Fallback
+ -x +- Use 5'-end lowercase masking of primers (default -)
+ -u +- Uppercase all primers (default -)
+ and compat-options (duplicate posix-options) are:
+@@ -52,7 +52,7 @@ and compat-options (duplicate posix-opti
+ P=+- Postprocess hits on/off
+ V=+- Verbose on/Off
+ A=a|f Use presize alignmens (only if gaps>0), slow
+- a - Allways or f - as Fallback
++ a - Always or f - as Fallback
+ X=+- Use 5'-end lowercase masking of primers (default -)
+ U=+- Uppercase all primers (default -)
+ -mid Same as T=2
+--- a/e-PCR_main.cpp
++++ b/e-PCR_main.cpp
+@@ -126,7 +126,7 @@ int CMain::Help(FILE* out)
+ fprintf(out,"\t-p +-\tTurn hits postprocess on/off\n");
+ fprintf(out,"\t-v ##\tVerbosity flags\n");
+ fprintf(out,"\t-a a|f\tUse presize alignmens (only if gaps>0), slow\n"
+- "\t\t a - Allways or f - as Fallback\n");
++ "\t\t a - Always or f - as Fallback\n");
+ fprintf(out,"\t-x +-\tUse 5'-end lowercase masking of primers "
+ "(default %s)\n",stsFileHash.AllowOverhang()?"+":"-");
+ fprintf(out,"\t-u +-\tUppercase all primers "
+@@ -149,7 +149,7 @@ int CMain::Help(FILE* out)
+ fprintf(out,"\tP=+-\tPostprocess hits on/off\n");
+ fprintf(out,"\tV=##\tVerbosity flags\n");
+ fprintf(out,"\tA=a|f\tUse presize alignmens (only if gaps>0), slow\n"
+- "\t\t a - Allways or f - as Fallback\n");
++ "\t\t a - Always or f - as Fallback\n");
+ fprintf(out,"\tX=+-\tUse 5'-end lowercase masking of primers "
+ "(default %s)\n",stsFileHash.AllowOverhang()?"+":"-");
+ fprintf(out,"\tU=+-\tUppercase all primers "
+--- a/famap_main.cpp
++++ b/famap_main.cpp
+@@ -75,7 +75,7 @@ int CMain::Help(FILE* out)
+ fprintf(out,"usage: [-hV] -b mmapped-file [-t cvt] [fafile ...]\n");
+ fprintf(out," or: [-hV] -d mmapped-file [ord ...]\n");
+ fprintf(out," or: [-hV] -l mmapped-file [ord ...]\n");
+- fprintf(out,"where cvt (convertion table) is one of:\n"
++ fprintf(out,"where cvt (conversion table) is one of:\n"
+ "\toff - as is (default)\n"
+ "\tn - nucleotide [acgtnACGTN] allowed,\n"
+ "\tN - nucleotide uppercase allowed [ACGTN]\n"
=====================================
debian/rules
=====================================
@@ -4,12 +4,13 @@
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(\([0-9]\+\):\)\?\(.*\)-.*/\3/p')
-VER_MAJOR := $(shell echo $(VERSION) | sed 's/^\([0-9]\+\)\..*/\1/')
-VER_MINOR := $(shell echo $(VERSION) | sed 's/^[0-9]\+\.\([0-9]\+\)\..*/\1/')
-VER_BUILD := $(shell echo $(VERSION) | sed 's/^[0-9]\+\.[0-9]\+\.\(.*\)/\1/')
+include /usr/share/dpkg/default.mk
-CFLAGS += -I. -g2 -DDEALLOCATE=0 -DVERSION=\"$(VERSION)\" -DVER_MAJOR=$(VER_MAJOR) -DVER_MINOR=$(VER_MINOR) -DVER_BUILD=$(VER_BUILD) -DSTANDALONE=1
+VER_MAJOR := $(shell echo $(DEB_VERSION_UPSTREAM) | sed 's/^\([0-9]\+\)\..*/\1/')
+VER_MINOR := $(shell echo $(DEB_VERSION_UPSTREAM) | sed 's/^[0-9]\+\.\([0-9]\+\)\..*/\1/')
+VER_BUILD := $(shell echo $(DEB_VERSION_UPSTREAM) | sed 's/^[0-9]\+\.[0-9]\+\.\(.*\)/\1/')
+
+CFLAGS += -I. -g2 -DDEALLOCATE=0 -DVERSION=\"$(DEB_VERSION_UPSTREAM)\" -DVER_MAJOR=$(VER_MAJOR) -DVER_MINOR=$(VER_MINOR) -DVER_BUILD=$(VER_BUILD) -DSTANDALONE=1
LDFLAGS += -L.
%:
View it on GitLab: https://salsa.debian.org/med-team/epcr/compare/0a5f5d864183808c70bd8b557f57c0fbb935104a...e2cca7747d29ecdd1673f31b7e424aab9c982bf9
--
View it on GitLab: https://salsa.debian.org/med-team/epcr/compare/0a5f5d864183808c70bd8b557f57c0fbb935104a...e2cca7747d29ecdd1673f31b7e424aab9c982bf9
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20181013/8ec7b8b4/attachment-0001.html>
More information about the debian-med-commit
mailing list