[debian-edu-commits] debian-edu/ 01/05: d/rules: Switch to using pkg-info.mk for the new-upstream-version target.

[Holger Levsen]

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

holger pushed a commit to branch master
in repository debian-edu-artwork.

commit 4a7bf966cb5574313a7eec8524bf15cb1036aff3
Author: Unit 193 <unit193 at ubuntu.com>
Date:   Mon Feb 12 08:00:36 2018 -0500

    d/rules: Switch to using pkg-info.mk for the new-upstream-version target.
---
 debian/rules | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/debian/rules b/debian/rules
index ae3bdf1..d07cfea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,6 @@
 #!/usr/bin/make -f
 
-PKD   = $(word 1,$(abspath $(dir $(MAKEFILE_LIST))))
-PKG   = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
-UVER  = $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-\d+.*)};')
+include /usr/share/dpkg/pkg-info.mk
 
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/autoreconf.mk
@@ -24,8 +22,9 @@ install/debian-edu-artwork-lines::
 	install debian/update-debian-edu-artwork-lines debian/$(cdbs_curpkg)$(sbindir)
 
 new-upstream-version: clean
-	mkdir -p $(PKG)-$(UVER)/
-	rsync -av --delete --exclude=debian/ --exclude=$(PKG)-$(UVER)/ * $(PKG)-$(UVER)/
-	find "$(PKG)-$(UVER)" -xdev \( -type f -o -type l \) -print| sort \
-	    | tar -cJaf "../$(PKG)_$(UVER).orig.tar.xz" -T- --owner=root --group=root --mode=a+rX \
-	    && $(RM) -r "$(PKG)-$(UVER)"
+	mkdir -p $(DEB_SOURCE)-$(DEB_VERSION_UPSTREAM)/
+	rsync -av --delete --exclude=debian/ --exclude=$(DEB_SOURCE)-$(DEB_VERSION_UPSTREAM)/ * \
+	$(DEB_SOURCE)-$(DEB_VERSION_UPSTREAM)/
+	find "$(DEB_SOURCE)-$(DEB_VERSION_UPSTREAM)" -xdev \( -type f -o -type l \) -print| sort \
+	    | tar -cJaf "../$(DEB_SOURCE)_$(DEB_VERSION_UPSTREAM).orig.tar.xz" -T- --owner=root --group=root --mode=a+rX \
+	    && $(RM) -r "$(DEB_SOURCE)-$(DEB_VERSION_UPSTREAM)"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-artwork.git