[SCM] gdal branch, master, updated. upstream/1.8.1-93-g6735e3e
Alan Boudreault
aboudreault at mapgears.com
Wed Feb 22 23:37:29 UTC 2012
The following commit has been merged in the master branch:
commit a7f3c9049401e3352c7a1e8ec077c357271b02af
Author: Alan Boudreault <aboudreault at mapgears.com>
Date: Wed Feb 1 02:30:18 2012 +0000
Updated a some debian files and patches
diff --git a/debian/control b/debian/control
index 692f037..668b4b8 100644
--- a/debian/control
+++ b/debian/control
@@ -22,8 +22,8 @@ Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: proj-bin
-Breaks: libgdal1-1.8.0
-Replaces: libgdal1-1.8.0
+Breaks: libgdal1-1.9.0
+Replaces: libgdal1-1.9.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.ver b/debian/gdal.ver
index 46ae9a2..e179ca4 100644
--- a/debian/gdal.ver
+++ b/debian/gdal.ver
@@ -1,4 +1,4 @@
-GDAL_1.8 {
+GDAL_1.9 {
global:
*;
};
diff --git a/debian/libgdal1.install b/debian/libgdal1.install
index e85096f..c62b46f 100644
--- a/debian/libgdal1.install
+++ b/debian/libgdal1.install
@@ -1,2 +1,2 @@
usr/lib/libgdal.so.*
-usr/share/gdal/1.8
+usr/share/gdal/1.9
diff --git a/debian/patches/doc b/debian/patches/doc
index 103b933..0f0a1da 100644
--- a/debian/patches/doc
+++ b/debian/patches/doc
@@ -1,20 +1,16 @@
-Index: gdal/doc/index.dox
-===================================================================
---- gdal.orig/doc/index.dox 2011-03-15 18:20:37.000000000 +0100
-+++ gdal/doc/index.dox 2011-03-16 09:50:07.000000000 +0100
+--- a/doc/index.dox
++++ b/doc/index.dox
@@ -19,7 +19,7 @@
- <a href="http://trac.osgeo.org/gdal/wiki/Release/1.7.3-News">NEWS</a>
- page describes the November 2010 GDAL/OGR 1.7.3 release.
+ <a href="http://trac.osgeo.org/gdal/wiki/Release/1.8.1-News">NEWS</a>
+ page describes the July 2011 GDAL/OGR 1.8.1 release.
-The related <a href="ogr/index.html">OGR</a> library (which lives within the GDAL source tree)
+The related <a href="../ogr/index.html">OGR</a> library (which lives within the GDAL source tree)
provides a similar capability for simple features vector data.
Master: http://www.gdal.org<br>
-Index: gdal/ogr/index.dox
-===================================================================
---- gdal.orig/ogr/index.dox 2011-03-15 18:20:37.000000000 +0100
-+++ gdal/ogr/index.dox 2011-03-16 09:50:07.000000000 +0100
+--- a/ogr/index.dox
++++ b/ogr/index.dox
@@ -6,7 +6,7 @@
formats including ESRI Shapefiles, S-57, SDTS, PostGIS, Oracle Spatial,
and Mapinfo mid/mif and TAB formats.<p>
diff --git a/debian/patches/ecw-plugin b/debian/patches/ecw-plugin
index 5b11d0a..4c6eef4 100644
--- a/debian/patches/ecw-plugin
+++ b/debian/patches/ecw-plugin
@@ -1,8 +1,6 @@
-Index: gdal/frmts/ecw/GNUmakefile
-===================================================================
---- gdal.orig/frmts/ecw/GNUmakefile 2011-09-26 13:18:54.000000000 +0200
-+++ gdal/frmts/ecw/GNUmakefile 2011-09-26 13:20:22.000000000 +0200
-@@ -18,3 +18,12 @@
+--- a/frmts/ecw/GNUmakefile
++++ b/frmts/ecw/GNUmakefile
+@@ -20,3 +20,12 @@
$(PLUGIN_SO): $(OBJ)
$(LD_SHARED) $(LNK_FLAGS) $(OBJ) $(CONFIG_LIBS) $(EXTRA_LIBS) \
-o $(PLUGIN_SO)
@@ -15,21 +13,8 @@ Index: gdal/frmts/ecw/GNUmakefile
+ tar czvf libgdal-ecw-$(GDAL_VER).tar.gz ./libgdal-ecw-$(GDAL_VER)
+ rm -rf libgdal-ecw-$(GDAL_VER)
+
-Index: gdal/frmts/ecw/ecwdataset.cpp
-===================================================================
---- gdal.orig/frmts/ecw/ecwdataset.cpp 2011-09-26 13:18:54.000000000 +0200
-+++ gdal/frmts/ecw/ecwdataset.cpp 2011-09-26 13:20:22.000000000 +0200
-@@ -1904,6 +1904,3 @@
- #endif /* def FRMT_ecw */
- }
-
--
--
--
-Index: gdal/frmts/ecw/pkg/Makefile.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gdal/frmts/ecw/pkg/Makefile.in 2011-09-26 13:20:22.000000000 +0200
+--- /dev/null
++++ b/frmts/ecw/pkg/Makefile.in
@@ -0,0 +1,36 @@
+CC = @CC@
+CXX = @CXX@
@@ -67,10 +52,8 @@ Index: gdal/frmts/ecw/pkg/Makefile.in
+%.o: %.cpp
+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
+
-Index: gdal/frmts/ecw/pkg/README
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gdal/frmts/ecw/pkg/README 2011-09-26 13:20:22.000000000 +0200
+--- /dev/null
++++ b/frmts/ecw/pkg/README
@@ -0,0 +1,30 @@
+ Standalone ECW 3.3 Drivers for GDAL
+ ===================================
@@ -102,10 +85,8 @@ Index: gdal/frmts/ecw/pkg/README
+ http://www.ermapper.com/
+ http://ermapper.com/Downloads.aspx?v=315
+
-Index: gdal/frmts/ecw/pkg/aclocal.m4
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gdal/frmts/ecw/pkg/aclocal.m4 2011-09-26 13:20:22.000000000 +0200
+--- /dev/null
++++ b/frmts/ecw/pkg/aclocal.m4
@@ -0,0 +1,202 @@
+AC_DEFUN(AC_COMPILER_LOCALHACK,
+[
@@ -309,10 +290,8 @@ Index: gdal/frmts/ecw/pkg/aclocal.m4
+ AC_SUBST(LD_SHARED,$LD_SHARED)
+ AC_SUBST(SO_EXT,$SO_EXT)
+])
-Index: gdal/frmts/ecw/pkg/configure
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gdal/frmts/ecw/pkg/configure 2011-09-26 13:20:22.000000000 +0200
+--- /dev/null
++++ b/frmts/ecw/pkg/configure
@@ -0,0 +1,4498 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
@@ -4812,10 +4791,8 @@ Index: gdal/frmts/ecw/pkg/configure
+
+
+
-Index: gdal/frmts/ecw/pkg/configure.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gdal/frmts/ecw/pkg/configure.in 2011-09-26 13:20:22.000000000 +0200
+--- /dev/null
++++ b/frmts/ecw/pkg/configure.in
@@ -0,0 +1,186 @@
+dnl ***************************************************************************
+dnl $Id: configure.in 9971 2006-08-23 20:06:02Z fwarmerdam $
diff --git a/debian/patches/epsilon b/debian/patches/epsilon
deleted file mode 100644
index 432ae61..0000000
--- a/debian/patches/epsilon
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: gdal/frmts/epsilon/epsilondataset.cpp
-===================================================================
---- gdal.orig/frmts/epsilon/epsilondataset.cpp 2011-05-12 11:50:58.000000000 +0200
-+++ gdal/frmts/epsilon/epsilondataset.cpp 2011-05-12 11:53:19.000000000 +0200
-@@ -237,8 +237,8 @@
- return CE_Failure;
- }
-
-- int w = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.w : hdr.tc.w;
-- int h = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.h : hdr.tc.h;
-+ int w = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.w : hdr.hdr_data.tc.w;
-+ int h = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.h : hdr.hdr_data.tc.h;
- int i;
-
- if (poGDS->nBands == 1)
-@@ -505,12 +505,12 @@
- continue;
- }
-
-- int W = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.W : hdr.tc.W;
-- int H = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.H : hdr.tc.H;
-- int x = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.x : hdr.tc.x;
-- int y = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.y : hdr.tc.y;
-- int w = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.w : hdr.tc.w;
-- int h = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.h : hdr.tc.h;
-+ int W = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.W : hdr.hdr_data.tc.W;
-+ int H = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.H : hdr.hdr_data.tc.H;
-+ int x = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.x : hdr.hdr_data.tc.x;
-+ int y = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.y : hdr.hdr_data.tc.y;
-+ int w = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.w : hdr.hdr_data.tc.w;
-+ int h = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.h : hdr.hdr_data.tc.h;
-
- //CPLDebug("EPSILON", "W=%d,H=%d,x=%d,y=%d,w=%d,h=%d,offset=" CPL_FRMT_GUIB,
- // W, H, x, y, w, h, nStartBlockFileOff);
diff --git a/debian/patches/hdf4 b/debian/patches/hdf4
index 076b534..4cf06ac 100644
--- a/debian/patches/hdf4
+++ b/debian/patches/hdf4
@@ -1,17 +1,24 @@
-Index: gdal/configure
-===================================================================
---- gdal.orig/configure 2011-09-26 13:18:54.000000000 +0200
-+++ gdal/configure 2011-09-26 13:20:01.000000000 +0200
-@@ -18889,7 +18889,7 @@
+--- a/configure
++++ b/configure
+@@ -20695,7 +20695,7 @@
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lmfhdf -ldf $LIBS"
++LIBS="-lmfhdfalt -ldfalt $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+@@ -20726,7 +20726,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mfhdf_SDreaddata" >&5
$as_echo "$ac_cv_lib_mfhdf_SDreaddata" >&6; }
- if test "x$ac_cv_lib_mfhdf_SDreaddata" = x""yes; then :
+ if test "x$ac_cv_lib_mfhdf_SDreaddata" = xyes; then :
- HDF_LIB_NAME="-lmfhdf -ldf"
+ HDF_LIB_NAME="-lmfhdfalt -ldfalt"
else
HDF_LIB_NAME=missing
fi
-@@ -18949,7 +18949,7 @@
+@@ -20786,7 +20786,7 @@
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -20,16 +27,16 @@ Index: gdal/configure
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -18980,7 +18980,7 @@
+@@ -20817,7 +20817,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mfhdf_SDreaddata" >&5
$as_echo "$ac_cv_lib_mfhdf_SDreaddata" >&6; }
- if test "x$ac_cv_lib_mfhdf_SDreaddata" = x""yes; then :
+ if test "x$ac_cv_lib_mfhdf_SDreaddata" = xyes; then :
- HDF_LIB_NAME="-lmfhdf -ldf"
+ HDF_LIB_NAME="-lmfhdfalt -ldfalt"
else
HDF_LIB_NAME=missing
fi
-@@ -18995,7 +18995,7 @@
+@@ -20832,7 +20832,7 @@
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -38,10 +45,10 @@ Index: gdal/configure
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -19026,7 +19026,7 @@
+@@ -20863,7 +20863,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mfhdf_SDreaddata" >&5
$as_echo "$ac_cv_lib_mfhdf_SDreaddata" >&6; }
- if test "x$ac_cv_lib_mfhdf_SDreaddata" = x""yes; then :
+ if test "x$ac_cv_lib_mfhdf_SDreaddata" = xyes; then :
- HDF_LIB_NAME="-lmfhdf -ldf -lsz"
+ HDF_LIB_NAME="-lmfhdfalt -ldfalt -lsz"
else
diff --git a/debian/patches/rubymakefile b/debian/patches/rubymakefile
index 6ada98a..6d5d449 100644
--- a/debian/patches/rubymakefile
+++ b/debian/patches/rubymakefile
@@ -1,27 +1,26 @@
-Index: gdal/swig/ruby/RubyMakefile.mk
-===================================================================
---- gdal.orig/swig/ruby/RubyMakefile.mk 2011-02-18 15:52:35.000000000 +0100
-+++ gdal/swig/ruby/RubyMakefile.mk 2011-02-18 16:47:30.000000000 +0100
-@@ -25,7 +25,9 @@
- INSTALL_DIR := $(RUBY_EXTENSIONS_DIR)/gdal
+--- a/swig/ruby/RubyMakefile.mk
++++ b/swig/ruby/RubyMakefile.mk
+@@ -37,7 +37,9 @@
- RUBY_INCLUDE = -I$(RUBY_INCLUDE_DIR)
--LDFLAGS += -Xcompiler -shared -L$(RUBY_LIB_DIR)
-+LDFLAGS += -fPIC -DPIC -Xcompiler -shared -L$(RUBY_LIB_DIR)
+ ifeq ("$(shell uname -s)", "Darwin")
+ RUBY_MODULES=$(RUBY_MODULES_MAC)
+-LDFLAGS += -Xcompiler -bundle -L$(RUBY_LIB_DIR)
++LDFLAGS += -fPIC -DPIC -Xcompiler -bundle -L$(RUBY_LIB_DIR)
+CFLAGS += -fPIC -DPIC
+CXXFLAGS += -fPIC -DPIC
RUBY_LIB := -l$(RUBY_SO_NAME)
-
- build: $(RUBY_MODULES)
-@@ -40,17 +42,17 @@
+ else
+ RUBY_MODULES=$(RUBY_MODULES_LIN)
+@@ -59,7 +61,7 @@
$(INSTALL_DIR):
mkdir -p $(DESTDIR)$(INSTALL_DIR)
-install: $(INSTALL_DIR)
+install: $(INSTALL_DIR) $(RUBY_MODULES)
- $(INSTALL) $(RUBY_MODULES) $(DESTDIR)$(INSTALL_DIR)
+ for i in $(RUBY_MODULES) ; do $(INSTALL) $$i $(DESTDIR)$(INSTALL_DIR) ; done
- $(RUBY_MODULES): %.so: %_wrap.o
+ $(RUBY_MODULES_MAC): %.bundle: %_wrap.o
+@@ -69,10 +71,10 @@
$(LD) $(LDFLAGS) $(LIBS) $(GDAL_SLIB_LINK) $(RUBY_LIB) $< -o $@
%.o: %.cpp
diff --git a/debian/patches/series b/debian/patches/series
index 7e23f1e..f1d5778 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,4 +9,3 @@ ecw-plugin
mrsid-plugin
symver
spatialite
-epsilon
diff --git a/debian/patches/spatialite b/debian/patches/spatialite
index bea4f9d..25f4326 100644
--- a/debian/patches/spatialite
+++ b/debian/patches/spatialite
@@ -1,22 +1,20 @@
-Index: gdal/configure
-===================================================================
---- gdal.orig/configure 2011-09-26 13:20:01.000000000 +0200
-+++ gdal/configure 2011-09-26 13:20:49.000000000 +0200
-@@ -22284,7 +22284,7 @@
+--- a/configure
++++ b/configure
+@@ -24463,7 +24463,7 @@
- if test "$SPATIALITE_INIT_FOUND" = "yes"; then
- HAVE_SPATIALITE=yes
-- LIBS="$LIBS -lspatialite"
-+ LIBS="$LIBS -lspatialite -lsqlite3"
- HAVE_SQLITE3=yes
- fi
- else
-@@ -22343,7 +22343,7 @@
+ if test "$SPATIALITE_INIT_FOUND" = "yes"; then
+ HAVE_SPATIALITE=yes
+- LIBS="$LIBS -lspatialite"
++ LIBS="$LIBS -lspatialite -lsqlite3"
+ HAVE_SQLITE3=yes
+ fi
+ else
+@@ -24528,7 +24528,7 @@
# as there's a spatialite.h file in it, which we don't want to include.
# We want to include include/spatialite.h instead !
SQLITE3_CFLAGS="-I$with_spatialite/include"
- LIBS="$LIBS -L$with_spatialite/lib -lspatialite"
+ LIBS="$LIBS -L$with_spatialite/lib -lspatialite -lsqlite3"
HAVE_SQLITE3=yes
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+
+ elif test -f "$with_spatialite/include/spatialite.h" -a \
--
GDAL/OGR library and tools
More information about the Pkg-grass-devel
mailing list