[SCM] gdal branch, master, updated. upstream/1.8.1-60-gf6d3f04
Francesco Paolo Lovergine
frankie at debian.org
Thu Sep 29 17:59:04 UTC 2011
The following commit has been merged in the master branch:
commit 9d4ced77998e3f54c9917fd4c826d8bb856ad665
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date: Thu Sep 29 15:18:14 2011 +0200
Dropped versioned source name for libgdal binary.
From now on, source name will change only in case of C++ API/ABI
breakage and library name will follow upstream standard.
The package name now follows only SONAME which follows the C API.
diff --git a/debian/changelog b/debian/changelog
index 36c99f3..a772e45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
gdal (1.8.1-2~exp2) experimental; urgency=low
* Added mandatory header line in per arch included symbol files.
+ * Now normalized to conventional GDAL library name and dropping the Debian
+ specific versioned naming scheme for the library.
+ Dropped patch: libname, python.
- -- Francesco Paolo Lovergine <frankie at debian.org> Thu, 29 Sep 2011 15:01:20 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org> Thu, 29 Sep 2011 15:16:52 +0200
gdal (1.8.1-2~exp1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index a9ab652..e4ebca6 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Homepage: http://www.gdal.org/
Vcs-Browser: http://git.debian.org/?p=pkg-grass/gdal.git
Vcs-Git: git://git.debian.org/git/pkg-grass/gdal.git
-Package: libgdal1-1.8.0
+Package: libgdal1
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -41,16 +41,16 @@ Description: Geospatial Data Abstraction Library
.
This package contains the shared library.
-Package: libgdal1-dev
+Package: libgdal-dev
Section: libdevel
Architecture: any
-Depends: libgdal1-1.8.0 (=${binary:Version}), libc6-dev, libnetcdf-dev,
+Depends: libgdal1 (=${binary:Version}), libc6-dev, libnetcdf-dev,
libjasper-dev|libjasper-1.701-dev, libpng-dev, libjpeg-dev, libgif-dev, libhdf4-alt-dev,
libpq-dev, libxerces-c2-dev, unixodbc-dev, libsqlite3-dev, libgeos-dev,
libmysqlclient-dev, libhdf5-serial-dev, libltdl3-dev, libcurl4-dev|libcurl3-dev,
libspatialite-dev, libdap-dev, ${misc:Depends}
Suggests: libgdal-doc
-Provides: libgdal-dev
+Provides: libgdal1-dev
Description: Geospatial Data Abstraction Library - Development files
GDAL is a translator library for raster geospatial data formats.
As a library, it presents a single abstract data model to the
@@ -74,7 +74,7 @@ Description: Geospatial Data Abstraction Library - Development files
Package: libgdal-doc
Section: doc
Architecture: all
-Suggests: libgdal1-1.8.0
+Suggests: libgdal1
Depends: ${misc:Depends}
Homepage: http://www.gdal.org/#index_userdocs
Description: Documentation for the Geospatial Data Abstraction Library
diff --git a/debian/libgdal.symbols-amd64 b/debian/libgdal.symbols-amd64
index f137abc..3cb878f 100644
--- a/debian/libgdal.symbols-amd64
+++ b/debian/libgdal.symbols-amd64
@@ -1,4 +1,4 @@
-libgdal1.8.0.so.1 libgdal1-1.8.0 #MINVER#
+libgdal.so.1 libgdal1 #MINVER#
(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/libgdal.symbols-armel b/debian/libgdal.symbols-armel
index 3006060..a513099 100644
--- a/debian/libgdal.symbols-armel
+++ b/debian/libgdal.symbols-armel
@@ -1,4 +1,4 @@
-libgdal1.8.0.so.1 libgdal1-1.8.0 #MINVER#
+libgdal.so.1 libgdal1 #MINVER#
(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/libgdal.symbols-i386 b/debian/libgdal.symbols-i386
index e8e8546..864a05f 100644
--- a/debian/libgdal.symbols-i386
+++ b/debian/libgdal.symbols-i386
@@ -1,4 +1,4 @@
-libgdal1.8.0.so.1 libgdal1-1.8.0 #MINVER#
+libgdal.so.1 libgdal1 #MINVER#
(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/libgdal.symbols-ia64 b/debian/libgdal.symbols-ia64
index 593931c..8c11c5a 100644
--- a/debian/libgdal.symbols-ia64
+++ b/debian/libgdal.symbols-ia64
@@ -1,4 +1,4 @@
-libgdal1.8.0.so.1 libgdal1-1.8.0 #MINVER#
+libgdal.so.1 libgdal1 #MINVER#
(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/libgdal.symbols-mips b/debian/libgdal.symbols-mips
index 6ede5b8..5e01985 100644
--- a/debian/libgdal.symbols-mips
+++ b/debian/libgdal.symbols-mips
@@ -1,4 +1,4 @@
-libgdal1.8.0.so.1 libgdal1-1.8.0 #MINVER#
+libgdal.so.1 libgdal1 #MINVER#
(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/libgdal.symbols-powerpc b/debian/libgdal.symbols-powerpc
index ca0244e..8738c8a 100644
--- a/debian/libgdal.symbols-powerpc
+++ b/debian/libgdal.symbols-powerpc
@@ -1,4 +1,4 @@
-libgdal1.8.0.so.1 libgdal1-1.8.0 #MINVER#
+libgdal.so.1 libgdal1 #MINVER#
(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/libgdal.symbols-s390 b/debian/libgdal.symbols-s390
index 2c202f1..6302b77 100644
--- a/debian/libgdal.symbols-s390
+++ b/debian/libgdal.symbols-s390
@@ -1,4 +1,4 @@
-libgdal1.8.0.so.1 libgdal1-1.8.0 #MINVER#
+libgdal.so.1 libgdal1 #MINVER#
(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-1.8.0.install b/debian/libgdal1-1.8.0.install
deleted file mode 100644
index 64ecf14..0000000
--- a/debian/libgdal1-1.8.0.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libgdal1.8.0.so.*
-usr/share/gdal/1.8
diff --git a/debian/libgdal1-dev.install b/debian/libgdal1-dev.install
index d362dd3..8ae8999 100644
--- a/debian/libgdal1-dev.install
+++ b/debian/libgdal1-dev.install
@@ -1,5 +1,5 @@
usr/bin/gdal-config
usr/include
-usr/lib/libgdal1.8.0.a
-usr/lib/libgdal1.8.0.so
+usr/lib/libgdal.a
+usr/lib/libgdal.so
usr/share/man/man1/gdal-config.1
diff --git a/debian/libgdal1-1.8.0.docs b/debian/libgdal1.docs
similarity index 100%
rename from debian/libgdal1-1.8.0.docs
rename to debian/libgdal1.docs
diff --git a/debian/libgdal1.install b/debian/libgdal1.install
new file mode 100644
index 0000000..e85096f
--- /dev/null
+++ b/debian/libgdal1.install
@@ -0,0 +1,2 @@
+usr/lib/libgdal.so.*
+usr/share/gdal/1.8
diff --git a/debian/libgdal1-1.8.0.symbols b/debian/libgdal1.symbols
similarity index 99%
rename from debian/libgdal1-1.8.0.symbols
rename to debian/libgdal1.symbols
index 5b6a960..e031e59 100644
--- a/debian/libgdal1-1.8.0.symbols
+++ b/debian/libgdal1.symbols
@@ -1,4 +1,4 @@
-libgdal1.8.0.so.1 libgdal1-1.8.0 #MINVER#
+libgdal.so.1 libgdal1-1.8.0 #MINVER#
AIGAccessTile at GDAL_1.8 1.8.0
AIGClose at GDAL_1.8 1.8.0
AIGLLOpen at GDAL_1.8 1.8.0
diff --git a/debian/patches/libname b/debian/patches/libname
deleted file mode 100644
index 0cb3f52..0000000
--- a/debian/patches/libname
+++ /dev/null
@@ -1,63 +0,0 @@
-Index: gdal/GDALmake.opt.in
-===================================================================
---- gdal.orig/GDALmake.opt.in 2011-09-26 13:18:55.000000000 +0200
-+++ gdal/GDALmake.opt.in 2011-09-26 13:19:03.000000000 +0200
-@@ -92,7 +92,7 @@
- -I$(GDAL_ROOT)/ogr -I$(GDAL_ROOT)/ogr/ogrsf_frmts
-
- # libtool targets and help variables
--LIBGDAL := libgdal.la
-+LIBGDAL := libgdal1.8.0.la
- LIBGDAL_CURRENT := 16
- LIBGDAL_REVISION := 1
- LIBGDAL_AGE := 15
-@@ -105,9 +105,9 @@
- GDAL_VERSION_MINOR = @GDAL_VERSION_MINOR@
- GDAL_VERSION_REV = @GDAL_VERSION_REV@
-
--GDAL_LIB = $(GDAL_ROOT)/libgdal.a
--GDAL_SLIB = $(GDAL_ROOT)/libgdal.$(SO_EXT)
--GDAL_SLIB_LINK = -L$(GDAL_ROOT) -lgdal
-+GDAL_LIB = $(GDAL_ROOT)/libgdal1.8.0.a
-+GDAL_SLIB = $(GDAL_ROOT)/libgdal1.8.0.$(SO_EXT)
-+GDAL_SLIB_LINK = -L$(GDAL_ROOT) -lgdal1.8.0
-
- # Mac OS X Framework definition
- MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@
-@@ -433,9 +433,9 @@
-
- CONFIG_LIBS = $(GDAL_ROOT)/$(LIBGDAL)
- ifeq ($(MACOSX_FRAMEWORK),yes)
--CONFIG_LIBS_INS = -L$(INST_LIB)/unix/lib -lgdal
-+CONFIG_LIBS_INS = -L$(INST_LIB)/unix/lib -lgdal1.8.0
- else
--CONFIG_LIBS_INS = -L$(INST_LIB) -lgdal
-+CONFIG_LIBS_INS = -L$(INST_LIB) -lgdal1.8.0
- endif # MACOSX_FRAMEWORK
-
- EXE_DEP_LIBS = $(GDAL_ROOT)/$(LIBGDAL)
-@@ -446,9 +446,9 @@
- ifeq ($(HAVE_LD_SHARED),yes)
- CONFIG_LIBS = $(GDAL_SLIB_LINK) $(LIBS)
- ifeq ($(MACOSX_FRAMEWORK),yes)
--CONFIG_LIBS_INS = -L$(INST_LIB)/unix/lib -lgdal
-+CONFIG_LIBS_INS = -L$(INST_LIB)/unix/lib -lgdal1.8.0
- else
--CONFIG_LIBS_INS = -L$(INST_LIB) -lgdal
-+CONFIG_LIBS_INS = -L$(INST_LIB) -lgdal1.8.0
- endif
- EXE_DEP_LIBS = $(GDAL_SLIB)
- else
-Index: gdal/swig/perl/Makefile.PL
-===================================================================
---- gdal.orig/swig/perl/Makefile.PL 2011-09-26 13:18:55.000000000 +0200
-+++ gdal/swig/perl/Makefile.PL 2011-09-26 13:19:03.000000000 +0200
-@@ -24,7 +24,7 @@
- die "can't find gdal-config";
- }
- open $fh, $fh or die "$fh not found!";
--$LIB .= " -lgdal ";
-+$LIB .= " -lgdal1.8.0 ";
- if ($fh) {
- @config = <$fh>;
- close $fh;
diff --git a/debian/patches/python b/debian/patches/python
deleted file mode 100644
index 2df662b..0000000
--- a/debian/patches/python
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: gdal/swig/python/setup.cfg
-===================================================================
---- gdal.orig/swig/python/setup.cfg 2011-02-18 15:52:35.000000000 +0100
-+++ gdal/swig/python/setup.cfg 2011-02-18 16:48:23.000000000 +0100
-@@ -3,6 +3,6 @@
- [build_ext]
- #include_dirs = ../../port:../../gcore:../../alg:../../ogr/
- #library_dirs = ../../.libs:../../
--#libraries = gdal
-+libraries = gdal1.8.0
- gdal_config=../../apps/gdal-config
-
diff --git a/debian/patches/series b/debian/patches/series
index 977731f..7e23f1e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,8 @@
-libname
ogdi
doc
rubymakefile
man
gdalpaths
-python
hdf4
gdal-grass
ecw-plugin
--
GDAL/OGR library and tools
More information about the Pkg-grass-devel
mailing list