[Python-apps-commits] r14344 - in packages/sabnzbdplus/trunk/debian (changelog rules)

[jcfp-guest at users.alioth.debian.org]

    Date: Friday, August 25, 2017 @ 17:02:55
  Author: jcfp-guest
Revision: 14344

Rules: include /usr/share/dpkg/pkg-info.mk

Modified:
  packages/sabnzbdplus/trunk/debian/changelog
  packages/sabnzbdplus/trunk/debian/rules

Modified: packages/sabnzbdplus/trunk/debian/changelog
===================================================================
--- packages/sabnzbdplus/trunk/debian/changelog	2017-08-24 22:58:38 UTC (rev 14343)
+++ packages/sabnzbdplus/trunk/debian/changelog	2017-08-25 17:02:55 UTC (rev 14344)
@@ -37,6 +37,9 @@
   * Bump Standards-Version to 4.1.0.0 (from 3.9.8; no further changes).
   * Docs: remove README.txt to prevent duplicate (already installed as
     changelog via d/rules).
+  * Rules: include /usr/share/dpkg/pkg-info.mk and use its
+    DEB_{SOURCE,VERSION} vars instead of parsing the output of dpkg-
+    parsechangelog.
 
  -- JCF Ploemen (jcfp) <linux at jcf.pm>  Wed, 07 Dec 2016 10:58:24 +0000
 

Modified: packages/sabnzbdplus/trunk/debian/rules
===================================================================
--- packages/sabnzbdplus/trunk/debian/rules	2017-08-24 22:58:38 UTC (rev 14343)
+++ packages/sabnzbdplus/trunk/debian/rules	2017-08-25 17:02:55 UTC (rev 14344)
@@ -4,6 +4,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# Provides the DEB_{SOURCE,VERSION} vars used by the get-orig-source target
+include /usr/share/dpkg/pkg-info.mk
+
 # Install directory
 DESTDIR=$(CURDIR)/debian/sabnzbdplus
 
@@ -43,10 +46,10 @@
 
 
 DEB_DIR := $(abspath $(dir $(MAKEFILE_LIST)))
-DEB_SRC := $(shell dpkg-parsechangelog -l$(DEB_DIR)/changelog --show-field Source)
+DEB_SRC := $(DEB_SOURCE)
 DEB_TAG := +dfsg
 # clean upstream version
-UPS_VER := $(shell dpkg-parsechangelog -l$(DEB_DIR)/changelog --show-field Version | sed 's/.*://; s/-[^-]*$$//; s/\+.*//')
+UPS_VER := $(shell echo $(DEB_VERSION_UPSTREAM) | sed 's/\+.*//')
 # basedir inside upstream tarball
 UPS_DIR := SABnzbd-$(UPS_VER)