[gdal] 04/06: Fix symbols version to include pre-releases.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch experimental-2.1
in repository gdal.

commit 75aa6a0d57ce57e2a97b4f9bdf488499793690e6
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Apr 3 22:15:47 2016 +0200

    Fix symbols version to include pre-releases.
---
 debian/changelog | 1 +
 debian/rules     | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0c00464..74d0bd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ gdal (2.1.0~beta1+dfsg-1~exp2) UNRELEASED; urgency=medium
   * Update symbols for amd64, arm64, armel, armhf, i386, kfreebsd-{amd64,i386},
     mips, mipsel, powerpc, ppc64el & s390x.
   * Drop --with-ruby=no configure option, Ruby support disabled upstream.
+  * Fix symbols version to include pre-releases.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 03 Apr 2016 12:13:04 +0200
 
diff --git a/debian/rules b/debian/rules
index b32b746..e57d1c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,8 @@
 # Enable hardening build flags
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 
+UPSTREAM_VERSION = $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
+
 # Remove -Werror=format-security, causes build failure on ogrsxfdatasource.cpp
 CFLAGS   = $(shell dpkg-buildflags --get CFLAGS)
 CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS)
@@ -207,9 +209,9 @@ override_dh_python3:
 
 override_dh_makeshlibs:
 	# Forces failure ignoring to collect new symbols on all archs
-	dh_makeshlibs -Xlibgdal-java -- -v$(GDAL_MAJOR).$(GDAL_MINOR).$(GDAL_PATCH) -c0
+	dh_makeshlibs -Xlibgdal-java -- -v$(UPSTREAM_VERSION) -c0
 	# Forces failure when symbols change
-	#dh_makeshlibs -Xlibgdal-java -- -v$(GDAL_MAJOR).$(GDAL_MINOR).$(GDAL_PATCH)
+	#dh_makeshlibs -Xlibgdal-java -- -v$(UPSTREAM_VERSION)
 
 override_dh_shlibdeps:
 	dh_shlibdeps -L libgdal20 -l debian/libgdal20/usr/lib

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal.git