[SCM] gdal branch, master, updated. upstream/1.7.3-9-g68cae96
Francesco Paolo Lovergine
frankie at debian.org
Tue Mar 15 17:15:56 UTC 2011
The following commit has been merged in the master branch:
commit 68cae96138db18b1a061539310e5686f3a833610
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date: Tue Mar 15 18:14:57 2011 +0100
Moving to 1.8 branch.
diff --git a/debian/changelog b/debian/changelog
index 6557b3e..489c2fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
-gdal (1.7.3-3) unstable; urgency=low
+gdal (1.8.0-1) experimental; urgency=low
+ * New upstream release.
+ * Patchset update for the current major release.
* Added libepsilon support.
* Now debian/copyright has moved to DEP5 format and revised on the basis of
the GDAL LICENSE file.
- -- Francesco Paolo Lovergine <frankie at debian.org> Sun, 13 Mar 2011 18:32:54 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org> Tue, 15 Mar 2011 17:55:24 +0100
gdal (1.7.3-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 3ca67f2..b87e1a6 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
Build-Depends: debhelper (>= 8), zlib1g-dev, libnetcdf-dev (>= 1:4.0.0),
- libjasper-dev, libpng12-dev, libjpeg62-dev, libgif-dev,
+ libjasper-dev, libpng12-dev, libjpeg-dev, libgif-dev,
libhdf4-alt-dev, libhdf5-serial-dev (>=1.6.6), libpq-dev, libxerces-c2-dev, unixodbc-dev (>= 2.2.11),
python-dev, python-numpy, doxygen, d-shlibs, libgeos-dev, libmysqlclient-dev, python-all-dev (>= 2.3.5-11~),
python-central (>= 0.5), libcurl4-gnutls-dev, libsqlite3-dev, libogdi3.2-dev,
@@ -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.7.0
+Package: libgdal1-1.8.0
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -44,7 +44,7 @@ Description: Geospatial Data Abstraction Library
Package: libgdal1-dev
Section: libdevel
Architecture: any
-Depends: libgdal1-1.7.0 (=${binary:Version}), libc6-dev, libnetcdf-dev,
+Depends: libgdal1-1.8.0 (=${binary:Version}), libc6-dev, libnetcdf-dev,
libjasper-dev|libjasper-1.701-dev, libpng12-dev, libjpeg62-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,
@@ -74,7 +74,7 @@ Description: Geospatial Data Abstraction Library - Development files
Package: libgdal-doc
Section: doc
Architecture: all
-Suggests: libgdal1-1.7.0
+Suggests: libgdal1-1.8.0
Depends: ${misc:Depends}
Homepage: http://www.gdal.org/#index_userdocs
Description: Documentation for the Geospatial Data Abstraction Library
diff --git a/debian/patches/gdalpaths b/debian/patches/gdalpaths
index dbf4a2d..01a8380 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.7" );
++ GDAL_PREFIX "/lib/gdalplugins/1.8" );
#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.7" );
++ GDAL_PREFIX "/lib/gdalplugins/1.8" );
#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.7" );
++ CPLPushFinderLocation( GDAL_PREFIX "/share/gdal/1.8" );
#endif
#else
CPLPushFinderLocation( "/usr/local/share/gdal" );
diff --git a/debian/patches/libname b/debian/patches/libname
index dbe3722..f46b8fe 100644
--- a/debian/patches/libname
+++ b/debian/patches/libname
@@ -1,45 +1,57 @@
Index: gdal/GDALmake.opt.in
===================================================================
---- gdal.orig/GDALmake.opt.in 2011-02-18 15:52:35.000000000 +0100
-+++ gdal/GDALmake.opt.in 2011-02-18 16:45:45.000000000 +0100
-@@ -84,7 +84,7 @@
+--- gdal.orig/GDALmake.opt.in 2011-03-15 17:54:02.000000000 +0100
++++ gdal/GDALmake.opt.in 2011-03-15 18:07:27.000000000 +0100
+@@ -92,7 +92,7 @@
-I$(GDAL_ROOT)/ogr -I$(GDAL_ROOT)/ogr/ogrsf_frmts
# libtool targets and help variables
-LIBGDAL := libgdal.la
-+LIBGDAL := libgdal1.7.0.la
- LIBGDAL_CURRENT := 15
- LIBGDAL_REVISION := 3
- LIBGDAL_AGE := 14
-@@ -97,9 +97,9 @@
++LIBGDAL := libgdal1.8.0.la
+ LIBGDAL_CURRENT := 16
+ LIBGDAL_REVISION := 0
+ 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.7.0.a
-+GDAL_SLIB = $(GDAL_ROOT)/libgdal1.7.0.$(SO_EXT)
-+GDAL_SLIB_LINK = -L$(GDAL_ROOT) -lgdal1.7.0
++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@
-@@ -363,9 +363,9 @@
+@@ -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.7.0
++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.7.0
++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-02-18 15:52:35.000000000 +0100
-+++ gdal/swig/perl/Makefile.PL 2011-02-18 16:45:45.000000000 +0100
+--- gdal.orig/swig/perl/Makefile.PL 2011-02-24 16:10:17.000000000 +0100
++++ gdal/swig/perl/Makefile.PL 2011-03-15 18:03:50.000000000 +0100
@@ -24,7 +24,7 @@
die "can't find gdal-config";
}
diff --git a/debian/rules b/debian/rules
index 0460caa..9c67c4e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -150,7 +150,7 @@ install: build
cp `ls GDALmake.opt-*|tail -1` GDALmake.opt
$(MAKE) install BINDINGS="perl ruby" DESTDIR=$(CURDIR)/debian/tmp \
- INST_DATA="\$$(prefix)/share/gdal/1.7"
+ INST_DATA="\$$(prefix)/share/gdal/1.8"
$(MAKE) install-docs DESTDIR=$(CURDIR)/debian/tmp \
"INST_DOCS=\$$(prefix)/share/doc/libgdal-doc"\
"INST_MAN=\$$(prefix)/share/man"
@@ -164,7 +164,7 @@ install: build
install -o root -g root -m 755 $(CURDIR)/swig/python/scripts/*.py $(CURDIR)/debian/tmp/usr/bin/.
# removing license file
- rm -f $(CURDIR)/debian/tmp/usr/share/gdal/1.7/LICENSE.TXT
+ rm -f $(CURDIR)/debian/tmp/usr/share/gdal/1.8/LICENSE.TXT
# removing empty packlist MakeMaker files
-find $(CURDIR)/debian/tmp/usr/local/lib/perl -type f -name .packlist -exec rm -f {} \;
# removing embedded rpath in perl shlibs
@@ -196,7 +196,7 @@ binary-common:
dh_perl
dh_makeshlibs
dh_installdeb
- dh_shlibdeps -L libgdal1-1.7.0 -l debian/libgdal1-1.7.0/usr/lib
+ dh_shlibdeps -L libgdal1-1.8.0 -l debian/libgdal1-1.8.0/usr/lib
dh_gencontrol
dh_md5sums
dh_builddeb
--
GDAL/OGR library and tools
More information about the Pkg-grass-devel
mailing list