[pocl] 03/17: use dpkg makefile snippets instead of parsing the changelog manually

Andreas Beckmann anbe at moszumanska.debian.org
Sun Nov 26 03:19:46 UTC 2017


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

anbe pushed a commit to branch master
in repository pocl.

commit fa8394d789fc180f66a51d2afe97c0e0c952956a
Author: Andreas Beckmann <anbe at debian.org>
Date:   Tue Oct 31 21:48:54 2017 +0100

    use dpkg makefile snippets instead of parsing the changelog manually
---
 debian/changelog |  1 +
 debian/rules     | 10 +++-------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9a494f2..91e12d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ pocl (0.13-10) UNRELEASED; urgency=medium
 
   * Update symbols files.
   * Bump Standards-Version to 4.1.1, no changes needed.
+  * Use dpkg makefile snippets instead of parsing the changelog manually.
 
  -- Andreas Beckmann <anbe at debian.org>  Tue, 31 Oct 2017 19:29:32 +0100
 
diff --git a/debian/rules b/debian/rules
index e859c62..a39afc5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,8 @@
 # see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/default.mk
+include /usr/share/dpkg/architecture.mk
+include /usr/share/dpkg/pkg-info.mk
 
 # When updating this variable, do not forget to adapt the build-depends
 # in debian/control
@@ -20,8 +22,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 # package maintainers to append LDFLAGS
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
-export DEB_HOST_MULTIARCH
-DEB_HOST_ARCH?=$(shell dpkg-architecture -qDEB_HOST_ARCH)
 LLVM_ARCH=$(shell sed < debian/supported-archs \
 	-e '/^DEB_ARCH: $(DEB_HOST_ARCH)$$/,/^ *$$/p;d' \
 	| sed -e 's/^LLVM_ARCH=//p;d')
@@ -112,10 +112,6 @@ override_dh_gencontrol:
 	dh_gencontrol -- -V'LLVM:Version=$(LLVM_VERSION)'
 
 
-version			 = $(shell dpkg-parsechangelog --show-field Version)
-upstream_version	 = $(shell dpkg-parsechangelog --show-field Version | sed -e 's/-[^-]*$$//')
-distribution		 = $(shell dpkg-parsechangelog --show-field Distribution)
-
 fix-symbols:
 	pkgkde-getbuildlogs
-	echo "pkgkde-symbolshelper batchpatch -v $(upstream_version) pocl_$(distribution)_logs/pocl_$(version)_*build"
+	echo "pkgkde-symbolshelper batchpatch -v $(DEB_VERSION_EPOCH_UPSTREAM) pocl_$(DEB_DISTRIBUTION)_logs/pocl_$(DEB_VERSION)_*build"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/pocl.git



More information about the Pkg-opencl-commits mailing list