[med-svn] [Git][med-team/libvcflib][master] 4 commits: Bump SOVERSION due to ABI change

Andreas Tille (@tille) gitlab at salsa.debian.org
Wed Jun 28 14:11:48 BST 2023



Andreas Tille pushed to branch master at Debian Med / libvcflib


Commits:
76c3cf18 by Andreas Tille at 2023-06-28T09:51:23+02:00
Bump SOVERSION due to ABI change

- - - - -
b3058754 by Andreas Tille at 2023-06-28T14:59:26+02:00
Attempt to use d-shlibs delayed for later once shared and static lib are created both

- - - - -
0e9c93b4 by Andreas Tille at 2023-06-28T15:06:23+02:00
Rename debhelper files

- - - - -
9312942a by Andreas Tille at 2023-06-28T15:08:45+02:00
Upload to unstable

- - - - -


7 changed files:

- debian/changelog
- debian/control
- − debian/libvcflib1.lintian-overrides
- debian/libvcflib1.install → debian/libvcflib2.install
- + debian/libvcflib2.lintian-overrides
- debian/patches/shared_lib.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+libvcflib (1.0.9+dfsg-2) unstable; urgency=medium
+
+  * Bump SOVERSION due to ABI change
+    Closes: #1032557
+  * Attempt to use d-shlibs delayed for later once shared and static lib
+    are created both
+
+ -- Andreas Tille <tille at debian.org>  Wed, 28 Jun 2023 15:06:34 +0200
+
 libvcflib (1.0.9+dfsg-1) unstable; urgency=medium
 
   [ Étienne Mollier ]


=====================================
debian/control
=====================================
@@ -4,6 +4,7 @@ Uploaders: Andreas Tille <tille at debian.org>
 Section: science
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
+#               d-shlibs, # Switch to d-shlibs once shared and static lib are built
                cmake,
                markdown <!nodoc>,
                libtabixpp-dev,
@@ -24,7 +25,7 @@ Vcs-Git: https://salsa.debian.org/med-team/libvcflib.git
 Homepage: https://github.com/vcflib/vcflib
 Rules-Requires-Root: no
 
-Package: libvcflib1
+Package: libvcflib2
 Architecture: any-amd64 arm64 mips64el ppc64el s390x ia64 ppc64 riscv64 sparc64 alpha
 Multi-Arch: same
 Section: libs
@@ -50,7 +51,7 @@ Architecture: any-amd64 arm64 mips64el ppc64el s390x ia64 ppc64 riscv64 sparc64
 Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
-         libvcflib1 (= ${binary:Version}),
+         libvcflib2 (= ${binary:Version}),
          libdisorder-dev,
          libfastahack-dev,
          libtabixpp-dev,


=====================================
debian/libvcflib1.lintian-overrides deleted
=====================================
@@ -1 +0,0 @@
-libvcflib1: copyright-refers-to-versionless-license-file usr/share/common-licenses/LGPL


=====================================
debian/libvcflib1.install → debian/libvcflib2.install
=====================================


=====================================
debian/libvcflib2.lintian-overrides
=====================================
@@ -0,0 +1 @@
+libvcflib2: copyright-refers-to-versionless-license-file usr/share/common-licenses/LGPL


=====================================
debian/patches/shared_lib.patch
=====================================
@@ -36,7 +36,7 @@ Forwarded: not-needed
  add_definitions(-DVERSION="${BUILD_NUMBER}")
 +string(REGEX MATCH "^[0-9]+" MAJOR_BUILD_NUMBER ${BUILD_NUMBER})
 +set_target_properties(vcflib PROPERTIES
-+	SOVERSION ${MAJOR_BUILD_NUMBER}
++	SOVERSION 2
 +    )
  
  # ---- Build htslib


=====================================
debian/rules
=====================================
@@ -50,6 +50,22 @@ override_dh_install:
 	mkdir -p $(CURDIR)/debian/libvcflib-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
 	mv libvcflib.pc $(CURDIR)/debian/libvcflib-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
 	rm -rf debian/*/usr/lib/vcflib/bin/*.R
+# Argh, we can't use d-shlibmove since there is no static library
+# Use this once this might be available.
+#       d-shlibmove --commit \
+#                   --multiarch \
+#                   --devunversioned \
+#                   --exclude-la \
+#                   --override s/libdisorder[0-9]*-dev/libdisorder-dev/ \
+#                   --override s/libfastahack[0-9]*-dev/libfastahack-dev/ \
+#                   --override s/libsmithwaterman[0-9]*-dev/libsmithwaterman-dev/ \
+#                   --override s/libtabixpp[0-9]*-dev/libtabixpp-dev/ \
+#                   --override s/libwfa2-[0-9]*-dev/libwfa2-dev/ \
+#                   --movedev debian/ext/filevercmp/filevercmp.h debian/libvcflib-dev/usr/include/vcflib/ \
+#                   --movedev debian/libvcflib-dev/usr/include/vcflib/IntervalTree.h debian/libvcflib-dev/usr/include/intervaltree \
+#                   --movedev libvcflib.pc usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \
+#                   debian/tmp/usr/lib/*/*.so
+#       find debian -name "lib*.la" -delete
 	for pl in `grep -Rl '#!/usr/bin/env' debian/*/usr/*` ; do \
 	    sed -i '1s?^#!/usr/bin/env[[:space:]]\+perl?#!/usr/bin/perl?' $${pl} ; \
 	done



View it on GitLab: https://salsa.debian.org/med-team/libvcflib/-/compare/4ac73448410bd033d62356657638313cb7dee938...9312942aff207d03bd66e5ecbddd0514106f034a

-- 
View it on GitLab: https://salsa.debian.org/med-team/libvcflib/-/compare/4ac73448410bd033d62356657638313cb7dee938...9312942aff207d03bd66e5ecbddd0514106f034a
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/20230628/e4880a5d/attachment-0001.htm>


More information about the debian-med-commit mailing list