[SCM] gdal branch, master, updated. upstream/1.8.0-45-g44fecc2
Francesco Paolo Lovergine
frankie at debian.org
Tue Sep 27 16:15:08 UTC 2011
The following commit has been merged in the master branch:
commit 83ebe36e68e0b7c6c9a6f4aa979fda2ee66e2e79
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date: Mon Sep 26 13:21:12 2011 +0200
Refreshed all patches.
diff --git a/debian/patches/ecw-plugin b/debian/patches/ecw-plugin
index ba3b937..5b11d0a 100644
--- a/debian/patches/ecw-plugin
+++ b/debian/patches/ecw-plugin
@@ -1,7 +1,7 @@
Index: gdal/frmts/ecw/GNUmakefile
===================================================================
---- gdal.orig/frmts/ecw/GNUmakefile 2011-02-18 15:52:35.000000000 +0100
-+++ gdal/frmts/ecw/GNUmakefile 2011-02-18 16:49:18.000000000 +0100
+--- 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 @@
$(PLUGIN_SO): $(OBJ)
$(LD_SHARED) $(LNK_FLAGS) $(OBJ) $(CONFIG_LIBS) $(EXTRA_LIBS) \
@@ -17,9 +17,9 @@ Index: gdal/frmts/ecw/GNUmakefile
+
Index: gdal/frmts/ecw/ecwdataset.cpp
===================================================================
---- gdal.orig/frmts/ecw/ecwdataset.cpp 2011-02-18 15:52:35.000000000 +0100
-+++ gdal/frmts/ecw/ecwdataset.cpp 2011-02-18 16:49:18.000000000 +0100
-@@ -1730,6 +1730,3 @@
+--- 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 */
}
@@ -29,7 +29,7 @@ Index: gdal/frmts/ecw/ecwdataset.cpp
Index: gdal/frmts/ecw/pkg/Makefile.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gdal/frmts/ecw/pkg/Makefile.in 2011-02-18 16:49:18.000000000 +0100
++++ gdal/frmts/ecw/pkg/Makefile.in 2011-09-26 13:20:22.000000000 +0200
@@ -0,0 +1,36 @@
+CC = @CC@
+CXX = @CXX@
@@ -70,7 +70,7 @@ Index: gdal/frmts/ecw/pkg/Makefile.in
Index: gdal/frmts/ecw/pkg/README
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gdal/frmts/ecw/pkg/README 2011-02-18 16:49:18.000000000 +0100
++++ gdal/frmts/ecw/pkg/README 2011-09-26 13:20:22.000000000 +0200
@@ -0,0 +1,30 @@
+ Standalone ECW 3.3 Drivers for GDAL
+ ===================================
@@ -105,7 +105,7 @@ Index: gdal/frmts/ecw/pkg/README
Index: gdal/frmts/ecw/pkg/aclocal.m4
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gdal/frmts/ecw/pkg/aclocal.m4 2011-02-18 16:49:18.000000000 +0100
++++ gdal/frmts/ecw/pkg/aclocal.m4 2011-09-26 13:20:22.000000000 +0200
@@ -0,0 +1,202 @@
+AC_DEFUN(AC_COMPILER_LOCALHACK,
+[
@@ -312,7 +312,7 @@ Index: gdal/frmts/ecw/pkg/aclocal.m4
Index: gdal/frmts/ecw/pkg/configure
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gdal/frmts/ecw/pkg/configure 2011-02-18 16:49:18.000000000 +0100
++++ gdal/frmts/ecw/pkg/configure 2011-09-26 13:20:22.000000000 +0200
@@ -0,0 +1,4498 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
@@ -4815,7 +4815,7 @@ 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-02-18 16:49:18.000000000 +0100
++++ gdal/frmts/ecw/pkg/configure.in 2011-09-26 13:20:22.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 01a8380..2d394e5 100644
--- a/debian/patches/gdalpaths
+++ b/debian/patches/gdalpaths
@@ -1,7 +1,7 @@
Index: gdal/gcore/gdaldrivermanager.cpp
===================================================================
---- gdal.orig/gcore/gdaldrivermanager.cpp 2011-02-18 16:49:44.000000000 +0100
-+++ gdal/gcore/gdaldrivermanager.cpp 2011-02-22 15:37:55.000000000 +0100
+--- gdal.orig/gcore/gdaldrivermanager.cpp 2011-09-26 13:18:54.000000000 +0200
++++ gdal/gcore/gdaldrivermanager.cpp 2011-09-26 13:19:40.000000000 +0200
@@ -567,7 +567,7 @@
#ifdef MACOSX_FRAMEWORK
GDAL_PREFIX "/PlugIns");
@@ -13,9 +13,9 @@ Index: gdal/gcore/gdaldrivermanager.cpp
char szExecPath[1024];
Index: gdal/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp
===================================================================
---- gdal.orig/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp 2011-02-18 16:49:44.000000000 +0100
-+++ gdal/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp 2011-02-22 15:38:19.000000000 +0100
-@@ -733,7 +733,7 @@
+--- gdal.orig/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp 2011-09-26 13:18:54.000000000 +0200
++++ gdal/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp 2011-09-26 13:19:40.000000000 +0200
+@@ -804,7 +804,7 @@
#ifdef MACOSX_FRAMEWORK
GDAL_PREFIX "/PlugIns");
#else
@@ -26,9 +26,9 @@ Index: gdal/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp
char szExecPath[1024];
Index: gdal/port/cpl_findfile.cpp
===================================================================
---- gdal.orig/port/cpl_findfile.cpp 2011-02-18 16:49:44.000000000 +0100
-+++ gdal/port/cpl_findfile.cpp 2011-02-22 15:38:27.000000000 +0100
-@@ -83,7 +83,7 @@
+--- gdal.orig/port/cpl_findfile.cpp 2011-09-26 13:18:54.000000000 +0200
++++ gdal/port/cpl_findfile.cpp 2011-09-26 13:19:40.000000000 +0200
+@@ -104,7 +104,7 @@
#ifdef MACOSX_FRAMEWORK
CPLPushFinderLocation( GDAL_PREFIX "/Resources/gdal" );
#else
diff --git a/debian/patches/hdf4 b/debian/patches/hdf4
index c870548..076b534 100644
--- a/debian/patches/hdf4
+++ b/debian/patches/hdf4
@@ -1,8 +1,8 @@
Index: gdal/configure
===================================================================
---- gdal.orig/configure 2011-02-18 15:52:35.000000000 +0100
-+++ gdal/configure 2011-02-18 16:48:36.000000000 +0100
-@@ -18774,7 +18774,7 @@
+--- 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 @@
{ $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 :
@@ -11,7 +11,7 @@ Index: gdal/configure
else
HDF_LIB_NAME=missing
fi
-@@ -18834,7 +18834,7 @@
+@@ -18949,7 +18949,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. */
-@@ -18865,7 +18865,7 @@
+@@ -18980,7 +18980,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 :
@@ -29,7 +29,7 @@ Index: gdal/configure
else
HDF_LIB_NAME=missing
fi
-@@ -18880,7 +18880,7 @@
+@@ -18995,7 +18995,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. */
-@@ -18911,7 +18911,7 @@
+@@ -19026,7 +19026,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 :
diff --git a/debian/patches/libname b/debian/patches/libname
index 596b708..0cb3f52 100644
--- a/debian/patches/libname
+++ b/debian/patches/libname
@@ -1,7 +1,7 @@
Index: gdal/GDALmake.opt.in
===================================================================
---- 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
+--- 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
@@ -9,7 +9,7 @@ Index: gdal/GDALmake.opt.in
-LIBGDAL := libgdal.la
+LIBGDAL := libgdal1.8.0.la
LIBGDAL_CURRENT := 16
- LIBGDAL_REVISION := 0
+ LIBGDAL_REVISION := 1
LIBGDAL_AGE := 15
@@ -105,9 +105,9 @@
GDAL_VERSION_MINOR = @GDAL_VERSION_MINOR@
@@ -50,8 +50,8 @@ Index: gdal/GDALmake.opt.in
else
Index: gdal/swig/perl/Makefile.PL
===================================================================
---- 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
+--- 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";
}
diff --git a/debian/patches/spatialite b/debian/patches/spatialite
index dee9478..bea4f9d 100644
--- a/debian/patches/spatialite
+++ b/debian/patches/spatialite
@@ -1,8 +1,8 @@
Index: gdal/configure
===================================================================
---- gdal.orig/configure 2011-05-12 11:09:37.000000000 +0200
-+++ gdal/configure 2011-05-12 11:12:03.000000000 +0200
-@@ -22282,7 +22282,7 @@
+--- 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 @@
if test "$SPATIALITE_INIT_FOUND" = "yes"; then
HAVE_SPATIALITE=yes
@@ -11,7 +11,7 @@ Index: gdal/configure
HAVE_SQLITE3=yes
fi
else
-@@ -22341,7 +22341,7 @@
+@@ -22343,7 +22343,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