debian/changelog

-pftools (3+dfsg-3) UNRELEASED; urgency=medium
+pftools (3+dfsg-3) unstable; urgency=medium
 
+  [ Steffen Moeller ]
   * debian/upsdtream/metadata:
     - Pointed out that there are no references in registries
     - yamllint cleanliness
 
- -- Steffen Moeller <moeller@debian.org>  Sat, 16 Sep 2017 16:41:54 +0200
+  [ Andreas Tille ]
+  * debhelper 11
+  * Point Vcs fields to salsa.debian.org
+  * Standards-Version: 4.2.1
+  * d/rules:
+     - Respect DEB_BUILD_OPTIONS in override_dh_auto_test
+     - Do not parse d/changelog
+
+ -- Andreas Tille <tille@debian.org>  Fri, 07 Sep 2018 13:05:57 +0200
 
 pftools (3+dfsg-2) unstable; urgency=medium
 

debian/compat

-10
+11

debian/control

 Source: pftools
-Section: science
-Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.org>
 Uploaders: Andreas Tille <tille@debian.org>
-Build-Depends: debhelper (>= 10),
+Section: science
+Priority: optional
+Build-Depends: debhelper (>= 11~),
                gfortran,
                autoconf-archive
-Standards-Version: 3.9.8
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/pftools.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/pftools.git
+Standards-Version: 4.2.1
+Vcs-Browser: https://salsa.debian.org/med-team/pftools
+Vcs-Git: https://salsa.debian.org/med-team/pftools.git
 Homepage: http://web.expasy.org/pftools/
 
 Package: pftools
 Architecture: any-amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Description: build and search protein and DNA generalized profiles
  The pftools package contains all the software necessary to build protein
  and DNA generalized profiles and use them to scan and align sequences,

debian/patches/fix_test_output.patch

@@ -2,7 +2,7 @@ Author: Andreas Tille <tille@debian.org>
 Last-Update: Tue, 21 Mar 2017 22:14:51 +0100
 Description: The test output seems to be created with pftools 2.3 and the
  output format has changed in version 3.  This patch adapts to slight
- formating changes (as well as the dropped PATH from test script).
+ formatting changes (as well as the dropped PATH from test script).
  .
  Note: There are more relevant differences than just spacing which are
  not fixed in this patch.

debian/rules

@@ -2,7 +2,7 @@
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
-DEBPKGNAME     := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
+include /usr/share/dpkg/default.mk
 
 %:
 	dh $@
@@ -10,21 +10,22 @@ DEBPKGNAME     := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
 override_dh_auto_install:
 	dh_auto_install
 	# Avoid name spacing conflict with htop and consequently also rename gtop
-	mv debian/$(DEBPKGNAME)/usr/bin/gtop debian/$(DEBPKGNAME)/usr/bin/pfgtop
-	mv debian/$(DEBPKGNAME)/usr/bin/htop debian/$(DEBPKGNAME)/usr/bin/pfhtop
+	mv debian/$(DEB_SOURCE)/usr/bin/gtop debian/$(DEB_SOURCE)/usr/bin/pfgtop
+	mv debian/$(DEB_SOURCE)/usr/bin/htop debian/$(DEB_SOURCE)/usr/bin/pfhtop
 
 override_dh_installman:
 	dh_installman
-	mv debian/$(DEBPKGNAME)/usr/share/man/man1/gtop.1 debian/$(DEBPKGNAME)/usr/share/man/man1/pfgtop.1
-	mv debian/$(DEBPKGNAME)/usr/share/man/man1/htop.1 debian/$(DEBPKGNAME)/usr/share/man/man1/pfhtop.1
+	mv debian/$(DEB_SOURCE)/usr/share/man/man1/gtop.1 debian/$(DEB_SOURCE)/usr/share/man/man1/pfgtop.1
+	mv debian/$(DEB_SOURCE)/usr/share/man/man1/htop.1 debian/$(DEB_SOURCE)/usr/share/man/man1/pfhtop.1
 
 override_dh_installexamples:
 	dh_installexamples
 	sed -i \
 	    -e 's:^\([gh]top\) :pf\1 :' \
-	    debian/$(DEBPKGNAME)/usr/share/doc/$(DEBPKGNAME)/examples/test.sh
+	    debian/$(DEB_SOURCE)/usr/share/doc/$(DEB_SOURCE)/examples/test.sh
 
 override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	dh_auto_test
 	export PATH=$(CURDIR)/src/Fortran/:$(PATH) ; \
 	echo $${PATH} ; \
@@ -34,3 +35,4 @@ override_dh_auto_test:
 	        -e '/^DT  */d' > test.build ; \
 	grep -v '^DT  *' test.out > test.compare ; \
 	diff -u test.compare test.build || true
+endif