[med-svn] [Git][med-team/htslib][master] 5 commits: routine-update: Standards-Version: 4.6.0

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / htslib


Commits:
90898165 by Andreas Tille at 2021-08-26T15:05:09+02:00
routine-update: Standards-Version: 4.6.0

- - - - -
7b9347b8 by Andreas Tille at 2021-08-26T15:09:24+02:00
routine-update: Do not parse d/changelog

- - - - -
7a22b467 by Andreas Tille at 2021-08-26T15:10:56+02:00
Remove constraints unnecessary since buster

* libhts3: Drop versioned constraint on python-pysam in Breaks.

Changes-By: deb-scrub-obsolete
- - - - -
d301d670 by Andreas Tille at 2021-08-26T15:12:44+02:00
Cleanup changelog

- - - - -
1a3dbeb5 by Andreas Tille at 2021-08-26T15:13:25+02:00
there is no patch debian-changes (and there should not be such a patch)

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,18 +1,19 @@
 htslib (1.13+ds-1) UNRELEASED; urgency=medium
 
+  [ Steffen Moeller ]
   * New upstream version
+  * added libhtscodecs-dev as build-dependency
+  * remove htscodecs folder from source tree (following advice
+    by John Marshall - many thanks!)
   * Builds fine with autoconf > 2.71 (Closes: #978835).
 
- -- Steffen Moeller <moeller at debian.org>  Wed, 25 Aug 2021 19:16:23 +0200
-
-htslib (1.12+ds-1) UNRELEASED; urgency=medium
-
-  * New upstream version
-    - added libhtscodecs-dev as build-dependency
-    - remove htscodecs folder from source tree (following advice
-      by John Marshall - many thanks!)
+  [ Andreas Tille ]
+  * Standards-Version: 4.6.0 (routine-update)
+  * Do not parse d/changelog (routine-update)
+  * Remove constraints unnecessary since buster:
+    + libhts3: Drop versioned constraint on python-pysam in Breaks.
 
- -- Steffen Moeller <moeller at debian.org>  Mon, 24 May 2021 16:51:26 +0200
+ -- Steffen Moeller <moeller at debian.org>  Wed, 25 Aug 2021 19:16:23 +0200
 
 htslib (1.11-4) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -15,7 +15,7 @@ Build-Depends: debhelper-compat (= 13),
                zlib1g-dev,
 	       libdeflate-dev,
                libhtscodecs-dev (>= 1.0)
-Standards-Version: 4.5.1
+Standards-Version: 4.6.0
 Vcs-Browser: https://salsa.debian.org/med-team/htslib
 Vcs-Git: https://salsa.debian.org/med-team/htslib.git
 Homepage: https://github.com/samtools/htslib
@@ -29,8 +29,7 @@ Depends: ${misc:Depends},
          ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Replaces: libhts-dev (<< 1.11-3)
-Breaks: python-pysam (<< 0.15~),
-        python3-pysam (<< 0.15~),
+Breaks: python3-pysam (<< 0.15~),
         libtabixpp (<< 1.0.0-5~),
         libhts-dev (<< 1.11-3)
 Description: C library for high-throughput sequencing data formats


=====================================
debian/patches/series
=====================================
@@ -7,4 +7,3 @@ fix_float_precision
 cram_to_bam_export.patch
 # plugins_to_lib.patch - can probably be removed
 disable_plugin_loading_test.patch
-debian-changes


=====================================
debian/rules
=====================================
@@ -11,8 +11,6 @@ endif
 DEB_CFLAGS_MAINT_APPEND+=-flto -fvisibility=hidden
 DEB_LDFLAGS_MAINT_APPEND+=-Wl,-flto -fvisibility=hidden
 
-UPSTREAM_VERSION=`dpkg-parsechangelog  -SVersion|sed -e 's/^\([0-9.]*\).*/\1/'`
-
 export DEB_CFLAGS_MAINT_APPEND
 export DEB_LDFLAGS_MAINT_APPEND
 
@@ -21,7 +19,7 @@ export DEB_LDFLAGS_MAINT_APPEND
 	dh $@
 
 hello:
-	echo "Upstream version: $(UPSTREAM_VERSION)"
+	echo "Upstream version: $(DEB_VERSION_UPSTREAM)"
 
 override_dh_auto_configure:
 ifneq (,$(filter $(DEB_HOST_ARCH),i386 kfreebsd-i386 hurd-i386))
@@ -39,7 +37,7 @@ override_dh_auto_build-arch:
 	  CFLAGS="$$(dpkg-buildflags --get CFLAGS)" \
 	  CPPFLAGS="-I. -DSAMTOOLS=1 $$(dpkg-buildflags --get CPPFLAGS)" \
 	  LDFLAGS="$$(dpkg-buildflags --get LDFLAGS)" \
-	  PACKAGE_VERSION="$(UPSTREAM_VERSION)" \
+	  PACKAGE_VERSION="$(DEB_VERSION_UPSTREAM)" \
 	  libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 # re-try later	  LDLIBS=-lhts \
 
@@ -53,7 +51,7 @@ override_dh_auto_install-arch:
 	  CFLAGS="$$(dpkg-buildflags --get CFLAGS)" \
 	  CPPFLAGS="-I. -DSAMTOOLS=1 $$(dpkg-buildflags --get CPPFLAGS)" \
 	  LDFLAGS="$$(dpkg-buildflags --get LDFLAGS)" \
-	  PACKAGE_VERSION="$(UPSTREAM_VERSION)" \
+	  PACKAGE_VERSION="$(DEB_VERSION_UPSTREAM)" \
 	  libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 	# restore clean copy of test dir before dh_install is run
 	# This should not be done earlier since dh_auto_install contains some unconditional removals
@@ -72,7 +70,7 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	  CFLAGS="$$(dpkg-buildflags --get CFLAGS)" \
 	  CPPFLAGS="-I. -DSAMTOOLS=1 $$(dpkg-buildflags --get CPPFLAGS)" \
 	  LDFLAGS="$$(dpkg-buildflags --get LDFLAGS)" \
-	  PACKAGE_VERSION="$(UPSTREAM_VERSION)" \
+	  PACKAGE_VERSION="$(DEB_VERSION_UPSTREAM)" \
 	  libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
 	  || \
 	  if find . -name "FAIL*" > /dev/null ; then \



View it on GitLab: https://salsa.debian.org/med-team/htslib/-/compare/781701ececcd91847b4b6754c5eaa2ee587adce9...1a3dbeb5b2c51f435d411a6d3f28cb949d7aaed4

-- 
View it on GitLab: https://salsa.debian.org/med-team/htslib/-/compare/781701ececcd91847b4b6754c5eaa2ee587adce9...1a3dbeb5b2c51f435d411a6d3f28cb949d7aaed4
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/20210826/9bf3f3c2/attachment-0001.htm>