[med-svn] [Git][med-team/pbseqlib][master] 2 commits: Use d-shlibs, Soname in library package

Andreas Tille gitlab at salsa.debian.org
Fri Nov 13 20:34:50 GMT 2020



Andreas Tille pushed to branch master at Debian Med / pbseqlib


Commits:
1e1142f0 by Andreas Tille at 2020-11-13T21:16:13+01:00
Use d-shlibs, Soname in library package

- - - - -
f0618482 by Andreas Tille at 2020-11-13T21:20:36+01:00
Upload to unstable

- - - - -


7 changed files:

- debian/changelog
- debian/control
- − debian/libblasr-dev.install
- − debian/libblasr.install
- debian/patches/series
- + debian/patches/static+shared_lib.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-pbseqlib (5.3.4+dfsg-1) UNRELEASED; urgency=medium
+pbseqlib (5.3.4+dfsg-1) unstable; urgency=medium
 
   [ Andreas Tille ]
   * New upstream version
@@ -7,12 +7,14 @@ pbseqlib (5.3.4+dfsg-1) UNRELEASED; urgency=medium
   * Rules-Requires-Root: no (routine-update)
   * No tab in license text (routine-update)
   * More friendly dh_missing installation
+  * Use d-shlibs
+  * Soname in library package
 
   [ Helmut Grohne ]
   * Switch all packages to Architecture: any.
     Closes: #972822
 
- -- Andreas Tille <tille at debian.org>  Fri, 13 Nov 2020 08:56:25 +0100
+ -- Andreas Tille <tille at debian.org>  Fri, 13 Nov 2020 21:16:35 +0100
 
 pbseqlib (5.3.3+dfsg-4) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -1,9 +1,10 @@
 Source: pbseqlib
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Andreas Tille <tille at debian.org>
-Section: libs
+Section: science
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
+               d-shlibs,
                meson,
                pkg-config,
                cmake,
@@ -22,10 +23,38 @@ Vcs-Git: https://salsa.debian.org/med-team/pbseqlib.git
 Homepage: https://github.com/PacificBiosciences/blasr_libcpp
 Rules-Requires-Root: no
 
+Package: libblasr-dev
+Architecture: any
+Section: libdevel
+Depends: libblasr5.3.4 (= ${binary:Version}),
+         libpbdata-dev (= ${binary:Version}),
+         ${misc:Depends}
+Breaks: libblasr (<< 5.3.3)
+Replaces: libblasr (<< 5.3.3)
+Description: tools for aligning PacBio reads to target sequences (development files)
+ Blasr_libcpp is a library used by blasr and other executables such as
+ samtoh5, loadPulses for analyzing PacBio sequences. This library contains
+ three sub-libraries, including pbdata, hdf and alignment.
+ .
+ This package contains the header files and static library for the alignment
+ sublibrary.
+
+Package: libblasr5.3.4
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: tools for aligning PacBio reads to target sequences
+ Blasr_libcpp is a library used by blasr and other executables such as
+ samtoh5, loadPulses for analyzing PacBio sequences. This library contains
+ three sub-libraries, including pbdata, hdf and alignment.
+ .
+ This package contains the alignment sublibrary.
+
 Package: libpbseq
 Architecture: any
 Depends: ${misc:Depends},
-         libblasr (= ${binary:Version})
+         libblasr5.3.4 (= ${binary:Version})
 Description: library for analyzing PacBio sequencing data
  Blasr_libcpp is a library used by blasr and other executables such as
  samtoh5, loadPulses for analyzing PacBio sequences. This library contains
@@ -73,29 +102,3 @@ Description: tools for handling PacBio hdf5 files (development files)
  This package contains the header files and static library for the hdf
  sublibrary.
 
-Package: libblasr-dev
-Architecture: any
-Section: libdevel
-Depends: libblasr (= ${binary:Version}),
-         libpbdata-dev (= ${binary:Version}),
-         ${misc:Depends}
-Breaks: libblasr (<< 5.3.3)
-Replaces: libblasr (<< 5.3.3)
-Description: tools for aligning PacBio reads to target sequences (development files)
- Blasr_libcpp is a library used by blasr and other executables such as
- samtoh5, loadPulses for analyzing PacBio sequences. This library contains
- three sub-libraries, including pbdata, hdf and alignment.
- .
- This package contains the header files and static library for the alignment
- sublibrary.
-
-Package: libblasr
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Description: tools for aligning PacBio reads to target sequences
- Blasr_libcpp is a library used by blasr and other executables such as
- samtoh5, loadPulses for analyzing PacBio sequences. This library contains
- three sub-libraries, including pbdata, hdf and alignment.
- .
- This package contains the alignment sublibrary.


=====================================
debian/libblasr-dev.install deleted
=====================================
@@ -1,3 +0,0 @@
-usr/lib/*/libblasr.so
-usr/lib/*/pkgconfig
-usr/include/libblasr/*.h usr/include/pbseq


=====================================
debian/libblasr.install deleted
=====================================
@@ -1 +0,0 @@
-usr/lib/*/libblasr.so.*


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 hdf5-1.10.1-support.patch
 hdf5-1.10.0-support.patch
 meson.patch
+static+shared_lib.patch


=====================================
debian/patches/static+shared_lib.patch
=====================================
@@ -0,0 +1,10 @@
+--- a/meson.build
++++ b/meson.build
+@@ -6,6 +6,7 @@ project(
+     'buildtype=release',
+     'warning_level=3',
+     'cpp_std=c++14',
++    'default_library=both',
+     'b_ndebug=false'],
+   license : 'BSD-3',
+   meson_version : '>= 0.46.0')


=====================================
debian/rules
=====================================
@@ -39,6 +39,17 @@ override_dh_install:
 # defines.mk and build.mk files are symlinks and don't
 # get removed by the previous command
 	find debian/*/usr/include/ -name "*.mk" -delete
+	d-shlibmove --commit \
+		    --multiarch \
+		    --devunversioned \
+		    --exclude-la \
+		    --override s/libhdf5_serial_cpp103-dev/libhdf5-dev/ \
+		    --override s/libpbbam1.6.0-dev/libpbbam-dev/ \
+		    --override s/libpbcopper1.8.0-dev/libpbcopper-dev/ \
+		    --movedev debian/tmp/usr/include/libblasr usr/include \
+		    --movedev "debian/tmp/usr/lib/*/pkgconfig/*.pc" usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \
+		    debian/tmp/usr/lib/*/libblasr.so
+	mv debian/libblasr-dev/usr/include/libblasr debian/libblasr-dev/usr/include/pbseq
 	dh_install
 
 override_dh_auto_clean:



View it on GitLab: https://salsa.debian.org/med-team/pbseqlib/-/compare/ef5881f9f0e3d15b547e9e2452450673aa2c2ba4...f061848256e887d15db75c2d711578678e123332

-- 
View it on GitLab: https://salsa.debian.org/med-team/pbseqlib/-/compare/ef5881f9f0e3d15b547e9e2452450673aa2c2ba4...f061848256e887d15db75c2d711578678e123332
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/20201113/1fdf8e94/attachment-0001.html>


More information about the debian-med-commit mailing list