[med-svn] [Git][med-team/radiant][master] 6 commits: debhelper 11

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / radiant


Commits:
31b200d2 by Andreas Tille at 2018-08-24T13:57:51Z
debhelper 11

- - - - -
761bf055 by Andreas Tille at 2018-08-24T13:57:53Z
Point Vcs fields to salsa.debian.org

- - - - -
1dc9a442 by Andreas Tille at 2018-08-24T13:57:53Z
Standards-Version: 4.2.0

- - - - -
fdd5ed72 by Andreas Tille at 2018-08-24T14:04:29Z
Fix perl interpreter

- - - - -
73f4f0cf by Andreas Tille at 2018-08-24T14:07:29Z
do not parse d/changelog

- - - - -
e06a49f3 by Andreas Tille at 2018-08-24T14:08:19Z
Upload to unstable

- - - - -


4 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+radiant (2.7+dfsg-2) unstable; urgency=medium
+
+  * debhelper 11
+  * Point Vcs fields to salsa.debian.org
+  * Standards-Version: 4.2.0
+  * d/rules:
+     - Fix perl interpreter
+     - do not parse d/changelog
+
+ -- Andreas Tille <tille at debian.org>  Fri, 24 Aug 2018 16:07:45 +0200
+
 radiant (2.7+dfsg-1) unstable; urgency=medium
 
   * Initial release (Closes: #832613)


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


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,10 @@ 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 (>= 9)
-Standards-Version: 3.9.8
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/kronatools.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/kronatools.git
+Build-Depends: debhelper (>= 11~)
+Standards-Version: 4.2.0
+Vcs-Browser: https://salsa.debian.org/med-team/radiant
+Vcs-Git: https://salsa.debian.org/med-team/radiant.git
 Homepage: https://github.com/marbl/Krona/wiki
 
 Package: radiant


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -2,11 +2,10 @@
 
 # DH_VERBOSE := 1
 
-DEBPKGNAME     := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
-DEBVERS        := $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
-VERSION        := $(shell echo '$(DEBVERS)' | sed -e 's/^[0-9]*://' -e 's/-.*//')
-MANDIR=$(CURDIR)/debian/$(DEBPKGNAME)/usr/share/man/man1/
-HELP2MAN = help2man --no-info --version-string="$(VERSION)" --no-discard-stderr --help-option=" "
+include /usr/share/dpkg/default.mk
+
+MANDIR=$(CURDIR)/debian/$(DEB_SOURCE)/usr/share/man/man1/
+HELP2MAN = help2man --no-info --version-string="$(DEB_VERSION_UPSTREAM)" --no-discard-stderr --help-option=" "
 # --help-option=" -h" # does not work in all cases
 
 %:
@@ -14,13 +13,16 @@ HELP2MAN = help2man --no-info --version-string="$(VERSION)" --no-discard-stderr 
 
 override_dh_install:
 	dh_install
-	debian/install.pl -prefix debian/$(DEBPKGNAME)/usr -taxonomy /var/lib/$(DEBPKGNAME)/taxonomy -scriptpath "../share/perl5/KronaTools/scripts"
+	debian/install.pl -prefix debian/$(DEB_SOURCE)/usr -taxonomy /var/lib/$(DEB_SOURCE)/taxonomy -scriptpath "../share/perl5/KronaTools/scripts"
+	for pl in `find debian -name "*.pl"` ; do \
+	    sed -i '1s?^#!/usr/bin/env.*perl?#!/usr/bin/perl?' $${pl} ; \
+	done
 
 override_dh_installman_does_not_work__giving_up:
 	dh_installman
 	mkdir -p $(MANDIR)
 	set -x ; \
-	for script in debian/$(DEBPKGNAME)/usr/bin/* ; do \
+	for script in debian/$(DEB_SOURCE)/usr/bin/* ; do \
 	    name=`basename $${script}` ; \
 	    pscript=`echo $${name} | sed 's:^kt\(.*\):\1.pl:'` ; \
 	    pl="KronaTools/scripts/$${pscript}" ; \



View it on GitLab: https://salsa.debian.org/med-team/radiant/compare/e35f8b8e8ac7ba50d88ae66a036d101e585a9b10...e06a49f34a45f14168ce743c77e814b2efae872a

-- 
View it on GitLab: https://salsa.debian.org/med-team/radiant/compare/e35f8b8e8ac7ba50d88ae66a036d101e585a9b10...e06a49f34a45f14168ce743c77e814b2efae872a
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/20180824/2a0d3fed/attachment-0001.html>