[SCM] gdal branch, master, updated. upstream/1.10.0-157-g72ed954
Francesco Paolo Lovergine
frankie at debian.org
Mon Jul 1 13:16:31 UTC 2013
The following commit has been merged in the master branch:
commit c8e53a2fcfd689cee86a4318432a0770b180435b
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date: Mon Jul 1 10:29:50 2013 +0200
Fixed symbols files and plugins related patch.
diff --git a/debian/changelog b/debian/changelog
index 3036852..0d5558d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-gdal (1.10.0-0~exp3) UNRELEASED; urgency=low
+gdal (1.10.0-0~exp3) experimental; urgency=low
* Added netcdf-bin build-dep to get nc-config, as required by current config.
+ * Fixed gdalpaths patch for version 1.10.
+ * Fixed symbols files to manage correctly library dependencies.
-- Francesco Paolo Lovergine <frankie at debian.org> Wed, 26 Jun 2013 11:19:15 +0200
diff --git a/debian/libgdal1h.symbols.amd64 b/debian/libgdal1h.symbols.amd64
index 09caf16..34e77e7 100644
--- a/debian/libgdal1h.symbols.amd64
+++ b/debian/libgdal1h.symbols.amd64
@@ -1,5 +1,5 @@
-libgdal.so.1 libgdal1 #MINVER#
-#include "libgdal1.symbols.common"
+libgdal.so.1 libgdal1h #MINVER#
+#include "libgdal1h.symbols.common"
(c++)"CheckASCII(unsigned char*, int)@GDAL_1.8" 1.8.0
(c++)"CreatePath(HDF5GroupObjects*)@GDAL_1.8" 1.8.0
(c++)"DDFScanInt(char const*, int)@GDAL_1.8" 1.8.0
diff --git a/debian/libgdal1h.symbols.armel b/debian/libgdal1h.symbols.armel
index 75e925d..9a8fc13 100644
--- a/debian/libgdal1h.symbols.armel
+++ b/debian/libgdal1h.symbols.armel
@@ -1,5 +1,5 @@
-libgdal.so.1 libgdal1 #MINVER#
-#include "libgdal1.symbols.common"
+libgdal.so.1 libgdal1h #MINVER#
+#include "libgdal1h.symbols.common"
(c++)"CheckASCII(unsigned char*, int)@GDAL_1.8" 1.8.0
(c++)"CreatePath(HDF5GroupObjects*)@GDAL_1.8" 1.8.0
(c++)"DDFScanInt(char const*, int)@GDAL_1.8" 1.8.0
diff --git a/debian/libgdal1h.symbols.armhf b/debian/libgdal1h.symbols.armhf
index 75e925d..9a8fc13 100644
--- a/debian/libgdal1h.symbols.armhf
+++ b/debian/libgdal1h.symbols.armhf
@@ -1,5 +1,5 @@
-libgdal.so.1 libgdal1 #MINVER#
-#include "libgdal1.symbols.common"
+libgdal.so.1 libgdal1h #MINVER#
+#include "libgdal1h.symbols.common"
(c++)"CheckASCII(unsigned char*, int)@GDAL_1.8" 1.8.0
(c++)"CreatePath(HDF5GroupObjects*)@GDAL_1.8" 1.8.0
(c++)"DDFScanInt(char const*, int)@GDAL_1.8" 1.8.0
diff --git a/debian/libgdal1.symbols.common b/debian/libgdal1h.symbols.common
similarity index 100%
rename from debian/libgdal1.symbols.common
rename to debian/libgdal1h.symbols.common
diff --git a/debian/libgdal1h.symbols.i386 b/debian/libgdal1h.symbols.i386
index bd3bb93..ae1f3b1 100644
--- a/debian/libgdal1h.symbols.i386
+++ b/debian/libgdal1h.symbols.i386
@@ -1,5 +1,5 @@
-libgdal.so.1 libgdal1 #MINVER#
-#include "libgdal1.symbols.common"
+libgdal.so.1 libgdal1h #MINVER#
+#include "libgdal1h.symbols.common"
(c++)"CheckASCII(unsigned char*, int)@GDAL_1.8" 1.9.0
(c++)"CreatePath(HDF5GroupObjects*)@GDAL_1.8" 1.9.0
(c++)"DDFScanInt(char const*, int)@GDAL_1.8" 1.9.0
diff --git a/debian/libgdal1h.symbols.ia64 b/debian/libgdal1h.symbols.ia64
index dc3e815..b1884f8 100644
--- a/debian/libgdal1h.symbols.ia64
+++ b/debian/libgdal1h.symbols.ia64
@@ -1,5 +1,5 @@
-libgdal.so.1 libgdal1 #MINVER#
-#include "libgdal1.symbols.common"
+libgdal.so.1 libgdal1h #MINVER#
+#include "libgdal1h.symbols.common"
(c++)"CheckASCII(unsigned char*, int)@GDAL_1.8" 1.9.0
(c++)"CreatePath(HDF5GroupObjects*)@GDAL_1.8" 1.9.0
(c++)"DDFScanInt(char const*, int)@GDAL_1.8" 1.9.0
diff --git a/debian/libgdal1h.symbols.mips b/debian/libgdal1h.symbols.mips
index a4e856f..85c74d6 100644
--- a/debian/libgdal1h.symbols.mips
+++ b/debian/libgdal1h.symbols.mips
@@ -1,5 +1,5 @@
-libgdal.so.1 libgdal1 #MINVER#
-#include "libgdal1.symbols.common"
+libgdal.so.1 libgdal1h #MINVER#
+#include "libgdal1h.symbols.common"
(c++)"CheckASCII(unsigned char*, int)@GDAL_1.8" 1.9.0
(c++)"CreatePath(HDF5GroupObjects*)@GDAL_1.8" 1.9.0
(c++)"DDFScanInt(char const*, int)@GDAL_1.8" 1.9.0
diff --git a/debian/libgdal1h.symbols.mipsel b/debian/libgdal1h.symbols.mipsel
index a4e856f..85c74d6 100644
--- a/debian/libgdal1h.symbols.mipsel
+++ b/debian/libgdal1h.symbols.mipsel
@@ -1,5 +1,5 @@
-libgdal.so.1 libgdal1 #MINVER#
-#include "libgdal1.symbols.common"
+libgdal.so.1 libgdal1h #MINVER#
+#include "libgdal1h.symbols.common"
(c++)"CheckASCII(unsigned char*, int)@GDAL_1.8" 1.9.0
(c++)"CreatePath(HDF5GroupObjects*)@GDAL_1.8" 1.9.0
(c++)"DDFScanInt(char const*, int)@GDAL_1.8" 1.9.0
diff --git a/debian/libgdal1h.symbols.powerpc b/debian/libgdal1h.symbols.powerpc
index 762faee..080a47a 100644
--- a/debian/libgdal1h.symbols.powerpc
+++ b/debian/libgdal1h.symbols.powerpc
@@ -1,5 +1,5 @@
-libgdal.so.1 libgdal1 #MINVER#
-#include "libgdal1.symbols.common"
+libgdal.so.1 libgdal1h #MINVER#
+#include "libgdal1h.symbols.common"
(c++)"CheckASCII(unsigned char*, int)@GDAL_1.8" 1.8.0
(c++)"CreatePath(HDF5GroupObjects*)@GDAL_1.8" 1.8.0
(c++)"DDFScanInt(char const*, int)@GDAL_1.8" 1.8.0
diff --git a/debian/libgdal1h.symbols.s390 b/debian/libgdal1h.symbols.s390
index 0e265ba..89a52ce 100644
--- a/debian/libgdal1h.symbols.s390
+++ b/debian/libgdal1h.symbols.s390
@@ -1,5 +1,5 @@
-libgdal.so.1 libgdal1 #MINVER#
-#include "libgdal1.symbols.common"
+libgdal.so.1 libgdal1h #MINVER#
+#include "libgdal1h.symbols.common"
(c++)"CheckASCII(unsigned char*, int)@GDAL_1.8" 1.8.0
(c++)"CreatePath(HDF5GroupObjects*)@GDAL_1.8" 1.8.0
(c++)"DDFScanInt(char const*, int)@GDAL_1.8" 1.8.0
diff --git a/debian/libgdal1h.symbols.s390x b/debian/libgdal1h.symbols.s390x
index 1b72d11..9b775f6 100644
--- a/debian/libgdal1h.symbols.s390x
+++ b/debian/libgdal1h.symbols.s390x
@@ -1,5 +1,5 @@
-libgdal.so.1 libgdal1 #MINVER#
-#include "libgdal1.symbols.common"
+libgdal.so.1 libgdal1h #MINVER#
+#include "libgdal1h.symbols.common"
(c++)"CheckASCII(unsigned char*, int)@GDAL_1.8" 1.9.0
(c++)"CreatePath(HDF5GroupObjects*)@GDAL_1.8" 1.9.0
(c++)"DDFScanInt(char const*, int)@GDAL_1.8" 1.9.0
diff --git a/debian/libgdal1h.symbols.sparc b/debian/libgdal1h.symbols.sparc
index 8f00f95..cce6fe9 100644
--- a/debian/libgdal1h.symbols.sparc
+++ b/debian/libgdal1h.symbols.sparc
@@ -1,5 +1,5 @@
-libgdal.so.1 libgdal1 #MINVER#
-#include "libgdal1.symbols.common"
+libgdal.so.1 libgdal1h #MINVER#
+#include "libgdal1h.symbols.common"
(c++)"CheckASCII(unsigned char*, int)@GDAL_1.8" 1.8.0
(c++)"CreatePath(HDF5GroupObjects*)@GDAL_1.8" 1.8.0
(c++)"DDFScanInt(char const*, int)@GDAL_1.8" 1.8.0
diff --git a/debian/patches/gdalpaths b/debian/patches/gdalpaths
index bb1373d..79d0198 100644
--- a/debian/patches/gdalpaths
+++ b/debian/patches/gdalpaths
@@ -7,7 +7,7 @@ Index: gdal/gcore/gdaldrivermanager.cpp
GDAL_PREFIX "/PlugIns");
#else
- GDAL_PREFIX "/lib/gdalplugins" );
-+ GDAL_PREFIX "/lib/gdalplugins/1.9" );
++ GDAL_PREFIX "/lib/gdalplugins/1.10" );
#endif
#else
char szExecPath[1024];
@@ -20,7 +20,7 @@ Index: gdal/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp
GDAL_PREFIX "/PlugIns");
#else
- GDAL_PREFIX "/lib/gdalplugins" );
-+ GDAL_PREFIX "/lib/gdalplugins/1.9" );
++ GDAL_PREFIX "/lib/gdalplugins/1.10" );
#endif
#else
char szExecPath[1024];
@@ -33,7 +33,7 @@ Index: gdal/port/cpl_findfile.cpp
CPLPushFinderLocation( GDAL_PREFIX "/Resources/gdal" );
#else
- CPLPushFinderLocation( GDAL_PREFIX "/share/gdal" );
-+ CPLPushFinderLocation( GDAL_PREFIX "/share/gdal/1.9" );
++ CPLPushFinderLocation( GDAL_PREFIX "/share/gdal/1.10" );
#endif
#else
CPLPushFinderLocation( "/usr/local/share/gdal" );
--
GDAL/OGR library and tools
More information about the Pkg-grass-devel
mailing list