[med-svn] [Git][med-team/seer][master] 7 commits: debhelper 11

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / seer


Commits:
e806f525 by Andreas Tille at 2018-10-11T14:22:27Z
debhelper 11

- - - - -
083fa5b6 by Andreas Tille at 2018-10-11T14:22:31Z
Point Vcs fields to salsa.debian.org

- - - - -
215775d7 by Andreas Tille at 2018-10-11T14:22:31Z
Standards-Version: 4.2.1

- - - - -
461316e9 by Andreas Tille at 2018-10-11T17:55:39Z
Spelling

- - - - -
296c9085 by Andreas Tille at 2018-10-11T17:57:39Z
Do not parse d/changelog

- - - - -
07ff7c8b by Andreas Tille at 2018-10-11T17:59:20Z
Respect DEB_BUILD_OPTIONS in override_dh_auto_test

- - - - -
875a1b59 by Andreas Tille at 2018-10-11T18:02:36Z
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/compat
- debian/control
- debian/patches/fix_lib_location.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+seer (1.1.4-2) unstable; urgency=medium
+
+  * debhelper 11
+  * Point Vcs fields to salsa.debian.org
+  * Standards-Version: 4.2.1
+  * d/rules:
+     - Do not parse d/changelog
+     - Respect DEB_BUILD_OPTIONS in override_dh_auto_test
+
+ -- Andreas Tille <tille at debian.org>  Thu, 11 Oct 2018 19:59:27 +0200
+
 seer (1.1.4-1) unstable; urgency=medium
 
   * New upstream version


=====================================
debian/compat
=====================================
@@ -1 +1 @@
-10
+11


=====================================
debian/control
=====================================
@@ -3,7 +3,7 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 Uploaders: Andreas Tille <tille at debian.org>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 11~),
                libarmadillo-dev  (>= 1:6.700.6+dfsg-1~),
                libdlib-dev,
                libhdf5-dev,
@@ -11,9 +11,9 @@ Build-Depends: debhelper (>= 10),
                libgzstream-dev,
                libboost-dev,
                libboost-program-options-dev
-Standards-Version: 4.1.0
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/seer.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/seer.git
+Standards-Version: 4.2.1
+Vcs-Browser: https://salsa.debian.org/med-team/seer
+Vcs-Git: https://salsa.debian.org/med-team/seer.git
 Homepage: https://github.com/johnlees/seer
 
 Package: seer


=====================================
debian/patches/fix_lib_location.patch
=====================================
@@ -1,6 +1,6 @@
 Author: Andreas Tille <tille at debian.org>
 Last-Update: Tue, 29 Mar 2016 19:32:29 +0200
-Description: Remove non-existing library pathes
+Description: Remove non-existing library paths
 
 --- a/src/Makefile
 +++ b/src/Makefile


=====================================
debian/rules
=====================================
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
 
 # DH_VERBOSE := 1
-DEBPKGNAME     := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
 
+include /usr/share/dpkg/default.mk
 include /usr/share/dpkg/architecture.mk
 export CPATH := /usr/include/hdf5/serial
 export LIBRARY_PATH := /usr/lib/$(DEB_TARGET_MULTIARCH)/hdf5/serial
@@ -12,16 +12,18 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 CMAKE_EXTRA_FLAGS += -DARMA_USE_HDF5=1
 
 override_dh_auto_install:
-	dh_auto_install -- PREFIX=$(CURDIR)/debian/$(DEBPKGNAME)/usr
+	dh_auto_install -- PREFIX=$(CURDIR)/debian/$(DEB_SOURCE)/usr
 	for pl in scripts/*.pl ; do \
 	    plbase=`basename $${pl} .pl` ; \
-	    sed "s+Usage: ./$${plbase}.pl+Usage: $${plbase}+" $${pl} > $(CURDIR)/debian/$(DEBPKGNAME)/usr/bin/$${plbase} ; \
+	    sed "s+Usage: ./$${plbase}.pl+Usage: $${plbase}+" $${pl} > $(CURDIR)/debian/$(DEB_SOURCE)/usr/bin/$${plbase} ; \
 	done
 	# Fix broken usage hint:
-	sed -i "s+Usage: ./hits_to_matrix.pl+Usage: reformat_output+" $(CURDIR)/debian/$(DEBPKGNAME)/usr/bin/reformat_output
+	sed -i "s+Usage: ./hits_to_matrix.pl+Usage: reformat_output+" $(CURDIR)/debian/$(DEB_SOURCE)/usr/bin/reformat_output
 
 %:
 	dh $@
 
 override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	if dh_auto_test ; then echo Test passed ; else echo '****************************** TEST FAILED.  Please contact upstream *******************************' ; fi
+endif
\ No newline at end of file



View it on GitLab: https://salsa.debian.org/med-team/seer/compare/13e528162b139bc9e30b75552a86ef376d280372...875a1b598e74380151c59fa6fa8240dc4fdca59e

-- 
View it on GitLab: https://salsa.debian.org/med-team/seer/compare/13e528162b139bc9e30b75552a86ef376d280372...875a1b598e74380151c59fa6fa8240dc4fdca59e
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/20181011/30e2a7eb/attachment-0001.html>