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

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / cain


Commits:
c52b6fe9 by Andreas Tille at 2018-07-13T16:02:04+02:00
debhelper 11

- - - - -
c2477f9e by Andreas Tille at 2018-07-13T16:02:07+02:00
Point Vcs fields to salsa.debian.org

- - - - -
4d91853d by Andreas Tille at 2018-07-13T16:02:07+02:00
Standards-Version: 4.1.5

- - - - -
d4eb5dcd by Andreas Tille at 2018-07-13T16:08:45+02:00
Remove unneeded get-orig-source target

- - - - -
fd8391b5 by Andreas Tille at 2018-07-13T16:14:36+02:00
do not parse d/changelog

- - - - -
4f3ec2b5 by Andreas Tille at 2018-07-13T17:12:20+02:00
Leave date in proper format at the expense of parsing changelog date

- - - - -
77bcd450 by Andreas Tille at 2018-07-13T17:17:37+02:00
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/compat
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,18 @@
-cain (1.10+dfsg-3) UNRELEASED; urgency=medium
+cain (1.10+dfsg-3) unstable; urgency=medium
 
+  [ Steffen Moeller ]
   * debian/upstream/metadata:
     - Added references to registries
     - yamllint cleanliness
  
- -- Steffen Moeller <moeller at debian.org>  Thu, 14 Sep 2017 09:58:47 +0200
+  [ Andreas Tille ]
+  * debhelper 11
+  * Point Vcs fields to salsa.debian.org
+  * Standards-Version: 4.1.5
+  * Remove unneeded get-orig-source target
+  * d/rules: do not parse d/changelog where possible
+
+ -- Andreas Tille <tille at debian.org>  Fri, 13 Jul 2018 17:12:44 +0200
 
 cain (1.10+dfsg-2) unstable; urgency=medium
 


=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+11


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,14 @@ Uploaders: Ivo Maintz <ivo at maintz.de>,
            Andreas Tille <tille at debian.org>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 11~),
                python-all-dev,
                python (<< 3.0),
                libeigen3-dev,
                zip
-Standards-Version: 3.9.8
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/cain.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/cain.git
+Standards-Version: 4.1.5
+Vcs-Browser: https://salsa.debian.org/med-team/cain
+Vcs-Git: https://salsa.debian.org/med-team/cain.git
 Homepage: http://cain.sourceforge.net
 
 Package: cain


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -5,10 +5,9 @@
 SRC_TMP=$(CURDIR)/SRC_TMP
 debtmp := $(CURDIR)/debian/tmp
 
-pkg := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
-VERSION := $(shell dpkg-parsechangelog | grep Version | cut -d\  -f2 | cut -d- -f1)
-UVERSION := $(shell dpkg-parsechangelog | grep Version | cut -d\  -f2 | cut -d- -f1 | sed 's/\./_/g')
+include /usr/share/dpkg/default.mk
 BUILD_DATE := $(shell dpkg-parsechangelog | grep Date: | cut -d' ' -f2-7)
+
 export TZ=UTC
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
@@ -25,22 +24,17 @@ override_dh_auto_build:
 
 override_dh_install-indep:
 	dh_install
-	rm -rf debian/$(pkg)/usr/share/cain/help/* debian/$(pkg)/usr/share/cain/gui/help.htm*
+	rm -rf debian/$(DEB_SOURCE)/usr/share/cain/help/* debian/$(DEB_SOURCE)/usr/share/cain/gui/help.htm*
 	find help -type d | xargs chmod 755
 	find help -type f | xargs chmod 644
 	find help | xargs touch --no-dereference --date='$(BUILD_DATE)'
 	cd help && (find . -type f -not \( -name "*.htb" -or -name "*.htd" \) -print0 | \
           LC_ALL=C sort -z | \
-          xargs -0 zip ../debian/$(pkg)/usr/share/cain/help/cain.htb -X -r -q)
-	touch --no-dereference --date='$(BUILD_DATE)' debian/$(pkg)/usr/share/cain/help/cain.htb
-	if [ -d debian/$(pkg)/usr/share/cain/ ] ; then \
-	    find debian/$(pkg)/usr/share/cain/ -type f -executable -exec chmod 644 {} + ; \
+          xargs -0 zip ../debian/$(DEB_SOURCE)/usr/share/cain/help/cain.htb -X -r -q)
+	touch --no-dereference --date='$(BUILD_DATE)' debian/$(DEB_SOURCE)/usr/share/cain/help/cain.htb
+	if [ -d debian/$(DEB_SOURCE)/usr/share/cain/ ] ; then \
+	    find debian/$(DEB_SOURCE)/usr/share/cain/ -type f -executable -exec chmod 644 {} + ; \
 	fi
 
 override_dh_auto_test:
 	echo "no tests implemented"
-
-get-orig-source:
-	uscan --verbose --force-download --repack --compression xz
-#	find $(SRC_TMP) -type f -exec chmod 644 {} +
-#	find $(SRC_TMP) -type d -exec chmod 755 {} +



View it on GitLab: https://salsa.debian.org/med-team/cain/compare/99e7447bff584db797cd4e4e93c5fd4f4e770be6...77bcd450d2595af4c4c48ec5026a1fb8faef7697

-- 
View it on GitLab: https://salsa.debian.org/med-team/cain/compare/99e7447bff584db797cd4e4e93c5fd4f4e770be6...77bcd450d2595af4c4c48ec5026a1fb8faef7697
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/20180713/f4840a65/attachment-0001.html>