This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository spatialite.
commit a26c0b16b0fe9d0e957f88664cd0698c3c7b7f63
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Mon Jun 26 15:35:39 2017 +0200
Use pkg-info.mk variables instead of dpkg-parsechangelog output.
---
debian/changelog | 1 +
debian/rules | 14 ++++----------
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index da4757c..9c262eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ spatialite (4.4.0~rc1-1~exp2) UNRELEASED; urgency=medium
* Bump Standards-Version to 4.0.0, no changes.
* Add autopkgtest to test installability.
* Enable PIE hardening buildflags.
+ * Use pkg-info.mk variables instead of dpkg-parsechangelog output.
-- Bas Couwenberg <sebas...@debian.org> Mon, 26 Jun 2017 15:31:19 +0200
diff --git a/debian/rules b/debian/rules
index 7631c93..ef72e00 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,10 +10,9 @@ export DH_OPTIONS
# Enable hardening build flags
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-FULL_VERSION := $(shell dpkg-parsechangelog | grep ^Version | cut -d' ' -f2 |
cut -d- -f1)
-VERSION := $(shell echo $(FULL_VERSION) | sed -e "s/~beta[[:digit:]]\+/-BETA/")
-LC_VERSION := $(shell echo $(VERSION) | tr A-Z a-z)
-SPATIALITE_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version:
\(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
+include /usr/share/dpkg/pkg-info.mk
+
+UPSTREAM_VERSION = $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//')
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -30,11 +29,6 @@ export VERBOSE=1
%:
dh $@ --with autoreconf --parallel
-versions:
- @echo "Spatialite full version: $(FULL_VERSION)"
- @echo "Spatialite version: $(LC_VERSION)"
- @echo "Spatialite symbols: $(SPATIALITE_VERSION)"
-
override_dh_auto_configure:
dh_auto_configure -- \
$(EPSG) \
@@ -56,7 +50,7 @@ override_dh_auto_test:
rm -rf debian/backup
override_dh_makeshlibs:
- dh_makeshlibs -- -v$(SPATIALITE_VERSION)
+ dh_makeshlibs -- -v$(UPSTREAM_VERSION)
override_dh_shlibdeps:
dh_shlibdeps -l/usr/lib:$(CURDIR)/debian/tmp/usr/lib
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/spatialite.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
