The following commit has been merged in the master branch: commit 60d2ea81c6be615a7316b17c27e7ade7e04fa3cf Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Fri Oct 4 01:43:37 2013 +0200
Refresh patches. diff --git a/debian/changelog b/debian/changelog index 0390b3c..53a0c07 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ gdal (1.10.1+dfsg-0~exp1) UNRELEASED; urgency=low * Update watch file. * Remove data files with unclear rights. (closes: #721343) + * Refresh patches. -- Bas Couwenberg <sebas...@xs4all.nl> Thu, 03 Oct 2013 23:19:27 +0200 diff --git a/debian/patches/ecw-plugin b/debian/patches/ecw-plugin index 58ee099..5ab3757 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 2013-06-20 10:05:05.000000000 +0200 -+++ gdal/frmts/ecw/GNUmakefile 2013-06-20 10:05:05.000000000 +0200 -@@ -21,3 +21,12 @@ +--- a/frmts/ecw/GNUmakefile ++++ b/frmts/ecw/GNUmakefile +@@ -21,3 +21,12 @@ plugin: $(PLUGIN_SO) $(PLUGIN_SO): $(OBJ) $(LD_SHARED) $(LNK_FLAGS) $(OBJ) $(CONFIG_LIBS) $(EXTRA_LIBS) \ -o $(PLUGIN_SO) @@ -15,10 +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/pkg/Makefile.in -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdal/frmts/ecw/pkg/Makefile.in 2013-06-20 10:05:05.000000000 +0200 +--- /dev/null ++++ b/frmts/ecw/pkg/Makefile.in @@ -0,0 +1,36 @@ +CC = @CC@ +CXX = @CXX@ @@ -56,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 2013-06-20 10:05:05.000000000 +0200 +--- /dev/null ++++ b/frmts/ecw/pkg/README @@ -0,0 +1,30 @@ + Standalone ECW 3.3 Drivers for GDAL + =================================== @@ -91,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 2013-06-20 10:05:05.000000000 +0200 +--- /dev/null ++++ b/frmts/ecw/pkg/aclocal.m4 @@ -0,0 +1,202 @@ +AC_DEFUN(AC_COMPILER_LOCALHACK, +[ @@ -298,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 2013-06-20 10:05:05.000000000 +0200 +--- /dev/null ++++ b/frmts/ecw/pkg/configure @@ -0,0 +1,4498 @@ +#! /bin/sh +# Guess values for system-dependent variables and create Makefiles. @@ -4801,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 2013-06-20 10:05:05.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/gdal-grass b/debian/patches/gdal-grass index c4ff61a..5730379 100644 --- a/debian/patches/gdal-grass +++ b/debian/patches/gdal-grass @@ -1,8 +1,6 @@ -Index: gdal/frmts/grass/GNUmakefile -=================================================================== ---- gdal.orig/frmts/grass/GNUmakefile 2011-02-18 15:52:35.000000000 +0100 -+++ gdal/frmts/grass/GNUmakefile 2011-02-18 16:49:02.000000000 +0100 -@@ -21,11 +21,13 @@ +--- a/frmts/grass/GNUmakefile ++++ b/frmts/grass/GNUmakefile +@@ -21,11 +21,13 @@ clean: install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) dist: diff --git a/debian/patches/gdalpaths b/debian/patches/gdalpaths index 79d0198..ba29df1 100644 --- a/debian/patches/gdalpaths +++ b/debian/patches/gdalpaths @@ -1,8 +1,6 @@ -Index: gdal/gcore/gdaldrivermanager.cpp -=================================================================== ---- 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 @@ +--- a/gcore/gdaldrivermanager.cpp ++++ b/gcore/gdaldrivermanager.cpp +@@ -667,7 +667,7 @@ void GDALDriverManager::AutoLoadDrivers( #ifdef MACOSX_FRAMEWORK GDAL_PREFIX "/PlugIns"); #else @@ -11,11 +9,9 @@ Index: gdal/gcore/gdaldrivermanager.cpp #endif #else char szExecPath[1024]; -Index: gdal/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp -=================================================================== ---- 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 @@ +--- a/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp ++++ b/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp +@@ -807,7 +807,7 @@ void OGRSFDriverRegistrar::AutoLoadDrive #ifdef MACOSX_FRAMEWORK GDAL_PREFIX "/PlugIns"); #else @@ -24,11 +20,9 @@ Index: gdal/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp #endif #else char szExecPath[1024]; -Index: gdal/port/cpl_findfile.cpp -=================================================================== ---- 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 @@ +--- a/port/cpl_findfile.cpp ++++ b/port/cpl_findfile.cpp +@@ -104,7 +104,7 @@ static FindFileTLS* CPLFinderInit() #ifdef MACOSX_FRAMEWORK CPLPushFinderLocation( GDAL_PREFIX "/Resources/gdal" ); #else diff --git a/debian/patches/hdf4 b/debian/patches/hdf4 index ca6d891..d1dbe26 100644 --- a/debian/patches/hdf4 +++ b/debian/patches/hdf4 @@ -1,8 +1,6 @@ -Index: gdal/configure -=================================================================== ---- 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 @@ +--- a/configure ++++ b/configure +@@ -20930,7 +20930,7 @@ fi { $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 +9,7 @@ Index: gdal/configure else HDF_LIB_NAME=missing fi -@@ -20990,7 +20990,7 @@ +@@ -20990,7 +20990,7 @@ if ${ac_cv_lib_mfhdf_SDreaddata+:} false $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -20,7 +18,7 @@ Index: gdal/configure cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -21021,7 +21021,7 @@ +@@ -21021,7 +21021,7 @@ fi { $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 +27,7 @@ Index: gdal/configure else HDF_LIB_NAME=missing fi -@@ -21036,7 +21036,7 @@ +@@ -21036,7 +21036,7 @@ if ${ac_cv_lib_mfhdf_SDreaddata+:} false $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -38,7 +36,7 @@ Index: gdal/configure cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -21067,7 +21067,7 @@ +@@ -21067,7 +21067,7 @@ fi { $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/java-make b/debian/patches/java-make index 82506e8..dee4d51 100644 --- a/debian/patches/java-make +++ b/debian/patches/java-make @@ -1,8 +1,6 @@ -Index: gdal/swig/java/GNUmakefile -=================================================================== ---- gdal.orig/swig/java/GNUmakefile 2013-07-01 13:38:05.000000000 +0200 -+++ gdal/swig/java/GNUmakefile 2013-07-01 13:38:19.000000000 +0200 -@@ -35,7 +35,7 @@ +--- a/swig/java/GNUmakefile ++++ b/swig/java/GNUmakefile +@@ -35,7 +35,7 @@ JAVA_OBJECTS = gdalconst_wrap.$(OBJ_EXT) clean: -rm -f ${JAVA_MODULES} diff --git a/debian/patches/java.opt b/debian/patches/java.opt index d290356..e898d69 100644 --- a/debian/patches/java.opt +++ b/debian/patches/java.opt @@ -1,7 +1,5 @@ -Index: gdal/swig/java/java.opt -=================================================================== ---- gdal.orig/swig/java/java.opt 2013-07-01 12:07:30.000000000 +0200 -+++ gdal/swig/java/java.opt 2013-07-01 12:07:50.000000000 +0200 +--- a/swig/java/java.opt ++++ b/swig/java/java.opt @@ -1,7 +1,7 @@ # # Java Stuff diff --git a/debian/patches/man b/debian/patches/man index 7927740..5b49e78 100644 --- a/debian/patches/man +++ b/debian/patches/man @@ -1,8 +1,6 @@ -Index: gdal/GNUmakefile -=================================================================== ---- 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 @@ +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -235,3 +235,4 @@ endif # HAVE_LD_SHARED=no endif # HAVE_LIBTOOL=no diff --git a/debian/patches/mrsid-plugin b/debian/patches/mrsid-plugin index d8e0439..90ce54d 100644 --- a/debian/patches/mrsid-plugin +++ b/debian/patches/mrsid-plugin @@ -1,8 +1,6 @@ -Index: gdal/frmts/mrsid/GNUmakefile -=================================================================== ---- 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 @@ +--- a/frmts/mrsid/GNUmakefile ++++ b/frmts/mrsid/GNUmakefile +@@ -31,3 +31,10 @@ $(PLUGIN_DLL): $(OBJ) # -rpath $(INST_LIB) \ # -no-undefined -export-dynamic @@ -13,10 +11,8 @@ Index: gdal/frmts/mrsid/GNUmakefile + cp *.cpp libgdal-mrsid-$(GDAL_VER) + tar czvf libgdal-mrsid-$(GDAL_VER).tar.gz ./libgdal-mrsid-$(GDAL_VER) + rm -rf libgdal-mrsid-$(GDAL_VER) -Index: gdal/frmts/mrsid/pkg/Makefile.in -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdal/frmts/mrsid/pkg/Makefile.in 2013-06-20 10:05:16.000000000 +0200 +--- /dev/null ++++ b/frmts/mrsid/pkg/Makefile.in @@ -0,0 +1,36 @@ +CC = @CC@ +CXX = @CXX@ @@ -54,10 +50,8 @@ Index: gdal/frmts/mrsid/pkg/Makefile.in +%.o: %.cpp + $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $< + -Index: gdal/frmts/mrsid/pkg/README -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdal/frmts/mrsid/pkg/README 2013-06-20 10:05:16.000000000 +0200 +--- /dev/null ++++ b/frmts/mrsid/pkg/README @@ -0,0 +1,34 @@ + Standalone MrSID Drivers for GDAL + =================================== @@ -93,10 +87,8 @@ Index: gdal/frmts/mrsid/pkg/README + http://www.gdal.org/ + http://www.lizardtech.com/ + http://www.lizardtech.com/download/ -Index: gdal/frmts/mrsid/pkg/aclocal.m4 -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdal/frmts/mrsid/pkg/aclocal.m4 2013-06-20 10:05:16.000000000 +0200 +--- /dev/null ++++ b/frmts/mrsid/pkg/aclocal.m4 @@ -0,0 +1,202 @@ +AC_DEFUN(AC_COMPILER_LOCALHACK, +[ @@ -300,10 +292,8 @@ Index: gdal/frmts/mrsid/pkg/aclocal.m4 + AC_SUBST(LD_SHARED,$LD_SHARED) + AC_SUBST(SO_EXT,$SO_EXT) +]) -Index: gdal/frmts/mrsid/pkg/configure -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdal/frmts/mrsid/pkg/configure 2013-06-20 10:05:16.000000000 +0200 +--- /dev/null ++++ b/frmts/mrsid/pkg/configure @@ -0,0 +1,4680 @@ +#! /bin/sh +# Guess values for system-dependent variables and create Makefiles. @@ -4985,10 +4975,8 @@ Index: gdal/frmts/mrsid/pkg/configure + $ac_cs_success || { (exit 1); exit 1; } +fi + -Index: gdal/frmts/mrsid/pkg/configure.in -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdal/frmts/mrsid/pkg/configure.in 2013-06-20 10:05:16.000000000 +0200 +--- /dev/null ++++ b/frmts/mrsid/pkg/configure.in @@ -0,0 +1,280 @@ +dnl *************************************************************************** +dnl $Id: configure.in 9971 2006-08-23 20:06:02Z fwarmerdam $ diff --git a/debian/patches/ogdi b/debian/patches/ogdi index aa9fa27..812d4ae 100644 --- a/debian/patches/ogdi +++ b/debian/patches/ogdi @@ -1,8 +1,6 @@ -Index: gdal/GDALmake.opt.in -=================================================================== ---- gdal.orig/GDALmake.opt.in 2012-01-04 08:03:42.000000000 +0100 -+++ gdal/GDALmake.opt.in 2012-02-20 11:29:36.000000000 +0100 -@@ -348,7 +348,7 @@ +--- a/GDALmake.opt.in ++++ b/GDALmake.opt.in +@@ -353,7 +353,7 @@ endif # PCRaster support PCRASTER_SETTING = @PCRASTER_SETTING@ diff --git a/debian/patches/rubymakefile b/debian/patches/rubymakefile index 49f13bd..59dfb42 100644 --- a/debian/patches/rubymakefile +++ b/debian/patches/rubymakefile @@ -1,8 +1,6 @@ -Index: gdal/swig/ruby/RubyMakefile.mk -=================================================================== ---- gdal.orig/swig/ruby/RubyMakefile.mk 2012-01-04 08:03:41.000000000 +0100 -+++ gdal/swig/ruby/RubyMakefile.mk 2012-02-20 11:32:37.000000000 +0100 -@@ -41,7 +41,9 @@ +--- a/swig/ruby/RubyMakefile.mk ++++ b/swig/ruby/RubyMakefile.mk +@@ -41,7 +41,9 @@ LDFLAGS += -Xcompiler -bundle -L$(RUBY_L RUBY_LIB := -l$(RUBY_SO_NAME) else RUBY_MODULES=$(RUBY_MODULES_LIN) @@ -13,7 +11,7 @@ Index: gdal/swig/ruby/RubyMakefile.mk RUBY_LIB := -l$(RUBY_SO_NAME) endif -@@ -59,7 +61,7 @@ +@@ -59,7 +61,7 @@ veryclean: clean $(INSTALL_DIR): mkdir -p $(DESTDIR)$(INSTALL_DIR) @@ -22,7 +20,7 @@ Index: gdal/swig/ruby/RubyMakefile.mk for i in $(RUBY_MODULES) ; do $(INSTALL) $$i $(DESTDIR)$(INSTALL_DIR) ; done $(RUBY_MODULES_MAC): %.bundle: %_wrap.o -@@ -69,10 +71,10 @@ +@@ -69,10 +71,10 @@ $(RUBY_MODULES_LIN): %.so: %_wrap.o $(LD) $(LDFLAGS) $(LIBS) $(GDAL_SLIB_LINK) $(RUBY_LIB) $< -o $@ %.o: %.cpp diff --git a/debian/patches/spatialite b/debian/patches/spatialite index 33837b7..b0f4bb7 100644 --- a/debian/patches/spatialite +++ b/debian/patches/spatialite @@ -1,8 +1,6 @@ -Index: gdal/configure -=================================================================== ---- 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 @@ +--- a/configure ++++ b/configure +@@ -24910,7 +24910,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11,7 +9,7 @@ Index: gdal/configure cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -24948,7 +24948,7 @@ +@@ -24948,7 +24948,7 @@ fi if test "$SPATIALITE_INIT_FOUND" = "yes"; then HAVE_SPATIALITE=yes @@ -20,7 +18,7 @@ Index: gdal/configure HAVE_SQLITE3=yes fi else -@@ -24963,7 +24963,7 @@ +@@ -24963,7 +24963,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -29,7 +27,7 @@ Index: gdal/configure cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -25013,7 +25013,7 @@ +@@ -25013,7 +25013,7 @@ $as_echo "enabled" >&6; } # 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" diff --git a/debian/patches/symver b/debian/patches/symver index c540038..bfa2139 100644 --- a/debian/patches/symver +++ b/debian/patches/symver @@ -1,8 +1,6 @@ -Index: gdal/GNUmakefile -=================================================================== ---- gdal.orig/GNUmakefile 2011-09-22 17:36:29.000000000 +0200 -+++ gdal/GNUmakefile 2011-09-22 17:37:11.000000000 +0200 -@@ -39,9 +39,10 @@ +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -39,9 +39,10 @@ $(GDAL_SLIB): $(GDAL_OBJ) $(GDAL_LIB) $(LIBGDAL): $(GDAL_OBJ:.o=.lo) $(LD) $(LDFLAGS) $(LIBS) -o $@ $(GDAL_OBJ:.o=.lo) \ -- GDAL/OGR library and tools _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel