[gdal] 06/09: Strip pre-releases from ABI version when creating new symbols files.

[Bas 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 f4556e3416923867aefbe69cc62b3f3fbb5db8a6
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jan 27 12:49:38 2017 +0100

    Strip pre-releases from ABI version when creating new symbols files.
---
 debian/changelog              | 1 +
 debian/gdal-symbols.pl        | 1 +
 debian/libgdal20.symbols.m68k | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7702233..363173e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ gdal (2.1.3+dfsg-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Update symbols for 2.1.3~rc1, add symbols for m68k.
   * Update watch file for final releases.
+  * Strip pre-releases from ABI version when creating new symbols files.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 27 Jan 2017 12:39:07 +0100
 
diff --git a/debian/gdal-symbols.pl b/debian/gdal-symbols.pl
index aee0f5c..c9510d8 100755
--- a/debian/gdal-symbols.pl
+++ b/debian/gdal-symbols.pl
@@ -1139,6 +1139,7 @@ sub new_architecture_symbols {
 					my $upstream_version = upstream_version($versions[-1]);
 
 					(my $abi = $upstream_version) =~ s/\./-/g;
+					$abi =~ s/\~\w+$//;
 
 					my $i = 0;
 					foreach(read_file($filt)) {
diff --git a/debian/libgdal20.symbols.m68k b/debian/libgdal20.symbols.m68k
index 4e75225..1b9033c 100644
--- a/debian/libgdal20.symbols.m68k
+++ b/debian/libgdal20.symbols.m68k
@@ -1,5 +1,5 @@
 libgdal.so.20 libgdal20 #MINVER#
-| libgdal20 #MINVER#, gdal-abi-2-1-3~rc1
+| libgdal20 #MINVER#, gdal-abi-2-1-3
 #include "libgdal20.symbols.common"
  (c++)"PamGetProxy(char const*)@Base" 2.1.3~rc1 1
  (c++)"CPLURLAddKVP(char const*, char const*, char const*)@Base" 2.1.3~rc1 1

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