[SCM] gdal branch, master, updated. upstream/1.10.0-135-gc977e24

Francesco Paolo Lovergine frankie at debian.org
Fri Jun 21 08:52:51 UTC 2013 

The following commit has been merged in the master branch:
commit cd730eac3ed78841a8e40de7aa262ee04551951c
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Thu Jun 20 10:06:29 2013 +0200

    Refreshed patches for 1.10

diff --git a/debian/changelog b/debian/changelog
index b8dc4e1..59d3526 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,7 +13,7 @@ gdal (1.10.0-0~exp1) experimental; urgency=low
     This choice implies that the API does not include anymore any *tiff
     related functions: changed API declaration.
   * Policy bumped to 3.9.4. No changes required.
-  * New upstream version with many fixes. 
+  * New upstream version with many fixes. All patches refreshed.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Sun, 04 Apr 2013 11:39:57 +0100
 
diff --git a/debian/patches/doc b/debian/patches/doc
index 5513ef8..48627d6 100644
--- a/debian/patches/doc
+++ b/debian/patches/doc
@@ -1,10 +1,10 @@
 Index: gdal/doc/index.dox
 ===================================================================
---- gdal.orig/doc/index.dox	2012-02-20 11:45:37.000000000 +0100
-+++ gdal/doc/index.dox	2012-02-20 11:56:28.000000000 +0100
+--- gdal.orig/doc/index.dox	2013-06-20 10:03:58.000000000 +0200
++++ gdal/doc/index.dox	2013-06-20 10:03:58.000000000 +0200
 @@ -19,7 +19,7 @@
- <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.
+ <a href="http://trac.osgeo.org/gdal/wiki/Release/1.9.2-News">NEWS</a>
+ page describes the October 2012 GDAL/OGR 1.9.2 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) 
@@ -13,8 +13,8 @@ Index: gdal/doc/index.dox
  Master: http://www.gdal.org<br>
 Index: gdal/ogr/index.dox
 ===================================================================
---- gdal.orig/ogr/index.dox	2012-02-20 11:45:37.000000000 +0100
-+++ gdal/ogr/index.dox	2012-02-20 11:56:28.000000000 +0100
+--- gdal.orig/ogr/index.dox	2013-06-20 10:03:58.000000000 +0200
++++ gdal/ogr/index.dox	2013-06-20 10:03:58.000000000 +0200
 @@ -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 f0719d5..58ee099 100644
--- a/debian/patches/ecw-plugin
+++ b/debian/patches/ecw-plugin
@@ -1,8 +1,8 @@
-Index: gdal-1.9.0/frmts/ecw/GNUmakefile
+Index: gdal/frmts/ecw/GNUmakefile
 ===================================================================
---- gdal-1.9.0.orig/frmts/ecw/GNUmakefile	2012-02-20 16:01:45.000000000 +0100
-+++ gdal-1.9.0/frmts/ecw/GNUmakefile	2012-02-20 16:02:27.000000000 +0100
-@@ -20,3 +20,12 @@
+--- gdal.orig/frmts/ecw/GNUmakefile	2013-06-20 10:05:05.000000000 +0200
++++ gdal/frmts/ecw/GNUmakefile	2013-06-20 10:05:05.000000000 +0200
+@@ -21,3 +21,12 @@
  $(PLUGIN_SO):	$(OBJ)
  	$(LD_SHARED) $(LNK_FLAGS) $(OBJ) $(CONFIG_LIBS) $(EXTRA_LIBS) \
  		-o $(PLUGIN_SO)
@@ -15,10 +15,10 @@ Index: gdal-1.9.0/frmts/ecw/GNUmakefile
 +	tar czvf libgdal-ecw-$(GDAL_VER).tar.gz ./libgdal-ecw-$(GDAL_VER)
 +	rm -rf libgdal-ecw-$(GDAL_VER)
 + 
-Index: gdal-1.9.0/frmts/ecw/pkg/Makefile.in
+Index: gdal/frmts/ecw/pkg/Makefile.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdal-1.9.0/frmts/ecw/pkg/Makefile.in	2012-02-20 16:02:27.000000000 +0100
++++ gdal/frmts/ecw/pkg/Makefile.in	2013-06-20 10:05:05.000000000 +0200
 @@ -0,0 +1,36 @@
 +CC	=	@CC@
 +CXX	=	@CXX@
@@ -56,10 +56,10 @@ Index: gdal-1.9.0/frmts/ecw/pkg/Makefile.in
 +%.o:	%.cpp
 +	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
 +
-Index: gdal-1.9.0/frmts/ecw/pkg/README
+Index: gdal/frmts/ecw/pkg/README
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdal-1.9.0/frmts/ecw/pkg/README	2012-02-20 16:02:27.000000000 +0100
++++ gdal/frmts/ecw/pkg/README	2013-06-20 10:05:05.000000000 +0200
 @@ -0,0 +1,30 @@
 +	Standalone ECW 3.3 Drivers for GDAL
 +	===================================
@@ -91,10 +91,10 @@ Index: gdal-1.9.0/frmts/ecw/pkg/README
 +  http://www.ermapper.com/
 +  http://ermapper.com/Downloads.aspx?v=315
 +
-Index: gdal-1.9.0/frmts/ecw/pkg/aclocal.m4
+Index: gdal/frmts/ecw/pkg/aclocal.m4
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdal-1.9.0/frmts/ecw/pkg/aclocal.m4	2012-02-20 16:02:27.000000000 +0100
++++ gdal/frmts/ecw/pkg/aclocal.m4	2013-06-20 10:05:05.000000000 +0200
 @@ -0,0 +1,202 @@
 +AC_DEFUN(AC_COMPILER_LOCALHACK,
 +[
@@ -298,10 +298,10 @@ Index: gdal-1.9.0/frmts/ecw/pkg/aclocal.m4
 +  AC_SUBST(LD_SHARED,$LD_SHARED)
 +  AC_SUBST(SO_EXT,$SO_EXT)
 +])
-Index: gdal-1.9.0/frmts/ecw/pkg/configure
+Index: gdal/frmts/ecw/pkg/configure
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdal-1.9.0/frmts/ecw/pkg/configure	2012-02-20 16:02:27.000000000 +0100
++++ gdal/frmts/ecw/pkg/configure	2013-06-20 10:05:05.000000000 +0200
 @@ -0,0 +1,4498 @@
 +#! /bin/sh
 +# Guess values for system-dependent variables and create Makefiles.
@@ -4801,10 +4801,10 @@ Index: gdal-1.9.0/frmts/ecw/pkg/configure
 +
 +
 +
-Index: gdal-1.9.0/frmts/ecw/pkg/configure.in
+Index: gdal/frmts/ecw/pkg/configure.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdal-1.9.0/frmts/ecw/pkg/configure.in	2012-02-20 16:02:27.000000000 +0100
++++ gdal/frmts/ecw/pkg/configure.in	2013-06-20 10:05:05.000000000 +0200
 @@ -0,0 +1,186 @@
 +dnl ***************************************************************************
 +dnl $Id: configure.in 9971 2006-08-23 20:06:02Z fwarmerdam $
diff --git a/debian/patches/gdalpaths b/debian/patches/gdalpaths
index 0321ff1..bb1373d 100644
--- a/debian/patches/gdalpaths
+++ b/debian/patches/gdalpaths
@@ -1,8 +1,8 @@
 Index: gdal/gcore/gdaldrivermanager.cpp
 ===================================================================
---- gdal.orig/gcore/gdaldrivermanager.cpp	2012-01-04 08:03:38.000000000 +0100
-+++ gdal/gcore/gdaldrivermanager.cpp	2012-02-20 11:33:23.000000000 +0100
-@@ -629,7 +629,7 @@
+--- gdal.orig/gcore/gdaldrivermanager.cpp	2013-06-20 10:04:36.000000000 +0200
++++ gdal/gcore/gdaldrivermanager.cpp	2013-06-20 10:04:36.000000000 +0200
+@@ -667,7 +667,7 @@
      #ifdef MACOSX_FRAMEWORK
                                          GDAL_PREFIX "/PlugIns");
      #else
@@ -13,8 +13,8 @@ Index: gdal/gcore/gdaldrivermanager.cpp
          char szExecPath[1024];
 Index: gdal/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp
 ===================================================================
---- gdal.orig/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp	2012-01-04 08:03:20.000000000 +0100
-+++ gdal/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp	2012-02-20 11:33:23.000000000 +0100
+--- gdal.orig/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp	2013-06-20 10:04:36.000000000 +0200
++++ gdal/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp	2013-06-20 10:04:36.000000000 +0200
 @@ -807,7 +807,7 @@
      #ifdef MACOSX_FRAMEWORK
                                          GDAL_PREFIX "/PlugIns");
@@ -26,8 +26,8 @@ Index: gdal/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp
          char szExecPath[1024];
 Index: gdal/port/cpl_findfile.cpp
 ===================================================================
---- gdal.orig/port/cpl_findfile.cpp	2012-01-04 08:03:15.000000000 +0100
-+++ gdal/port/cpl_findfile.cpp	2012-02-20 11:33:23.000000000 +0100
+--- gdal.orig/port/cpl_findfile.cpp	2013-06-20 10:04:36.000000000 +0200
++++ gdal/port/cpl_findfile.cpp	2013-06-20 10:04:36.000000000 +0200
 @@ -104,7 +104,7 @@
    #ifdef MACOSX_FRAMEWORK
              CPLPushFinderLocation( GDAL_PREFIX "/Resources/gdal" );
diff --git a/debian/patches/hdf4 b/debian/patches/hdf4
index 49dead4..ca6d891 100644
--- a/debian/patches/hdf4
+++ b/debian/patches/hdf4
@@ -1,8 +1,8 @@
 Index: gdal/configure
 ===================================================================
---- gdal.orig/configure	2012-01-04 08:03:42.000000000 +0100
-+++ gdal/configure	2012-02-20 11:36:33.000000000 +0100
-@@ -20726,7 +20726,7 @@
+--- gdal.orig/configure	2013-06-20 10:04:45.000000000 +0200
++++ gdal/configure	2013-06-20 10:04:45.000000000 +0200
+@@ -20930,7 +20930,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" = xyes; then :
@@ -11,7 +11,7 @@ Index: gdal/configure
  else
    HDF_LIB_NAME=missing
  fi
-@@ -20786,7 +20786,7 @@
+@@ -20990,7 +20990,7 @@
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -20,7 +20,7 @@ Index: gdal/configure
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -20817,7 +20817,7 @@
+@@ -21021,7 +21021,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" = xyes; then :
@@ -29,7 +29,7 @@ Index: gdal/configure
  else
    HDF_LIB_NAME=missing
  fi
-@@ -20832,7 +20832,7 @@
+@@ -21036,7 +21036,7 @@
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -38,7 +38,7 @@ Index: gdal/configure
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -20863,7 +20863,7 @@
+@@ -21067,7 +21067,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" = xyes; then :
diff --git a/debian/patches/man b/debian/patches/man
index 6888fc1..7927740 100644
--- a/debian/patches/man
+++ b/debian/patches/man
@@ -1,8 +1,8 @@
 Index: gdal/GNUmakefile
 ===================================================================
---- gdal.orig/GNUmakefile	2012-01-04 08:03:42.000000000 +0100
-+++ gdal/GNUmakefile	2012-02-20 11:33:10.000000000 +0100
-@@ -230,3 +230,4 @@
+--- gdal.orig/GNUmakefile	2013-06-20 10:04:22.000000000 +0200
++++ gdal/GNUmakefile	2013-06-20 10:04:22.000000000 +0200
+@@ -235,3 +235,4 @@
  
  endif # HAVE_LIBTOOL=no 
  
diff --git a/debian/patches/mrsid-plugin b/debian/patches/mrsid-plugin
index b37d68e..d8e0439 100644
--- a/debian/patches/mrsid-plugin
+++ b/debian/patches/mrsid-plugin
@@ -1,8 +1,8 @@
 Index: gdal/frmts/mrsid/GNUmakefile
 ===================================================================
---- gdal.orig/frmts/mrsid/GNUmakefile	2011-02-18 15:52:35.000000000 +0100
-+++ gdal/frmts/mrsid/GNUmakefile	2011-02-18 16:49:37.000000000 +0100
-@@ -28,3 +28,10 @@
+--- gdal.orig/frmts/mrsid/GNUmakefile	2013-06-20 10:05:16.000000000 +0200
++++ gdal/frmts/mrsid/GNUmakefile	2013-06-20 10:05:16.000000000 +0200
+@@ -31,3 +31,10 @@
  #	    -rpath $(INST_LIB) \
  #	    -no-undefined -export-dynamic
  
@@ -16,7 +16,7 @@ Index: gdal/frmts/mrsid/GNUmakefile
 Index: gdal/frmts/mrsid/pkg/Makefile.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdal/frmts/mrsid/pkg/Makefile.in	2011-02-18 16:49:37.000000000 +0100
++++ gdal/frmts/mrsid/pkg/Makefile.in	2013-06-20 10:05:16.000000000 +0200
 @@ -0,0 +1,36 @@
 +CC	=	@CC@
 +CXX	=	@CXX@
@@ -57,7 +57,7 @@ Index: gdal/frmts/mrsid/pkg/Makefile.in
 Index: gdal/frmts/mrsid/pkg/README
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdal/frmts/mrsid/pkg/README	2011-02-18 16:49:37.000000000 +0100
++++ gdal/frmts/mrsid/pkg/README	2013-06-20 10:05:16.000000000 +0200
 @@ -0,0 +1,34 @@
 +	Standalone MrSID Drivers for GDAL
 +	===================================
@@ -96,7 +96,7 @@ Index: gdal/frmts/mrsid/pkg/README
 Index: gdal/frmts/mrsid/pkg/aclocal.m4
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdal/frmts/mrsid/pkg/aclocal.m4	2011-02-18 16:49:37.000000000 +0100
++++ gdal/frmts/mrsid/pkg/aclocal.m4	2013-06-20 10:05:16.000000000 +0200
 @@ -0,0 +1,202 @@
 +AC_DEFUN(AC_COMPILER_LOCALHACK,
 +[
@@ -303,7 +303,7 @@ Index: gdal/frmts/mrsid/pkg/aclocal.m4
 Index: gdal/frmts/mrsid/pkg/configure
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdal/frmts/mrsid/pkg/configure	2011-02-18 16:49:37.000000000 +0100
++++ gdal/frmts/mrsid/pkg/configure	2013-06-20 10:05:16.000000000 +0200
 @@ -0,0 +1,4680 @@
 +#! /bin/sh
 +# Guess values for system-dependent variables and create Makefiles.
@@ -4988,7 +4988,7 @@ Index: gdal/frmts/mrsid/pkg/configure
 Index: gdal/frmts/mrsid/pkg/configure.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdal/frmts/mrsid/pkg/configure.in	2011-02-18 16:49:37.000000000 +0100
++++ gdal/frmts/mrsid/pkg/configure.in	2013-06-20 10:05:16.000000000 +0200
 @@ -0,0 +1,280 @@
 +dnl ***************************************************************************
 +dnl $Id: configure.in 9971 2006-08-23 20:06:02Z fwarmerdam $
diff --git a/debian/patches/spatialite b/debian/patches/spatialite
index 3e1ec80..33837b7 100644
--- a/debian/patches/spatialite
+++ b/debian/patches/spatialite
@@ -1,8 +1,8 @@
 Index: gdal/configure
 ===================================================================
---- gdal.orig/configure	2012-02-20 11:36:33.000000000 +0100
-+++ gdal/configure	2012-02-20 11:41:37.000000000 +0100
-@@ -24425,7 +24425,7 @@
+--- gdal.orig/configure	2013-06-20 10:05:31.000000000 +0200
++++ gdal/configure	2013-06-20 10:05:31.000000000 +0200
+@@ -24910,7 +24910,7 @@
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -11,7 +11,7 @@ Index: gdal/configure
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -24463,7 +24463,7 @@
+@@ -24948,7 +24948,7 @@
  
              if test "$SPATIALITE_INIT_FOUND" = "yes"; then
                  HAVE_SPATIALITE=yes
@@ -20,7 +20,7 @@ Index: gdal/configure
                  HAVE_SQLITE3=yes
              fi
          else
-@@ -24478,7 +24478,7 @@
+@@ -24963,7 +24963,7 @@
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -29,7 +29,7 @@ Index: gdal/configure
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -24528,7 +24528,7 @@
+@@ -25013,7 +25013,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"

-- 
GDAL/OGR library and tools

More information about the Pkg-grass-devel mailing list