Andreas Tille pushed to branch master at Debian Med / bamtools
Commits: c60460a9 by Andreas Tille at 2020-05-27T11:10:07+02:00 routine-update: Standards-Version: 4.5.0 - - - - - fc4d0df2 by Andreas Tille at 2020-05-27T11:10:07+02:00 routine-update: debhelper-compat 13 - - - - - 652db08e by Andreas Tille at 2020-05-27T11:10:13+02:00 routine-update: Add salsa-ci file - - - - - eddb4243 by Andreas Tille at 2020-05-27T11:10:13+02:00 routine-update: Rules-Requires-Root: no - - - - - 48ace284 by Andreas Tille at 2020-05-27T11:10:15+02:00 Set upstream metadata fields: Bug-Submit. Fixes: lintian: upstream-metadata-missing-bug-tracking See-also: https://lintian.debian.org/tags/upstream-metadata-missing-bug-tracking.html - - - - - ef1282de by Andreas Tille at 2020-05-27T11:20:47+02:00 Use d-shlibs - - - - - 3cccbac2 by Andreas Tille at 2020-05-27T12:14:40+02:00 Build additional static lib - - - - - 02a1aa37 by Andreas Tille at 2020-05-27T12:17:31+02:00 Upload to unstable - - - - - 9 changed files: - debian/changelog - debian/control - debian/libbamtools-dev.install - − debian/libbamtools2.5.1.install - debian/patches/series - + debian/patches/shared_and_static.patch - debian/rules - + debian/salsa-ci.yml - debian/upstream/metadata Changes: ===================================== debian/changelog ===================================== @@ -1,9 +1,16 @@ -bamtools (2.5.1+dfsg-6) UNRELEASED; urgency=medium +bamtools (2.5.1+dfsg-6) unstable; urgency=medium * Add IsSupplementaryAlignment() patch from bamtools code copy shipped with tiddit - - -- Andreas Tille <[email protected]> Wed, 27 May 2020 09:59:29 +0200 + * Standards-Version: 4.5.0 (routine-update) + * debhelper-compat 13 (routine-update) + * Add salsa-ci file (routine-update) + * Rules-Requires-Root: no (routine-update) + * Set upstream metadata fields: Bug-Submit. + * Use d-shlibs + * Build additional static lib + + -- Andreas Tille <[email protected]> Wed, 27 May 2020 12:14:50 +0200 bamtools (2.5.1+dfsg-5) unstable; urgency=medium ===================================== debian/control ===================================== @@ -6,17 +6,18 @@ Uploaders: Michael R. Crusoe <[email protected]>, Dominique Belhachemi <[email protected]> Section: science Priority: optional -Build-Depends: debhelper-compat (= 12), +Build-Depends: debhelper-compat (= 13), d-shlibs, cmake, zlib1g-dev, libjsoncpp-dev, help2man, doxygen -Standards-Version: 4.4.1 +Standards-Version: 4.5.0 Vcs-Browser: https://salsa.debian.org/med-team/bamtools Vcs-Git: https://salsa.debian.org/med-team/bamtools.git Homepage: https://github.com/pezmaster31/bamtools/wiki +Rules-Requires-Root: no Package: bamtools Architecture: any ===================================== debian/libbamtools-dev.install ===================================== @@ -1,3 +1 @@ -debian/tmp/usr/lib/*/*so debian/cmake usr/share -debian/tmp/usr/include/* usr/include/ ===================================== debian/libbamtools2.5.1.install deleted ===================================== @@ -1 +0,0 @@ -debian/tmp/usr/lib/*/libbamtools.so.2* ===================================== debian/patches/series ===================================== @@ -5,3 +5,4 @@ doxygen-tweak 0008_Cmake_Test.patch spelling tiddit.patch +shared_and_static.patch ===================================== debian/patches/shared_and_static.patch ===================================== @@ -0,0 +1,32 @@ +Description: Build additional static lib +Author: Andreas Tille <[email protected]> +Last-Update: Wed, 27 May 2020 09:59:29 +0200 + +--- a/src/api/CMakeLists.txt ++++ b/src/api/CMakeLists.txt +@@ -38,18 +38,24 @@ if( WIN32 ) + endif() + + # create main BamTools API library +-add_library( BamTools ${BamToolsAPISources} ) ++add_library( BamTools SHARED ${BamToolsAPISources} ) ++add_library( BamTools_static STATIC ${BamToolsAPISources} ) + # The SONAME is bumped on every version increment + # as Bamtools does not yet guarantee a stable ABI + set_target_properties( BamTools PROPERTIES + SOVERSION "${BamTools_VERSION}" + OUTPUT_NAME "bamtools" ) ++set_target_properties( BamTools_static PROPERTIES ++ OUTPUT_NAME "bamtools" ) + target_include_directories( BamTools PRIVATE "${ZLIB_INCLUDE_DIRS}" ) + target_link_libraries( BamTools PRIVATE "${ZLIB_LIBRARIES}" "${WIN32_LIBRARIES}" ) + install( TARGETS BamTools + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ) ++install( TARGETS BamTools_static ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ) + + install( FILES api_global.h DESTINATION "include/bamtools/api" COMPONENT Development ) + install( FILES BamAlgorithms.h DESTINATION "include/bamtools/api" COMPONENT Development ) ===================================== debian/rules ===================================== @@ -9,11 +9,6 @@ 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: override_dh_auto_test-arch: @@ -27,6 +22,16 @@ override_dh_auto_build-indep: doxygen docs/Doxyfile mv docs/Doxyfile.bak docs/Doxyfile +override_dh_install-arch: + dh_install --arch + d-shlibmove --commit \ + --multiarch \ + --devunversioned \ + --exclude-la \ + --movedev debian/tmp/usr/include/* usr/include \ + --movedev "debian/tmp/usr/lib/*/pkgconfig/*.pc" usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \ + debian/tmp/usr/lib/*/*.so + override_dh_install-indep: dh_install --indep rm -f debian/libbamtools-doc/usr/share/doc/libbamtools-dev/html/jquery.js ===================================== debian/salsa-ci.yml ===================================== @@ -0,0 +1,4 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml ===================================== debian/upstream/metadata ===================================== @@ -1,3 +1,4 @@ +Bug-Submit: https://github.com/pezmaster31/bamtools/issues/new Reference: - Author: > Derek W. Barnett and Erik K. Garrison and Aaron R. Quinlan and View it on GitLab: https://salsa.debian.org/med-team/bamtools/-/compare/130504f9b81c0bfe865a9da2a3feb30e62052463...02a1aa379c7b8378e13d5dea928d2394042a4a4d -- View it on GitLab: https://salsa.debian.org/med-team/bamtools/-/compare/130504f9b81c0bfe865a9da2a3feb30e62052463...02a1aa379c7b8378e13d5dea928d2394042a4a4d You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
