The following commit has been merged in the master branch: commit 1cec4d8d8dca66090584a66b6ddd3c35a07b9173 Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Mon Feb 20 11:45:46 2012 +0100
Patchset refreshed. diff --git a/debian/changelog b/debian/changelog index b0a5a72..b280726 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ gdal (1.9.0-1~exp1) experimental; urgency=low * New upstream release. * New tool: gdalsrsinfo. + * Dropped patch epsilon. - -- Francesco Paolo Lovergine <fran...@debian.org> Mon, 20 Feb 2012 11:27:29 +0100 + -- Francesco Paolo Lovergine <fran...@debian.org> Mon, 20 Feb 2012 11:45:16 +0100 gdal (1.8.1-2~exp3) experimental; urgency=low diff --git a/debian/patches/ecw-plugin b/debian/patches/ecw-plugin index 5b11d0a..f1ba1d7 100644 --- a/debian/patches/ecw-plugin +++ b/debian/patches/ecw-plugin @@ -1,8 +1,8 @@ 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 @@ +--- gdal.orig/frmts/ecw/GNUmakefile 2012-01-04 08:03:33.000000000 +0100 ++++ gdal/frmts/ecw/GNUmakefile 2012-02-20 11:37:11.000000000 +0100 +@@ -20,3 +20,12 @@ $(PLUGIN_SO): $(OBJ) $(LD_SHARED) $(LNK_FLAGS) $(OBJ) $(CONFIG_LIBS) $(EXTRA_LIBS) \ -o $(PLUGIN_SO) @@ -15,21 +15,10 @@ 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 ++++ gdal/frmts/ecw/pkg/Makefile.in 2012-02-20 11:37:11.000000000 +0100 @@ -0,0 +1,36 @@ +CC = @CC@ +CXX = @CXX@ @@ -70,7 +59,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-09-26 13:20:22.000000000 +0200 ++++ gdal/frmts/ecw/pkg/README 2012-02-20 11:37:11.000000000 +0100 @@ -0,0 +1,30 @@ + Standalone ECW 3.3 Drivers for GDAL + =================================== @@ -105,7 +94,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-09-26 13:20:22.000000000 +0200 ++++ gdal/frmts/ecw/pkg/aclocal.m4 2012-02-20 11:37:11.000000000 +0100 @@ -0,0 +1,202 @@ +AC_DEFUN(AC_COMPILER_LOCALHACK, +[ @@ -312,7 +301,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-09-26 13:20:22.000000000 +0200 ++++ gdal/frmts/ecw/pkg/configure 2012-02-20 11:37:11.000000000 +0100 @@ -0,0 +1,4498 @@ +#! /bin/sh +# Guess values for system-dependent variables and create Makefiles. @@ -4815,7 +4804,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-09-26 13:20:22.000000000 +0200 ++++ gdal/frmts/ecw/pkg/configure.in 2012-02-20 11:37:11.000000000 +0100 @@ -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/gdalpaths b/debian/patches/gdalpaths index 2d394e5..01aee89 100644 --- a/debian/patches/gdalpaths +++ b/debian/patches/gdalpaths @@ -1,8 +1,8 @@ Index: gdal/gcore/gdaldrivermanager.cpp =================================================================== ---- 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 @@ +--- 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 @@ #ifdef MACOSX_FRAMEWORK GDAL_PREFIX "/PlugIns"); #else @@ -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-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 @@ +--- 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 +@@ -807,7 +807,7 @@ #ifdef MACOSX_FRAMEWORK GDAL_PREFIX "/PlugIns"); #else @@ -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 2011-09-26 13:18:54.000000000 +0200 -+++ gdal/port/cpl_findfile.cpp 2011-09-26 13:19:40.000000000 +0200 +--- 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 @@ -104,7 +104,7 @@ #ifdef MACOSX_FRAMEWORK CPLPushFinderLocation( GDAL_PREFIX "/Resources/gdal" ); diff --git a/debian/patches/hdf4 b/debian/patches/hdf4 index 076b534..49dead4 100644 --- a/debian/patches/hdf4 +++ b/debian/patches/hdf4 @@ -1,17 +1,17 @@ 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 @@ +--- 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 @@ { $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 +20,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 +38,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/man b/debian/patches/man index 1068412..6888fc1 100644 --- a/debian/patches/man +++ b/debian/patches/man @@ -1,8 +1,8 @@ Index: gdal/GNUmakefile =================================================================== ---- gdal.orig/GNUmakefile 2011-02-18 15:52:35.000000000 +0100 -+++ gdal/GNUmakefile 2011-02-18 16:47:45.000000000 +0100 -@@ -229,3 +229,4 @@ +--- 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 @@ endif # HAVE_LIBTOOL=no diff --git a/debian/patches/ogdi b/debian/patches/ogdi index 1070645..aa9fa27 100644 --- a/debian/patches/ogdi +++ b/debian/patches/ogdi @@ -1,8 +1,8 @@ Index: gdal/GDALmake.opt.in =================================================================== ---- gdal.orig/GDALmake.opt.in 2011-03-16 09:51:24.000000000 +0100 -+++ gdal/GDALmake.opt.in 2011-03-16 09:51:24.000000000 +0100 -@@ -330,7 +330,7 @@ +--- 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 @@ # PCRaster support PCRASTER_SETTING = @PCRASTER_SETTING@ diff --git a/debian/patches/rubymakefile b/debian/patches/rubymakefile index 6ada98a..49f13bd 100644 --- a/debian/patches/rubymakefile +++ b/debian/patches/rubymakefile @@ -1,27 +1,28 @@ 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 - - RUBY_INCLUDE = -I$(RUBY_INCLUDE_DIR) +--- 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 @@ + RUBY_LIB := -l$(RUBY_SO_NAME) + else + RUBY_MODULES=$(RUBY_MODULES_LIN) -LDFLAGS += -Xcompiler -shared -L$(RUBY_LIB_DIR) +LDFLAGS += -fPIC -DPIC -Xcompiler -shared -L$(RUBY_LIB_DIR) +CFLAGS += -fPIC -DPIC +CXXFLAGS += -fPIC -DPIC RUBY_LIB := -l$(RUBY_SO_NAME) + endif - build: $(RUBY_MODULES) -@@ -40,17 +42,17 @@ +@@ -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..3e1ec80 100644 --- a/debian/patches/spatialite +++ b/debian/patches/spatialite @@ -1,22 +1,40 @@ 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 @@ +--- 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 @@ + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lspatialite $LIBS" ++LIBS="-lspatialite -lsqlite3 $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ - if test "$SPATIALITE_INIT_FOUND" = "yes"; then - HAVE_SPATIALITE=yes -- LIBS="$LIBS -lspatialite" -+ LIBS="$LIBS -lspatialite -lsqlite3" - HAVE_SQLITE3=yes - fi +@@ -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 +@@ -24478,7 +24478,7 @@ + $as_echo_n "(cached) " >&6 else -@@ -22343,7 +22343,7 @@ + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lspatialite -L$with_spatialite/lib -lspatialite $LIBS" ++LIBS="-lspatialite -L$with_spatialite/lib -lspatialite -lsqlite3 $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -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 _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel