Michael R. Crusoe pushed to branch master at Debian Med / bamtools
Commits: 3b4f8262 by Michael R. Crusoe at 2018-04-02T09:25:03-07:00 fix tests - - - - - 571479e4 by Michael R. Crusoe at 2018-04-02T09:27:02-07:00 is this needed? - - - - - f5b38152 by Michael R. Crusoe at 2018-04-02T09:29:49-07:00 remove unused variables - - - - - 6300be92 by Michael R. Crusoe at 2018-04-02T09:31:26-07:00 populate package - - - - - 4dd10895 by Michael R. Crusoe at 2018-04-02T09:39:45-07:00 remove - - - - - d2af27f6 by Michael R. Crusoe at 2018-04-02T09:40:02-07:00 try hardening - - - - - 6ab85109 by Michael R. Crusoe at 2018-04-02T09:45:22-07:00 cme fix dpkg - - - - - b317d76b by Michael R. Crusoe at 2018-04-02T09:50:00-07:00 changelog - - - - - c4166033 by Michael R. Crusoe at 2018-04-02T09:53:44-07:00 Merge remote-tracking branch 'origin/master' - - - - - 5 changed files: - debian/changelog - debian/control - debian/copyright - + debian/libbamtools2.4.0.install - debian/rules Changes: ===================================== debian/changelog ===================================== --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,17 @@ -bamtools (2.5.1+dfsg-1) UNRELEASED; urgency=medium +bamtools (2.5.1+dfsg-1) unstable; urgency=medium + [ Andreas Tille ] * New upstream version * cme fix dpkg-control * debhelper 11 - -- Andreas Tille <[email protected]> Tue, 06 Feb 2018 10:08:37 +0100 + [ Michael R. Crusoe ] + * Make release ready with cme fix dpkg + * fix built in tests + * debian/rules: remove unused variables; drop custom library install; add + hardening + + -- Michael R. Crusoe <[email protected]> Mon, 02 Apr 2018 09:47:32 -0700 bamtools (2.4.1+dfsg-2) unstable; urgency=medium ===================================== debian/control ===================================== --- a/debian/control +++ b/debian/control @@ -1,12 +1,12 @@ Source: bamtools Maintainer: Debian Med Packaging Team <[email protected]> -Uploaders: Michael R. Crusoe <[email protected]>, +Uploaders: Michael R. Crusoe <[email protected]>, Andreas Tille <[email protected]>, Kevin Murray <[email protected]>, Dominique Belhachemi <[email protected]> Section: science Priority: optional -Build-Depends: debhelper (>= 11~), +Build-Depends: debhelper (>= 11), d-shlibs (>= 0.56), cmake, zlib1g-dev, ===================================== debian/copyright ===================================== --- a/debian/copyright +++ b/debian/copyright @@ -1,13 +1,13 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: BamTools Source: https://github.com/pezmaster31/bamtools Files-Excluded: src/third_party Files: * Copyright: 2009-2012 Derek Barnett <[email protected]> - 2009-2010 Erik Garrison - 2009-2010 Gabor Marth - 2009-2010 Michael Stromberg + 2009-2010 Erik Garrison + 2009-2010 Gabor Marth + 2009-2010 Michael Stromberg License: Expat Files: debian/* @@ -35,4 +35,3 @@ License: Expat LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - ===================================== debian/libbamtools2.4.0.install ===================================== --- /dev/null +++ b/debian/libbamtools2.4.0.install @@ -0,0 +1,2 @@ +debian/tmp/usr/include/* usr/include/ +debian/tmp/usr/lib/* usr/lib/ ===================================== debian/rules ===================================== --- a/debian/rules +++ b/debian/rules @@ -1,18 +1,22 @@ #!/usr/bin/make -f # -*- makefile -*- -DEBPKGNAME := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}') - # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +export DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow + %: - dh $@ --parallel + dh $@ override_dh_auto_configure-indep: override_dh_auto_test-indep: +override_dh_auto_test-arch: + cd obj-* && ln -s src/toolkit/ bin + dh_auto_test --arch + override_dh_auto_build-indep: doxygen -u docs/Doxyfile doxygen docs/Doxyfile @@ -23,26 +27,9 @@ override_dh_install-indep: rm -f debian/libbamtools-doc/usr/share/doc/libbamtools-dev/html/jquery.js ln -s /usr/share/javascript/jquery/jquery.js debian/libbamtools-doc/usr/share/doc/libbamtools-dev/html/jquery.js -override_dh_install-arch: - d-shlibmove --commit \ - --multiarch \ - --devunversioned \ - --exclude-la \ - --movedev debian/tmp/usr/include/* usr/include \ - debian/tmp/usr/lib/lib*.so - dh_install --arch - # no need to install different versions of bamtools - rm -rf debian/$(DEBPKGNAME)/usr/bin/$(DEBPKGNAME) - mv debian/$(DEBPKGNAME)/usr/bin/$(DEBPKGNAME)-[0-9]* debian/$(DEBPKGNAME)/usr/bin/$(DEBPKGNAME) - #override_dh_installman: # LD_LIBRARY_PATH=debian/tmp/usr/lib:${LD_LIBRARY_PATH} help2man --name "a command-line toolkit for reading, writing, and manipulating BAM (genome alignment) files" --no-info --no-discard-stderr debian/tmp/usr/bin/bamtools > debian/bamtools.1 -SOURCEPKG=$(shell dpkg-parsechangelog | sed -n 's/^Source: \(.*\)/\1/p') -UPSTREAM=$(shell dpkg-parsechangelog | sed -n 's/^Version: \(.*\)-[^-]*/\1/p') -SHA1=$(lastword $(subst ~g, ,$(UPSTREAM))) -ORIG=${SOURCEPKG}_${UPSTREAM}.orig.tar - describe-current-version: git describe --tags upstream | sed 's,^release-,,;s,-,+,;s,-,~,;' View it on GitLab: https://salsa.debian.org/med-team/bamtools/compare/58503335886153bc16a95eaff2e983f23c3683fb...c41660335d49d564ba3493e7f9dc39754f7940df --- View it on GitLab: https://salsa.debian.org/med-team/bamtools/compare/58503335886153bc16a95eaff2e983f23c3683fb...c41660335d49d564ba3493e7f9dc39754f7940df You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
