The following commit has been merged in the master branch:
commit fefd63599e92a3a4c813b6039aac475693ede1f3
Merge: 4b73a722220455530ffa569fd1439d67f1a63c33
b5397a522c623a2b2260e0c92c0b6c6029e374b9
Author: Francesco Paolo Lovergine <fran...@debian.org>
Date: Tue Feb 21 15:30:02 2012 +0100
Merge branch '1.9' of ssh://git.debian.org/git/pkg-grass/gdal into 1.9
Conflicts:
debian/changelog
debian/patches/doc
debian/patches/ecw-plugin
debian/patches/hdf4
debian/patches/rubymakefile
debian/patches/spatialite
diff --combined debian/changelog
index 7ea3678,b39a652..feb0261
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,10 +1,26 @@@
gdal (1.9.0-1~exp1) experimental; urgency=low
* New upstream release.
- * Patchset update for the current major release.
- * Dropped patch: epsilon.
+ * New tool: gdalsrsinfo.
+ * Dropped patch epsilon.
+ * All patches refreshed for current version.
+ * Regenerating all symfiles from scratch. But for the usual stock of
+ internal C++ changes (with both adding and removing of methods) a couple
+ of TIFF related C functions have been dropped:
+ TIFFFindFieldInfo
+ TIFFFindFieldInfoByName
+ which is due to Tiff/GeoTiff resyncing against upstream. This is ignored,
+ but we already introduced a SONAME change, and it will not impact sid
+ builds and library use.
++ * Removed superfluous break/replaces against libgdal1-<version> package.
- -- Francesco Paolo Lovergine <fran...@debian.org> Mon, 20 Feb 2012 11:45:16
+0100
- -- Alan Boudreault <aboudrea...@mapgears.com> Wed, 01 Feb 2012 02:32:30
+0000
++ -- Francesco Paolo Lovergine <fran...@debian.org> Tue, 21 Feb 2012 15:28:45
+0100
+
+gdal (1.8.1-2~exp3) experimental; urgency=low
+
+ * Fixed .common symbol file to drop conditionals.
+
+ -- Francesco Paolo Lovergine <fran...@debian.org> Wed, 23 Nov 2011 14:23:29
+0100
gdal (1.8.1-2~exp2) experimental; urgency=low
diff --combined debian/control
index 692f037,668b4b8..3fff04d
--- a/debian/control
+++ b/debian/control
@@@ -22,8 -22,8 +22,6 @@@ Section: lib
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 --combined debian/patches/ecw-plugin
index f1ba1d7,4c6eef4..f0719d5
--- a/debian/patches/ecw-plugin
+++ b/debian/patches/ecw-plugin
@@@ -1,7 -1,5 +1,7 @@@
- Index: gdal/frmts/ecw/GNUmakefile
---- a/frmts/ecw/GNUmakefile
-+++ b/frmts/ecw/GNUmakefile
++Index: gdal-1.9.0/frmts/ecw/GNUmakefile
+===================================================================
- --- 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
++--- 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 @@
$(PLUGIN_SO): $(OBJ)
$(LD_SHARED) $(LNK_FLAGS) $(OBJ) $(CONFIG_LIBS) $(EXTRA_LIBS) \
@@@ -15,10 -13,8 +15,10 @@@
+ 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
-+++ b/frmts/ecw/pkg/Makefile.in
++Index: gdal-1.9.0/frmts/ecw/pkg/Makefile.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
- +++ gdal/frmts/ecw/pkg/Makefile.in 2012-02-20 11:37:11.000000000 +0100
+++++ gdal-1.9.0/frmts/ecw/pkg/Makefile.in 2012-02-20 16:02:27.000000000
+0100
@@ -0,0 +1,36 @@
+CC = @CC@
+CXX = @CXX@
@@@ -56,10 -52,8 +56,10 @@@
+%.o: %.cpp
+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
+
- Index: gdal/frmts/ecw/pkg/README
---- /dev/null
-+++ b/frmts/ecw/pkg/README
++Index: gdal-1.9.0/frmts/ecw/pkg/README
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
- +++ gdal/frmts/ecw/pkg/README 2012-02-20 11:37:11.000000000 +0100
+++++ gdal-1.9.0/frmts/ecw/pkg/README 2012-02-20 16:02:27.000000000 +0100
@@ -0,0 +1,30 @@
+ Standalone ECW 3.3 Drivers for GDAL
+ ===================================
@@@ -91,10 -85,8 +91,10 @@@
+ http://www.ermapper.com/
+ http://ermapper.com/Downloads.aspx?v=315
+
- Index: gdal/frmts/ecw/pkg/aclocal.m4
---- /dev/null
-+++ b/frmts/ecw/pkg/aclocal.m4
++Index: gdal-1.9.0/frmts/ecw/pkg/aclocal.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
- +++ gdal/frmts/ecw/pkg/aclocal.m4 2012-02-20 11:37:11.000000000 +0100
+++++ gdal-1.9.0/frmts/ecw/pkg/aclocal.m4 2012-02-20 16:02:27.000000000
+0100
@@ -0,0 +1,202 @@
+AC_DEFUN(AC_COMPILER_LOCALHACK,
+[
@@@ -298,10 -290,8 +298,10 @@@
+ AC_SUBST(LD_SHARED,$LD_SHARED)
+ AC_SUBST(SO_EXT,$SO_EXT)
+])
- Index: gdal/frmts/ecw/pkg/configure
---- /dev/null
-+++ b/frmts/ecw/pkg/configure
++Index: gdal-1.9.0/frmts/ecw/pkg/configure
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
- +++ gdal/frmts/ecw/pkg/configure 2012-02-20 11:37:11.000000000 +0100
+++++ gdal-1.9.0/frmts/ecw/pkg/configure 2012-02-20 16:02:27.000000000
+0100
@@ -0,0 +1,4498 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
@@@ -4801,10 -4791,8 +4801,10 @@@
+
+
+
- Index: gdal/frmts/ecw/pkg/configure.in
---- /dev/null
-+++ b/frmts/ecw/pkg/configure.in
++Index: gdal-1.9.0/frmts/ecw/pkg/configure.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
- +++ gdal/frmts/ecw/pkg/configure.in 2012-02-20 11:37:11.000000000 +0100
+++++ gdal-1.9.0/frmts/ecw/pkg/configure.in 2012-02-20 16:02:27.000000000
+0100
@@ -0,0 +1,186 @@
+dnl
***************************************************************************
+dnl $Id: configure.in 9971 2006-08-23 20:06:02Z fwarmerdam $
--
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
