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

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

commit fad5592fa6b1e5fb280ef53ab205e36b066cb38f
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Fri Jun 19 00:08:15 2015 +0200

    Change virtual package from libgdal.so.1-<major>.<minor>.<patch> format to 
gdal-abi-<major>-<minor>-<patch> format.
---
 debian/changelog                        |  2 ++
 debian/control                          |  2 +-
 debian/gdal-symbols.pl                  | 24 +++++++++++++++++-------
 debian/libgdal20.symbols.alpha          |  2 +-
 debian/libgdal20.symbols.amd64          |  2 +-
 debian/libgdal20.symbols.arm64          |  2 +-
 debian/libgdal20.symbols.armel          |  2 +-
 debian/libgdal20.symbols.armhf          |  2 +-
 debian/libgdal20.symbols.hppa           |  2 +-
 debian/libgdal20.symbols.hurd-i386      |  2 +-
 debian/libgdal20.symbols.i386           |  2 +-
 debian/libgdal20.symbols.ia64           |  2 +-
 debian/libgdal20.symbols.kfreebsd-amd64 |  2 +-
 debian/libgdal20.symbols.kfreebsd-i386  |  2 +-
 debian/libgdal20.symbols.mips           |  2 +-
 debian/libgdal20.symbols.mipsel         |  2 +-
 debian/libgdal20.symbols.powerpc        |  2 +-
 debian/libgdal20.symbols.ppc64          |  2 +-
 debian/libgdal20.symbols.ppc64el        |  2 +-
 debian/libgdal20.symbols.s390x          |  2 +-
 debian/libgdal20.symbols.sparc          |  2 +-
 debian/libgdal20.symbols.x32            |  2 +-
 22 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 67076b6..be789fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ gdal (2.0.0~rc2+dfsg-1) UNRELEASED; urgency=medium
   * Use packaged libgeotiff & libtiff instead of internal copies.
   * Drop libgdal1-dev transitional package, and obsolete
     Breaks/Replaces.
+  * Change virtual package from libgdal.so.1-<major>.<minor>.<patch> format
+    to gdal-abi-<major>-<minor>-<patch> format.
 
  -- Bas Couwenberg <sebas...@debian.org>  Sun, 14 Jun 2015 21:03:34 +0200
 
diff --git a/debian/control b/debian/control
index fd80b00..6cd2877 100644
--- a/debian/control
+++ b/debian/control
@@ -66,7 +66,7 @@ Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Recommends: proj-bin
-Provides: libgdal.so.20-2.0.0
+Provides: gdal-abi-2-0-0
 Description: Geospatial Data Abstraction Library
  GDAL is a translator library for raster geospatial data formats.
  As a library, it presents a single abstract data model to the
diff --git a/debian/gdal-symbols.pl b/debian/gdal-symbols.pl
index a4ae506..70764ed 100755
--- a/debian/gdal-symbols.pl
+++ b/debian/gdal-symbols.pl
@@ -10,7 +10,7 @@
 # diffutils patch coreutils
 #
 # Copyright (C) 2013-2014, Bas Couwenberg <sebas...@xs4all.nl>
-# 
+#
 # This library is free software; you can redistribute it and/or modify
 # it under the same terms as Perl itself, either Perl version 5.8.5 or,
 # at your option, any later version of Perl 5 you may have available.
@@ -411,10 +411,14 @@ sub create_new_symbols {
 
                                `cat $output | $cfg{cppfilt} > $filt 2>&1`;
 
-                               # libgdal.so.1 libgdal1h #MINVER# 
+                               # libgdal.so.1 libgdal1h #MINVER#
                                # | libgdal1h #MINVER#, libgdal.so.1-1.10.1
                                # #include "libgdal1h.symbols.common"
 
+                               # libgdal.so.20 libgdal20 #MINVER#
+                               # | libgdal20 #MINVER#, gdal-abi-2-0-0
+                               # #include "libgdal20.symbols.common"
+
                                my $data = '';
 
                                my $i = 0;
@@ -977,9 +981,9 @@ sub parse_symbols {
 
                        $symbols{$symbol}{version} = $version;
                }
-               # libgdal.so.1 libgdal1h #MINVER# 
-               # | libgdal1h #MINVER#, libgdal.so.1-1.11.1
-               # #include "libgdal1h.symbols.common"
+               # libgdal.so.20 libgdal20 #MINVER#
+               # | libgdal20 #MINVER#, gdal-abi-2-0-0
+               # #include "libgdal20.symbols.common"
                #  (c++)"PamGetProxy(char const*)@GDAL_1.8" 1.8.0 1
                elsif(/^ (\S+)\s+(\d+\S+\d+)\s*(\d+)\s*$/) {
                        my $symbol   = $1;
@@ -1124,19 +1128,25 @@ sub new_architecture_symbols {
 
                                        `cat $symbols{$arch}{file} | 
$cfg{cppfilt} > $filt 2>&1`;
 
-                                       # libgdal.so.1 libgdal1h #MINVER# 
+                                       # libgdal.so.1 libgdal1h #MINVER#
                                        # | libgdal1h #MINVER#, 
libgdal.so.1-1.10.1
                                        # #include "libgdal1h.symbols.common"
 
+                                       # libgdal.so.20 libgdal20 #MINVER#
+                                       # | libgdal20 #MINVER#, gdal-abi-2-0-0
+                                       # #include "libgdal20.symbols.common"
+
                                        my $data = '';
 
                                        my $upstream_version = 
upstream_version($versions[-1]);
 
+                                       (my $abi = $upstream_version) =~ 
s/\./-/g
+
                                        my $i = 0;
                                        foreach(read_file($filt)) {
                                                if($i == 0 && /^ /) {
                                                        $_ = "#include 
\"${pkg}.symbols.common\"\n" . $_;
-                                                       $_ = "| ${pkg} 
#MINVER#, libgdal.so.1-$upstream_version\n" . $_;
+                                                       $_ = "| ${pkg} 
#MINVER#, gdal-abi-$abi\n" . $_;
 
                                                        $i++;
                                                }
diff --git a/debian/libgdal20.symbols.alpha b/debian/libgdal20.symbols.alpha
index 80fb122..0ae279c 100644
--- a/debian/libgdal20.symbols.alpha
+++ b/debian/libgdal20.symbols.alpha
@@ -1,5 +1,5 @@
 libgdal.so.20 libgdal20 #MINVER#
-| libgdal20 #MINVER#, libgdal.so.20-2.0.0
+| libgdal20 #MINVER#, gdal-abi-2-0-0
 #include "libgdal20.symbols.common"
  (c++)"PamGetProxy(char const*)@GDAL_1.8" 1.10.0 1
  (c++)"CPLURLAddKVP(char const*, char const*, char const*)@GDAL_1.8" 1.10.0 1
diff --git a/debian/libgdal20.symbols.amd64 b/debian/libgdal20.symbols.amd64
index fc6a59f..d13de0b 100644
--- a/debian/libgdal20.symbols.amd64
+++ b/debian/libgdal20.symbols.amd64
@@ -1,5 +1,5 @@
 libgdal.so.20 libgdal20 #MINVER#
-| libgdal20 #MINVER#, libgdal.so.20-2.0.0
+| libgdal20 #MINVER#, gdal-abi-2-0-0
 #include "libgdal20.symbols.common"
  (c++)"PamGetProxy(char const*)@GDAL_1.8" 1.8.0 1
  (c++)"CPLURLAddKVP(char const*, char const*, char const*)@GDAL_1.8" 1.9.0 1
diff --git a/debian/libgdal20.symbols.arm64 b/debian/libgdal20.symbols.arm64
index 2fc1a57..e471c30 100644
--- a/debian/libgdal20.symbols.arm64
+++ b/debian/libgdal20.symbols.arm64
@@ -1,5 +1,5 @@
 libgdal.so.20 libgdal20 #MINVER#
-| libgdal20 #MINVER#, libgdal.so.20-2.0.0
+| libgdal20 #MINVER#, gdal-abi-2-0-0
 #include "libgdal20.symbols.common"
  (c++)"PamGetProxy(char const*)@GDAL_1.8" 1.10.1 1
  (c++)"CPLURLAddKVP(char const*, char const*, char const*)@GDAL_1.8" 1.10.1 1
diff --git a/debian/libgdal20.symbols.armel b/debian/libgdal20.symbols.armel
index 935f57f..05f0456 100644
--- a/debian/libgdal20.symbols.armel
+++ b/debian/libgdal20.symbols.armel
@@ -1,5 +1,5 @@
 libgdal.so.20 libgdal20 #MINVER#
-| libgdal20 #MINVER#, libgdal.so.20-2.0.0
+| libgdal20 #MINVER#, gdal-abi-2-0-0
 #include "libgdal20.symbols.common"
  (c++)"PamGetProxy(char const*)@GDAL_1.8" 1.8.0 1
  (c++)"CPLURLAddKVP(char const*, char const*, char const*)@GDAL_1.8" 1.9.0 1
diff --git a/debian/libgdal20.symbols.armhf b/debian/libgdal20.symbols.armhf
index 935f57f..05f0456 100644
--- a/debian/libgdal20.symbols.armhf
+++ b/debian/libgdal20.symbols.armhf
@@ -1,5 +1,5 @@
 libgdal.so.20 libgdal20 #MINVER#
-| libgdal20 #MINVER#, libgdal.so.20-2.0.0
+| libgdal20 #MINVER#, gdal-abi-2-0-0
 #include "libgdal20.symbols.common"
  (c++)"PamGetProxy(char const*)@GDAL_1.8" 1.8.0 1
  (c++)"CPLURLAddKVP(char const*, char const*, char const*)@GDAL_1.8" 1.9.0 1
diff --git a/debian/libgdal20.symbols.hppa b/debian/libgdal20.symbols.hppa
index ae8ce0e..e621f34 100644
--- a/debian/libgdal20.symbols.hppa
+++ b/debian/libgdal20.symbols.hppa
@@ -1,5 +1,5 @@
 libgdal.so.20 libgdal20 #MINVER#
-| libgdal20 #MINVER#, libgdal.so.20-2.0.0
+| libgdal20 #MINVER#, gdal-abi-2-0-0
 #include "libgdal20.symbols.common"
  (c++)"PamGetProxy(char const*)@GDAL_1.8" 1.10.1 1
  (c++)"CPLURLAddKVP(char const*, char const*, char const*)@GDAL_1.8" 1.10.1 1
diff --git a/debian/libgdal20.symbols.hurd-i386 
b/debian/libgdal20.symbols.hurd-i386
index 0479e1e..0c28631 100644
--- a/debian/libgdal20.symbols.hurd-i386
+++ b/debian/libgdal20.symbols.hurd-i386
@@ -1,5 +1,5 @@
 libgdal.so.20 libgdal20 #MINVER#
-| libgdal20 #MINVER#, libgdal.so.20-2.0.0
+| libgdal20 #MINVER#, gdal-abi-2-0-0
 #include "libgdal20.symbols.common"
  (c++)"PamGetProxy(char const*)@GDAL_1.8" 1.10.1 1
  (c++)"CPLURLAddKVP(char const*, char const*, char const*)@GDAL_1.8" 1.10.1 1
diff --git a/debian/libgdal20.symbols.i386 b/debian/libgdal20.symbols.i386
index a0dee3f..b2daada 100644
--- a/debian/libgdal20.symbols.i386
+++ b/debian/libgdal20.symbols.i386
@@ -1,5 +1,5 @@
 libgdal.so.20 libgdal20 #MINVER#
-| libgdal20 #MINVER#, libgdal.so.20-2.0.0
+| libgdal20 #MINVER#, gdal-abi-2-0-0
 #include "libgdal20.symbols.common"
  (c++)"PamGetProxy(char const*)@GDAL_1.8" 1.9.0 1
  (c++)"CPLURLAddKVP(char const*, char const*, char const*)@GDAL_1.8" 1.9.0 1
diff --git a/debian/libgdal20.symbols.ia64 b/debian/libgdal20.symbols.ia64
index 49164d3..a4677d9 100644
--- a/debian/libgdal20.symbols.ia64
+++ b/debian/libgdal20.symbols.ia64
@@ -1,5 +1,5 @@
 libgdal.so.20 libgdal20 #MINVER#
-| libgdal20 #MINVER#, libgdal.so.20-2.0.0
+| libgdal20 #MINVER#, gdal-abi-2-0-0
 #include "libgdal20.symbols.common"
  (c++)"PamGetProxy(char const*)@GDAL_1.8" 1.9.0 1
  (c++)"CPLURLAddKVP(char const*, char const*, char const*)@GDAL_1.8" 1.9.0 1
diff --git a/debian/libgdal20.symbols.kfreebsd-amd64 
b/debian/libgdal20.symbols.kfreebsd-amd64
index 9da42b7..102a9a1 100644
--- a/debian/libgdal20.symbols.kfreebsd-amd64
+++ b/debian/libgdal20.symbols.kfreebsd-amd64
@@ -1,5 +1,5 @@
 libgdal.so.20 libgdal20 #MINVER#
-| libgdal20 #MINVER#, libgdal.so.20-2.0.0
+| libgdal20 #MINVER#, gdal-abi-2-0-0
 #include "libgdal20.symbols.common"
  (c++)"PamGetProxy(char const*)@GDAL_1.8" 1.10.0 1
  (c++)"CPLURLAddKVP(char const*, char const*, char const*)@GDAL_1.8" 1.10.0 1
diff --git a/debian/libgdal20.symbols.kfreebsd-i386 
b/debian/libgdal20.symbols.kfreebsd-i386
index 8f33463..d4907bd 100644
--- a/debian/libgdal20.symbols.kfreebsd-i386
+++ b/debian/libgdal20.symbols.kfreebsd-i386
@@ -1,5 +1,5 @@
 libgdal.so.20 libgdal20 #MINVER#
-| libgdal20 #MINVER#, libgdal.so.20-2.0.0
+| libgdal20 #MINVER#, gdal-abi-2-0-0
 #include "libgdal20.symbols.common"
  (c++)"PamGetProxy(char const*)@GDAL_1.8" 1.10.0 1
  (c++)"CPLURLAddKVP(char const*, char const*, char const*)@GDAL_1.8" 1.10.0 1
diff --git a/debian/libgdal20.symbols.mips b/debian/libgdal20.symbols.mips
index e53b7d9..a395995 100644
--- a/debian/libgdal20.symbols.mips
+++ b/debian/libgdal20.symbols.mips
@@ -1,5 +1,5 @@
 libgdal.so.20 libgdal20 #MINVER#
-| libgdal20 #MINVER#, libgdal.so.20-2.0.0
+| libgdal20 #MINVER#, gdal-abi-2-0-0
 #include "libgdal20.symbols.common"
  (c++)"PamGetProxy(char const*)@GDAL_1.8" 1.9.0 1
  (c++)"CPLURLAddKVP(char const*, char const*, char const*)@GDAL_1.8" 1.9.0 1
diff --git a/debian/libgdal20.symbols.mipsel b/debian/libgdal20.symbols.mipsel
index 0c9ba96..503e5e5 100644
--- a/debian/libgdal20.symbols.mipsel
+++ b/debian/libgdal20.symbols.mipsel
@@ -1,5 +1,5 @@
 libgdal.so.20 libgdal20 #MINVER#
-| libgdal20 #MINVER#, libgdal.so.20-2.0.0
+| libgdal20 #MINVER#, gdal-abi-2-0-0
 #include "libgdal20.symbols.common"
  (c++)"PamGetProxy(char const*)@GDAL_1.8" 1.9.0 1
  (c++)"CPLURLAddKVP(char const*, char const*, char const*)@GDAL_1.8" 1.9.0 1
diff --git a/debian/libgdal20.symbols.powerpc b/debian/libgdal20.symbols.powerpc
index e73845c..cbfe440 100644
--- a/debian/libgdal20.symbols.powerpc
+++ b/debian/libgdal20.symbols.powerpc
@@ -1,5 +1,5 @@
 libgdal.so.20 libgdal20 #MINVER#
-| libgdal20 #MINVER#, libgdal.so.20-2.0.0
+| libgdal20 #MINVER#, gdal-abi-2-0-0
 #include "libgdal20.symbols.common"
  (c++)"PamGetProxy(char const*)@GDAL_1.8" 1.8.0 1
  (c++)"CPLURLAddKVP(char const*, char const*, char const*)@GDAL_1.8" 1.9.0 1
diff --git a/debian/libgdal20.symbols.ppc64 b/debian/libgdal20.symbols.ppc64
index 14dc316..24abaef 100644
--- a/debian/libgdal20.symbols.ppc64
+++ b/debian/libgdal20.symbols.ppc64
@@ -1,5 +1,5 @@
 libgdal.so.20 libgdal20 #MINVER#
-| libgdal20 #MINVER#, libgdal.so.20-2.0.0
+| libgdal20 #MINVER#, gdal-abi-2-0-0
 #include "libgdal20.symbols.common"
  BSBClose@GDAL_1.8 1.10.0
  BSBCreate@GDAL_1.8 1.10.0
diff --git a/debian/libgdal20.symbols.ppc64el b/debian/libgdal20.symbols.ppc64el
index 8d2a955..477b7c8 100644
--- a/debian/libgdal20.symbols.ppc64el
+++ b/debian/libgdal20.symbols.ppc64el
@@ -1,5 +1,5 @@
 libgdal.so.20 libgdal20 #MINVER#
-| libgdal20 #MINVER#, libgdal.so.20-2.0.0
+| libgdal20 #MINVER#, gdal-abi-2-0-0
 #include "libgdal20.symbols.common"
  (c++)"PamGetProxy(char const*)@GDAL_1.8" 1.10.1 1
  (c++)"CPLURLAddKVP(char const*, char const*, char const*)@GDAL_1.8" 1.10.1 1
diff --git a/debian/libgdal20.symbols.s390x b/debian/libgdal20.symbols.s390x
index 76f26dd..8ee4f62 100644
--- a/debian/libgdal20.symbols.s390x
+++ b/debian/libgdal20.symbols.s390x
@@ -1,5 +1,5 @@
 libgdal.so.20 libgdal20 #MINVER#
-| libgdal20 #MINVER#, libgdal.so.20-2.0.0
+| libgdal20 #MINVER#, gdal-abi-2-0-0
 #include "libgdal20.symbols.common"
  (c++)"PamGetProxy(char const*)@GDAL_1.8" 1.9.0 1
  (c++)"CPLURLAddKVP(char const*, char const*, char const*)@GDAL_1.8" 1.9.0 1
diff --git a/debian/libgdal20.symbols.sparc b/debian/libgdal20.symbols.sparc
index d0d88c6..16d4de3 100644
--- a/debian/libgdal20.symbols.sparc
+++ b/debian/libgdal20.symbols.sparc
@@ -1,5 +1,5 @@
 libgdal.so.20 libgdal20 #MINVER#
-| libgdal20 #MINVER#, libgdal.so.20-2.0.0
+| libgdal20 #MINVER#, gdal-abi-2-0-0
 #include "libgdal20.symbols.common"
  (c++)"PamGetProxy(char const*)@GDAL_1.8" 1.8.0 1
  (c++)"CPLURLAddKVP(char const*, char const*, char const*)@GDAL_1.8" 1.9.0 1
diff --git a/debian/libgdal20.symbols.x32 b/debian/libgdal20.symbols.x32
index 186b37b..d7618d6 100644
--- a/debian/libgdal20.symbols.x32
+++ b/debian/libgdal20.symbols.x32
@@ -1,5 +1,5 @@
 libgdal.so.20 libgdal20 #MINVER#
-| libgdal20 #MINVER#, libgdal.so.20-2.0.0
+| libgdal20 #MINVER#, gdal-abi-2-0-0
 #include "libgdal20.symbols.common"
  (c++)"PamGetProxy(char const*)@GDAL_1.8" 1.10.1 1
  (c++)"CPLURLAddKVP(char const*, char const*, char const*)@GDAL_1.8" 1.10.1 1

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/gdal.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

Reply via email to