[med-svn] [fis-gtm] 02/03: do not parse d/changelog

Andreas Tille tille at debian.org
Wed Jan 3 21:18:09 UTC 2018


This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository fis-gtm.

commit 7481c979887d7bce36113ce779cd7bda8bb2004f
Author: Andreas Tille <tille at debian.org>
Date:   Wed Jan 3 21:52:07 2018 +0100

    do not parse d/changelog
---
 debian/changelog | 1 +
 debian/rules     | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0a93e2d..92f9da2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ fis-gtm (6.3-002-4) UNRELEASED; urgency=medium
   * Switch Build-Depends from libconfig8-dev to libconfig-dev
     Closes: #881368
   * Standards-Version: 4.1.3
+  * do not parse d/changelog
 
   [ Amul Shah ]
   * Address fis-gtm FTBFS with linux-libc-dev 4.14.2-1
diff --git a/debian/rules b/debian/rules
index 896e391..6f20e5b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,12 +5,12 @@
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
 
+include /usr/share/dpkg/default.mk
+
 MARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 ARCH := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
-UVER := $(shell LC_ALL=C dpkg-parsechangelog | awk '/^Version:/{sub(/-[0-9]*$$/,"");print $$2;}')
-UAPIVER := $(shell echo $(UVER) | sed -e 's,+.*,,')
+UAPIVER := $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's,+.*,,')
 UAPIDIR := V$(UAPIVER)_$(ARCH)
-SRCPKG := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
 BINPKG := $(shell awk '/Package:.*[0-9]/{print $$2;}' debian/control)
 GTM_INSTALL_DIR := lib/$(MARCH)/fis-gtm/$(UAPIDIR)
 LOCAL_GTM_INSTALL_DIR := $(CURDIR)/debian/$(BINPKG)/usr/$(GTM_INSTALL_DIR)
@@ -111,7 +111,7 @@ override_dh_lintian:
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf debian/$(BINPKG)-stage1
-	rm -f debian/fis-gtm.links debian/fis-gtm-$(UVER).lintian-overrides
+	rm -f debian/fis-gtm.links debian/fis-gtm-$(DEB_VERSION_UPSTREAM).lintian-overrides
 
 get-orig-source:
 	mkdir -p ../tarballs

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/fis-gtm.git



More information about the debian-med-commit mailing list