[med-svn] [Git][med-team/htslib][master] Pass correct upstream version so as to not get the +ds non-sense in SOVERSIONS

[Nilesh Patra (@nilesh)]

Nilesh Patra pushed to branch master at Debian Med / htslib


Commits:
c1ab6cb0 by Nilesh Patra at 2022-10-01T08:58:37+05:30
Pass correct upstream version so as to not get the +ds non-sense in SOVERSIONS

- - - - -


1 changed file:

- debian/rules


Changes:

=====================================
debian/rules
=====================================
@@ -14,12 +14,15 @@ DEB_LDFLAGS_MAINT_APPEND+=-Wl,-flto -fvisibility=hidden -ffat-lto-objects
 export DEB_CFLAGS_MAINT_APPEND
 export DEB_LDFLAGS_MAINT_APPEND
 
+# Prune +,ds etc from version
+UPSTREAM_VERSION := $(shell echo $(DEB_VERSION_UPSTREAM) | sed 's/+.*//')
+
 
 %:
 	dh $@
 
 hello:
-	echo "Upstream version: $(DEB_VERSION_UPSTREAM)"
+	echo "Upstream version: $(UPSTREAM_VERSION)"
 
 override_dh_auto_configure:
 ifneq (,$(filter $(DEB_HOST_ARCH),i386 kfreebsd-i386 hurd-i386))
@@ -37,7 +40,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="$(DEB_VERSION_UPSTREAM)" \
+	  PACKAGE_VERSION="$(UPSTREAM_VERSION)" \
 	  libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 # re-try later	  LDLIBS=-lhts \
 
@@ -51,7 +54,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="$(DEB_VERSION_UPSTREAM)" \
+	  PACKAGE_VERSION="$(UPSTREAM_VERSION)" \
 	  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
@@ -70,7 +73,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="$(DEB_VERSION_UPSTREAM)" \
+	  PACKAGE_VERSION="$(UPSTREAM_VERSION)" \
 	  libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
 	  || \
 	  if find . -name "FAIL*" > /dev/null ; then \



View it on GitLab: https://salsa.debian.org/med-team/htslib/-/commit/c1ab6cb0be33d024c67be56e8f40e5aa71517d2e

-- 
View it on GitLab: https://salsa.debian.org/med-team/htslib/-/commit/c1ab6cb0be33d024c67be56e8f40e5aa71517d2e
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/20221001/b8e91876/attachment-0001.htm>