[Pgp-tools-commit] r894 - in trunk: . debian

[Guilhem Moulin]

Author: guilhem
Date: 2017-07-07 15:05:15 +0000 (Fri, 07 Jul 2017)
New Revision: 894

Modified:
   trunk/Makefile
   trunk/debian/changelog
   trunk/debian/rules
Log:
Avoid parsing dpkg-parsechangelog(1) output.

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2017-07-07 15:05:09 UTC (rev 893)
+++ trunk/Makefile	2017-07-07 15:05:15 UTC (rev 894)
@@ -1,9 +1,9 @@
+-include /usr/share/dpkg/pkg-info.mk
+
 DIRS=caff gpg-key2ps gpg-mailkeys gpgsigs gpglist gpgparticipants keyanalyze keylookup \
      sig2dot springgraph gpgwrap gpgdir keyart gpg-key2latex
-VERSION=$(shell dpkg-parsechangelog 2>&1 | perl -ne 'print $$1 if /^Version: ([^-]*)/')
-DEBVERSION=$(shell dpkg-parsechangelog 2>&1 | perl -ne 'print $$1 if /^Version: (.*)/')
-TGZ=../signing-party_$(VERSION).orig.tar.gz
-TGZ_DIR=signing-party-$(VERSION)
+TGZ=../signing-party_$(DEB_VERSION_UPSREAM).orig.tar.gz
+TGZ_DIR=signing-party-$(DEB_VERSION_UPSREAM)
 
 all:
 	for dir in $(DIRS) ; do if [ -f $$dir/Makefile ] ; then $(MAKE) -C $$dir || exit 1 ; fi ; done
@@ -24,13 +24,13 @@
 	rm -rf $(TGZ_DIR)
 
 tag-release:
-	if svn ls svn+ssh://svn.debian.org/svn/pgp-tools/tags/release-$(VERSION) >/dev/null 2>&1; then \
+	if svn ls svn+ssh://svn.debian.org/svn/pgp-tools/tags/release-$(DEB_VERSION_UPSREAM) >/dev/null 2>&1; then \
 		echo "Already exists." >&2; exit 1; \
 	fi
-	svn cp -m 'tagging release $(VERSION)' svn+ssh://svn.debian.org/svn/pgp-tools/trunk svn+ssh://svn.debian.org/svn/pgp-tools/tags/release-$(VERSION)
+	svn cp -m 'tagging release $(DEB_VERSION_UPSREAM)' svn+ssh://svn.debian.org/svn/pgp-tools/trunk svn+ssh://svn.debian.org/svn/pgp-tools/tags/release-$(DEB_VERSION_UPSREAM)
 
 tag-debian-version:
-	if svn ls svn+ssh://svn.debian.org/svn/pgp-tools/tags/debian-version-$(DEBVERSION) >/dev/null 2>&1; then \
+	if svn ls svn+ssh://svn.debian.org/svn/pgp-tools/tags/debian-version-$(DEB_VERSION) >/dev/null 2>&1; then \
 		echo "Already exists." >&2; exit 1; \
 	fi
-	svn cp -m 'tagging debian version $(DEBVERSION)' svn+ssh://svn.debian.org/svn/pgp-tools/trunk svn+ssh://svn.debian.org/svn/pgp-tools/tags/debian-version-$(DEBVERSION)
+	svn cp -m 'tagging debian version $(DEB_VERSION)' svn+ssh://svn.debian.org/svn/pgp-tools/trunk svn+ssh://svn.debian.org/svn/pgp-tools/tags/debian-version-$(DEB_VERSION)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2017-07-07 15:05:09 UTC (rev 893)
+++ trunk/debian/changelog	2017-07-07 15:05:15 UTC (rev 894)
@@ -8,6 +8,7 @@
       KSP organizers use other scripts.)
   * gpglist: New option '--signer' to limit listed signers to the matching
     keys.
+  * Makefile, debian/rules: Avoid parsing dpkg-parsechangelog(1) output.
 
  -- Guilhem Moulin <guilhem at debian.org>  Tue, 16 May 2017 16:05:19 +0200
 

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2017-07-07 15:05:09 UTC (rev 893)
+++ trunk/debian/rules	2017-07-07 15:05:15 UTC (rev 894)
@@ -4,8 +4,6 @@
 DPKG_EXPORT_BUILDFLAGS = 1
 -include /usr/share/dpkg/buildflags.mk
 
-VERSION := $(shell dpkg-parsechangelog | grep ^Version | cut -d' ' -f2)
-
 INSTALL             = install
 INSTALL_PROGRAM     = $(INSTALL)
 INSTALL_DATA        = $(INSTALL) -m 644