[med-svn] [Git][med-team/bamtools][master] 5 commits: multi-arch hints; restoration of includes to -dev

[Michael R. Crusoe]

Michael R. Crusoe pushed to branch master at Debian Med / bamtools


Commits:
5f3af98d by Michael R. Crusoe at 2018-04-03T03:38:02-07:00
multi-arch hints; restoration of includes to -dev

- - - - -
42189b21 by Michael R. Crusoe at 2018-04-03T04:18:50-07:00
Build the shared library

- - - - -
0724cc71 by Michael R. Crusoe at 2018-04-03T04:48:05-07:00
drop patches/0002-support-out-of-source-build.patch

- - - - -
e078f687 by Michael R. Crusoe at 2018-04-03T05:20:13-07:00
Match upstream's soname change

- - - - -
c97f17d6 by Michael R. Crusoe at 2018-04-03T05:30:41-07:00
Merge remote-tracking branch 'origin/master'

- - - - -


9 changed files:

- debian/bamtools.manpages
- debian/changelog
- debian/control
- debian/libbamtools-dev.install
- − debian/libbamtools2.4.0.install
- + debian/libbamtools2.5.1.install
- − debian/patches/0002-support-out-of-source-build.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/bamtools.manpages
=====================================
--- a/debian/bamtools.manpages
+++ b/debian/bamtools.manpages
@@ -1 +1 @@
-debian/*.1
+debian/bamtools.1


=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+bamtools (2.5.1+dfsg-2) unstable; urgency=medium
+
+  * Move /usr/includes to -dev from libbamtools2.4.0
+  * debian/control: add Multi-Arch hints and remove unneeded ${devlibs:Depends}
+  * Build the shared library.
+  * drop 0002-support-out-of-source-build patch, as this was fixed differently
+    upstream
+  * Match upstream's soname change
+
+ -- Michael R. Crusoe <michael.crusoe at gmail.com>  Tue, 03 Apr 2018 04:18:02 -0700
+
 bamtools (2.5.1+dfsg-1) unstable; urgency=medium
 
   [ Andreas Tille ]


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -53,9 +53,9 @@ Description: toolkit for manipulating BAM (genome alignment) files
 
 Package: libbamtools-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
-Depends: libbamtools2.4.0 (= ${binary:Version}),
-         ${devlibs:Depends},
+Depends: libbamtools2.5.1 (= ${binary:Version}),
          ${misc:Depends}
 Suggests: libbamtools-doc (= ${binary:Version})
 Description: C++ API for manipulating BAM (genome alignment) files
@@ -70,8 +70,9 @@ Description: C++ API for manipulating BAM (genome alignment) files
  .
  This is the developers API package.
 
-Package: libbamtools2.4.0
+Package: libbamtools2.5.1
 Architecture: any
+Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends}
@@ -89,6 +90,7 @@ Description: dynamic library for manipulating BAM (genome alignment) files
 
 Package: libbamtools-doc
 Architecture: all
+Multi-Arch: foreign
 Section: doc
 Depends: ${misc:Depends}
 Breaks: libbamtools-dev (<< 2.4.0+dsfg-6)


=====================================
debian/libbamtools-dev.install
=====================================
--- a/debian/libbamtools-dev.install
+++ b/debian/libbamtools-dev.install
@@ -1 +1,3 @@
+debian/tmp/usr/lib/*/*so
 debian/cmake	usr/share
+debian/tmp/usr/include/* usr/include/


=====================================
debian/libbamtools2.4.0.install deleted
=====================================
--- a/debian/libbamtools2.4.0.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/include/* usr/include/
-debian/tmp/usr/lib/* usr/lib/


=====================================
debian/libbamtools2.5.1.install
=====================================
--- /dev/null
+++ b/debian/libbamtools2.5.1.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/*/libbamtools.so.2*


=====================================
debian/patches/0002-support-out-of-source-build.patch deleted
=====================================
--- a/debian/patches/0002-support-out-of-source-build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Dominique Belhachemi <domibel at debian.org>
-Date: Fri, 21 Sep 2012 11:16:28 -0400
-Subject: support out-of-source build
-Forwarded: https://github.com/pezmaster31/bamtools/pull/117
----
- CMakeLists.txt             | 5 +++--
- src/ExportHeader.cmake     | 2 +-
- src/toolkit/CMakeLists.txt | 2 +-
- 3 files changed, 5 insertions(+), 4 deletions(-)
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -94,6 +94,7 @@ endif()
- 
- # add our includes root path
- include_directories( src )
-+include_directories("${CMAKE_BINARY_DIR}/include")
- 
- # list subdirectories to build in
- add_subdirectory( src )


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 doxygen-tweak
 0001-ignore-thirdparty-and-fix-jsoncpp.patch
-0002-support-out-of-source-build.patch
 0003-remove-custom-ExportHeader-function-use-install-inst.patch
 0006-Doxygen-reproducibility
 0008_Cmake_Test.patch


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,9 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow
 %:
 	dh $@
 
+override_dh_auto_configure-arch:
+	dh_auto_configure --arch -- -DBUILD_SHARED_LIBS=on
+
 override_dh_auto_configure-indep:
 
 override_dh_auto_test-indep:



View it on GitLab: https://salsa.debian.org/med-team/bamtools/compare/fb6bf98f870e5b4c57e2ccdeb7e9de10132de6f2...c97f17d64c63d658325a58779d9ca927084d9d18

---
View it on GitLab: https://salsa.debian.org/med-team/bamtools/compare/fb6bf98f870e5b4c57e2ccdeb7e9de10132de6f2...c97f17d64c63d658325a58779d9ca927084d9d18
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debian-med-commit/attachments/20180403/1b9ba037/attachment-0001.html>