[DRE-commits] [yard] 05/06: use DEB_VERSION_UPSTREAM instead of parsing the changelog

Cédric Boutillier boutil at moszumanska.debian.org
Mon Nov 27 11:12:27 UTC 2017


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

boutil pushed a commit to branch master
in repository yard.

commit 03e2e5f11305ce36491541414445da82e6776a30
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon Nov 27 11:48:58 2017 +0100

    use DEB_VERSION_UPSTREAM instead of parsing the changelog
---
 debian/rules | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index dd4ece9..2694757 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
-v := $(shell dpkg-parsechangelog -SVersion | cut -d - -f 1)
+include /usr/share/dpkg/pkg-info.mk
+
 export GEM2DEB_TEST_RUNNER = --check-dependencies
 export DH_RUBY = --gem-install
 export DH_RUBY_GEM_INSTALL_BLACKLIST_APPEND = lib/yard/rubygems/backports/LICENSE.txt
@@ -10,15 +11,15 @@ export DH_RUBY_GEM_INSTALL_BLACKLIST_APPEND = lib/yard/rubygems/backports/LICENS
 
 override_dh_installman:
 	mkdir man
-	pod2man --center "" --release "" --name YARD --utf8 debian/yard.1.pod man/yard.1
-	pod2man --center "" --release "" --name YARDOC --utf8 debian/yardoc.1.pod man/yardoc.1
-	pod2man --center "" --release "" --name YRI --utf8 debian/yri.1.pod man/yri.1
+	pod2man --center "" --release "$(DEB_VERSION_UPSTREAM)" --name YARD --utf8 debian/yard.1.pod man/yard.1
+	pod2man --center "" --release "$(DEB_VERSION_UPSTREAM)" --name YARDOC --utf8 debian/yardoc.1.pod man/yardoc.1
+	pod2man --center "" --release "$(DEB_VERSION_UPSTREAM)" --name YRI --utf8 debian/yri.1.pod man/yri.1
 	dh_installman
 
 override_dh_auto_install:
 	dh_auto_install
 	dh_link -p yard /usr/share/javascript/jquery/jquery.js \
-		/usr/share/rubygems-integration/all/gems/yard-$(v)/templates/default/fulldoc/html/js/jquery.js
+		/usr/share/rubygems-integration/all/gems/yard-$(DEB_VERSION_UPSTREAM)/templates/default/fulldoc/html/js/jquery.js
 	rm -rf doc/
 	rake yard
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/yard.git



More information about the Pkg-ruby-extras-commits mailing list