[SCM] gdal branch, master, updated. upstream/1.8.1-93-g6735e3e

2012-02-22 Thread Francesco Paolo Lovergine 
The following commit has been merged in the master branch:
commit 6735e3ea3bd8f9615e38a099b38826cd8e29d20c
Author: Francesco Paolo Lovergine 
Date:   Thu Feb 23 00:35:04 2012 +0100

Annotated changelog

diff --git a/debian/changelog b/debian/changelog
index feb0261..14ee8b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gdal (1.9.0-1~exp2) experimental; urgency=low
+
+  * Fixed mipsel, mips, powerpc and s390 files for syntax errors.
+
+ -- Francesco Paolo Lovergine   Thu, 23 Feb 2012 00:34:08 
+0100
+
 gdal (1.9.0-1~exp1) experimental; urgency=low
 
   * New upstream release.

-- 
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

[SCM] gdal branch, master, updated. upstream/1.8.1-93-g6735e3e

2012-02-22 Thread Francesco Paolo Lovergine 
The following commit has been merged in the master branch:
commit fefd63599e92a3a4c813b6039aac475693ede1f3
Merge: 4b73a70455530ffa569fd1439d67f1a63c33 
b5397a522c623a2b2260e0c92c0b6c6029e374b9
Author: Francesco Paolo Lovergine 
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- package.
  
-  -- Francesco Paolo Lovergine   Mon, 20 Feb 2012 11:45:16 
+0100
 - -- Alan Boudreault   Wed, 01 Feb 2012 02:32:30 
+
++ -- Francesco Paolo Lovergine   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   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.0 +0100
- +++ gdal/frmts/ecw/GNUmakefile2012-02-20 11:37:11.0 +0100
++--- gdal-1.9.0.orig/frmts/ecw/GNUmakefile 2012-02-20 16:01:45.0 
+0100
+ gdal-1.9.0/frmts/ecw/GNUmakefile  2012-02-20 16:02:27.0 +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.0 +
- +++ gdal/frmts/ecw/pkg/Makefile.in2012-02-20 11:37:11.0 +0100
+ gdal-1.9.0/frmts/ecw/pkg/Makefile.in  2012-02-20 16:02:27.0 
+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.0 +
- +++ gdal/frmts/ecw/pkg/README 2012-02-20 11:37:11.0 +0100
+ gdal-1.9.0/frmts/ecw/pkg/README   2012-02-20 16:02:27.0 +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.0 +
- +++ gdal/frmts/ecw/pkg/aclocal.m4 2012-02-20 11:37:11.0 +0100
+ gdal-1.9.0/frmts/ecw/pkg/aclocal.m4   2012-02-20 16:02:27.0 
+0100
  @@ -0,0 +1,202 @@
  +AC_DEFU

[SCM] gdal branch, master, updated. upstream/1.8.1-93-g6735e3e

2012-02-22 Thread Francesco Paolo Lovergine 
The following commit has been merged in the master branch:
commit 4b73a70455530ffa569fd1439d67f1a63c33
Author: Francesco Paolo Lovergine 
Date:   Tue Feb 21 15:13:48 2012 +0100

Updated the debian NEWS file

diff --git a/debian/NEWS b/debian/NEWS
index 6ed6fcf..0be220a 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -4,8 +4,10 @@ gdal (1.8.0-2) unstable; urgency=low
interface which has to be considered the only officially supported.
The library still exports C++ symbols but the Debian package has introduced
symbol files and symbol versioning in order to track changes and possibly
-   introduce ad hoc patches whenever required in order to minimize the number
-   of manual rebuilds of reverse dependencies.
+   introduce ad hoc patches whenever requiredi, in order to minimize the number
+   of manual rebuilds of reverse dependencies. The good side effect of
+   versioning script is that all symbols exported by the library which are
+   not part of the GDAL/OGR API set are now definitively hidden.
The use of symbol versioning could possibly introduce breakages against
third parties binaries not built against the Debian version. Be warned.
 

-- 
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

[SCM] gdal branch, master, updated. upstream/1.8.1-93-g6735e3e

2012-02-22 Thread Francesco Paolo Lovergine 
The following commit has been merged in the master branch:
commit 33faba5e61434e1717324c076a70902b0e5747b6
Author: Francesco Paolo Lovergine 
Date:   Tue Feb 21 14:57:32 2012 +0100

Fixed gdalplugins path for 1.9

diff --git a/debian/patches/gdalpaths b/debian/patches/gdalpaths
index 01aee89..0321ff1 100644
--- a/debian/patches/gdalpaths
+++ b/debian/patches/gdalpaths
@@ -7,7 +7,7 @@ Index: gdal/gcore/gdaldrivermanager.cpp
  GDAL_PREFIX "/PlugIns");
  #else
 -GDAL_PREFIX "/lib/gdalplugins" );
-+GDAL_PREFIX "/lib/gdalplugins/1.8" );
++GDAL_PREFIX "/lib/gdalplugins/1.9" );
  #endif
  #else
  char szExecPath[1024];
@@ -20,7 +20,7 @@ Index: gdal/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp
  GDAL_PREFIX "/PlugIns");
  #else
 -GDAL_PREFIX "/lib/gdalplugins" );
-+GDAL_PREFIX "/lib/gdalplugins/1.8" );
++GDAL_PREFIX "/lib/gdalplugins/1.9" );
  #endif
  #else
  char szExecPath[1024];
@@ -33,7 +33,7 @@ Index: gdal/port/cpl_findfile.cpp
  CPLPushFinderLocation( GDAL_PREFIX "/Resources/gdal" );
#else
 -CPLPushFinderLocation( GDAL_PREFIX "/share/gdal" );
-+CPLPushFinderLocation( GDAL_PREFIX "/share/gdal/1.8" );
++CPLPushFinderLocation( GDAL_PREFIX "/share/gdal/1.9" );
#endif
  #else
  CPLPushFinderLocation( "/usr/local/share/gdal" );

-- 
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

[SCM] gdal branch, master, updated. upstream/1.8.1-93-g6735e3e

2012-02-22 Thread Francesco Paolo Lovergine 
The following commit has been merged in the master branch:
commit 53d676b94e53aaf03ca7d6190a324744e4ff37ca
Author: Francesco Paolo Lovergine 
Date:   Tue Feb 21 14:51:25 2012 +0100

Forces failure ignoring in running dpkg-gensymbols.

This is useful to collect symbols. This version is expected to fail
but it is ok to accept all new symbols and drop other ones.

diff --git a/debian/rules b/debian/rules
index a60d8cc..41ae280 100755
--- a/debian/rules
+++ b/debian/rules
@@ -195,7 +195,8 @@ binary-common:
# Adds per arch symbols for compatible archs
ln -f $(CURDIR)/debian/libgdal*.symbols.i386 
$(CURDIR)/debian/libgdal1.symbols.kfreebsd-i386
ln -f $(CURDIR)/debian/libgdal*.symbols.amd64 
$(CURDIR)/debian/libgdal1.symbols.kfreebsd-amd64
-   dh_makeshlibs
+   # Forces failure ignoring 
+   dh_makeshlibs -- -c0
dh_installdeb
dh_shlibdeps -L libgdal1 -l debian/libgdal1/usr/lib
dh_gencontrol

-- 
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

[SCM] gdal branch, master, updated. upstream/1.8.1-93-g6735e3e

2012-02-22 Thread Francesco Paolo Lovergine 
The following commit has been merged in the master branch:
commit 1cec4d8d8dca66090584a66b6ddd3c35a07b9173
Author: Francesco Paolo Lovergine 
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   Mon, 20 Feb 2012 11:27:29 
+0100
+ -- Francesco Paolo Lovergine   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/GNUmakefile2011-09-26 13:18:54.0 +0200
-+++ gdal/frmts/ecw/GNUmakefile 2011-09-26 13:20:22.0 +0200
-@@ -18,3 +18,12 @@
+--- gdal.orig/frmts/ecw/GNUmakefile2012-01-04 08:03:33.0 +0100
 gdal/frmts/ecw/GNUmakefile 2012-02-20 11:37:11.0 +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.0 +0200
-+++ gdal/frmts/ecw/ecwdataset.cpp  2011-09-26 13:20:22.0 +0200
-@@ -1904,6 +1904,3 @@
- #endif /* def FRMT_ecw */
- }
- 
--
--
--
 Index: gdal/frmts/ecw/pkg/Makefile.in
 ===
 --- /dev/null  1970-01-01 00:00:00.0 +
-+++ gdal/frmts/ecw/pkg/Makefile.in 2011-09-26 13:20:22.0 +0200
 gdal/frmts/ecw/pkg/Makefile.in 2012-02-20 11:37:11.0 +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.0 +
-+++ gdal/frmts/ecw/pkg/README  2011-09-26 13:20:22.0 +0200
 gdal/frmts/ecw/pkg/README  2012-02-20 11:37:11.0 +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.0 +
-+++ gdal/frmts/ecw/pkg/aclocal.m4  2011-09-26 13:20:22.0 +0200
 gdal/frmts/ecw/pkg/aclocal.m4  2012-02-20 11:37:11.0 +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.0 +
-+++ gdal/frmts/ecw/pkg/configure   2011-09-26 13:20:22.0 +0200
 gdal/frmts/ecw/pkg/configure   2012-02-20 11:37:11.0 +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.0 +
-+++ gdal/frmts/ecw/pkg/configure.in2011-09-26 13:20:22.0 +0200
 gdal/frmts/ecw/pkg/configure.in2012-02-20 11:37:11.0 +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..000
--- 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.0 
+0200
-+++ gdal/frmts/epsilon/epsilondataset.cpp  2011-05-12 11:53:19.0 
+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.

[SCM] gdal branch, master, updated. upstream/1.8.1-93-g6735e3e

2012-02-22 Thread Francesco Paolo Lovergine 
The following commit has been merged in the master branch:
commit fe4927fb438911b83b62e5885f5ebe7850e7c89f
Author: Francesco Paolo Lovergine 
Date:   Mon Feb 20 13:54:55 2012 +0100

Fixed for new plugins dir

diff --git a/debian/libgdal1.install b/debian/libgdal1.install
index e85096f..c62b46f 100644
--- a/debian/libgdal1.install
+++ b/debian/libgdal1.install
@@ -1,2 +1,2 @@
 usr/lib/libgdal.so.*
-usr/share/gdal/1.8
+usr/share/gdal/1.9
diff --git a/debian/rules b/debian/rules
index 2646d6a..a60d8cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -123,7 +123,8 @@ clean:
dh_testroot

[ ! -f GDALmake.opt ] || $(MAKE) distclean
-   rm -rf $(CURDIR)/swig/ruby/.libs $(CURDIR)/swig/perl/*.bs
+   rm -rf $(curdir)/swig/ruby/.libs $(CURDIR)/swig/perl/*.bs
+   rm -rf $(curdir)/.libs
rm -f GDALmake.opt-*
rm -rf $(CURDIR)/man/man1
rm -rf $(CURDIR)/debian/tmp $(CURDIR)/debian/python-tmp

-- 
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

[SCM] gdal branch, master, updated. upstream/1.8.1-93-g6735e3e

2012-02-22 Thread Francesco Paolo Lovergine 
The following commit has been merged in the master branch:
commit 8ea8f432b6e46427b8729921116a498a0787f200
Author: Francesco Paolo Lovergine 
Date:   Mon Feb 20 11:56:54 2012 +0100

Refreshed doc patch.

diff --git a/debian/patches/doc b/debian/patches/doc
index 103b933..5513ef8 100644
--- a/debian/patches/doc
+++ b/debian/patches/doc
@@ -1,10 +1,10 @@
 Index: gdal/doc/index.dox
 ===
 gdal.orig/doc/index.dox2011-03-15 18:20:37.0 +0100
-+++ gdal/doc/index.dox 2011-03-16 09:50:07.0 +0100
+--- gdal.orig/doc/index.dox2012-02-20 11:45:37.0 +0100
 gdal/doc/index.dox 2012-02-20 11:56:28.0 +0100
 @@ -19,7 +19,7 @@
- http://trac.osgeo.org/gdal/wiki/Release/1.7.3-News";>NEWS
- page describes the November 2010 GDAL/OGR 1.7.3 release.
+ http://trac.osgeo.org/gdal/wiki/Release/1.8.1-News";>NEWS
+ page describes the July 2011 GDAL/OGR 1.8.1 release.
  
 -The related OGR library (which lives within the 
GDAL source tree) 
 +The related OGR library (which lives within 
the GDAL source tree) 
@@ -13,8 +13,8 @@ Index: gdal/doc/index.dox
  Master: http://www.gdal.org
 Index: gdal/ogr/index.dox
 ===
 gdal.orig/ogr/index.dox2011-03-15 18:20:37.0 +0100
-+++ gdal/ogr/index.dox 2011-03-16 09:50:07.0 +0100
+--- gdal.orig/ogr/index.dox2012-02-20 11:45:37.0 +0100
 gdal/ogr/index.dox 2012-02-20 11:56:28.0 +0100
 @@ -6,7 +6,7 @@
  formats including ESRI Shapefiles, S-57, SDTS, PostGIS, Oracle Spatial, 
  and Mapinfo mid/mif and TAB formats.

-- 
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

[SCM] gdal branch, master, updated. upstream/1.8.1-93-g6735e3e

2012-02-22 Thread Francesco Paolo Lovergine 
The following commit has been merged in the master branch:
commit 5887a767fefb5ec519ab9cac3993443d2377b12a
Author: Francesco Paolo Lovergine 
Date:   Mon Feb 20 11:27:55 2012 +0100

Added gdalsrsinfo tool to -bin package.

diff --git a/debian/changelog b/debian/changelog
index 360e6e0..b0a5a72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gdal (1.9.0-1~exp1) experimental; urgency=low
+
+  * New upstream release.
+  * New tool: gdalsrsinfo.
+
+ -- Francesco Paolo Lovergine   Mon, 20 Feb 2012 11:27:29 
+0100
+
 gdal (1.8.1-2~exp3) experimental; urgency=low
 
   * Fixed .common symbol file to drop conditionals.
diff --git a/debian/gdal-bin.install b/debian/gdal-bin.install
index 881c3b0..d886a11 100644
--- a/debian/gdal-bin.install
+++ b/debian/gdal-bin.install
@@ -15,6 +15,7 @@ usr/bin/ogr*
 usr/bin/gdalbuildvrt
 usr/bin/testepsg
 usr/bin/gdallocationinfo
+usr/bin/gdalsrsinfo
 usr/share/man/man1/gdal_rasterize.1
 usr/share/man/man1/gdal_translate.1
 usr/share/man/man1/gdal_utilities.1
@@ -32,3 +33,4 @@ usr/share/man/man1/gdaltransform.1
 usr/share/man/man1/nearblack.1
 usr/share/man/man1/gdaldem.1
 usr/share/man/man1/gdallocationinfo.1
+usr/share/man/man1/gdalsrsinfo.1
diff --git a/debian/rules b/debian/rules
index 2954655..2646d6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,7 +29,6 @@ versions:
@echo Python versions: $(PYVERS)
@echo Ruby default: $(RUBYDEF)
@echo Perl default: $(PERLDEF)
-   @echo GDAL version: $(GDAL_MAJOR).$(GDAL_MINOR).$(GDAL_PATCH)
 
 #
 # The following targets are useful to autogen independent plugins sources

-- 
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

[SCM] gdal branch, master, updated. upstream/1.8.1-93-g6735e3e

2012-02-22 Thread Alan Boudreault 
The following commit has been merged in the master branch:
commit a7f3c9049401e3352c7a1e8ec077c357271b02af
Author: Alan Boudreault 
Date:   Wed Feb 1 02:30:18 2012 +

Updated a some debian files and patches

diff --git a/debian/control b/debian/control
index 692f037..668b4b8 100644
--- a/debian/control
+++ b/debian/control
@@ -22,8 +22,8 @@ Section: libs
 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 --git a/debian/gdal.ver b/debian/gdal.ver
index 46ae9a2..e179ca4 100644
--- a/debian/gdal.ver
+++ b/debian/gdal.ver
@@ -1,4 +1,4 @@
-GDAL_1.8 {
+GDAL_1.9 {
 global: 
 *;
 };
diff --git a/debian/libgdal1.install b/debian/libgdal1.install
index e85096f..c62b46f 100644
--- a/debian/libgdal1.install
+++ b/debian/libgdal1.install
@@ -1,2 +1,2 @@
 usr/lib/libgdal.so.*
-usr/share/gdal/1.8
+usr/share/gdal/1.9
diff --git a/debian/patches/doc b/debian/patches/doc
index 103b933..0f0a1da 100644
--- a/debian/patches/doc
+++ b/debian/patches/doc
@@ -1,20 +1,16 @@
-Index: gdal/doc/index.dox
-===
 gdal.orig/doc/index.dox2011-03-15 18:20:37.0 +0100
-+++ gdal/doc/index.dox 2011-03-16 09:50:07.0 +0100
+--- a/doc/index.dox
 b/doc/index.dox
 @@ -19,7 +19,7 @@
- http://trac.osgeo.org/gdal/wiki/Release/1.7.3-News";>NEWS
- page describes the November 2010 GDAL/OGR 1.7.3 release.
+ http://trac.osgeo.org/gdal/wiki/Release/1.8.1-News";>NEWS
+ page describes the July 2011 GDAL/OGR 1.8.1 release.
  
 -The related OGR library (which lives within the 
GDAL source tree) 
 +The related OGR library (which lives within 
the GDAL source tree) 
  provides a similar capability for simple features vector data.
  
  Master: http://www.gdal.org
-Index: gdal/ogr/index.dox
-===
 gdal.orig/ogr/index.dox2011-03-15 18:20:37.0 +0100
-+++ gdal/ogr/index.dox 2011-03-16 09:50:07.0 +0100
+--- a/ogr/index.dox
 b/ogr/index.dox
 @@ -6,7 +6,7 @@
  formats including ESRI Shapefiles, S-57, SDTS, PostGIS, Oracle Spatial, 
  and Mapinfo mid/mif and TAB formats.
diff --git a/debian/patches/ecw-plugin b/debian/patches/ecw-plugin
index 5b11d0a..4c6eef4 100644
--- a/debian/patches/ecw-plugin
+++ b/debian/patches/ecw-plugin
@@ -1,8 +1,6 @@
-Index: gdal/frmts/ecw/GNUmakefile
-===
 gdal.orig/frmts/ecw/GNUmakefile2011-09-26 13:18:54.0 +0200
-+++ gdal/frmts/ecw/GNUmakefile 2011-09-26 13:20:22.0 +0200
-@@ -18,3 +18,12 @@
+--- a/frmts/ecw/GNUmakefile
 b/frmts/ecw/GNUmakefile
+@@ -20,3 +20,12 @@
  $(PLUGIN_SO): $(OBJ)
$(LD_SHARED) $(LNK_FLAGS) $(OBJ) $(CONFIG_LIBS) $(EXTRA_LIBS) \
-o $(PLUGIN_SO)
@@ -15,21 +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/ecwdataset.cpp
-===
 gdal.orig/frmts/ecw/ecwdataset.cpp 2011-09-26 13:18:54.0 +0200
-+++ gdal/frmts/ecw/ecwdataset.cpp  2011-09-26 13:20:22.0 +0200
-@@ -1904,6 +1904,3 @@
- #endif /* def FRMT_ecw */
- }
- 
--
--
--
-Index: gdal/frmts/ecw/pkg/Makefile.in
-===
 /dev/null  1970-01-01 00:00:00.0 +
-+++ gdal/frmts/ecw/pkg/Makefile.in 2011-09-26 13:20:22.0 +0200
+--- /dev/null
 b/frmts/ecw/pkg/Makefile.in
 @@ -0,0 +1,36 @@
 +CC=   @CC@
 +CXX   =   @CXX@
@@ -67,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.0 +
-+++ gdal/frmts/ecw/pkg/README  2011-09-26 13:20:22.0 +0200
+--- /dev/null
 b/frmts/ecw/pkg/README
 @@ -0,0 +1,30 @@
 +  Standalone ECW 3.3 Drivers for GDAL
 +  ===
@@ -102,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.0 +
-+++ gdal/frmts/ecw/pkg/aclocal.m4  2011-09-26 13:20:22.0 +0200
+--- /dev/null
 b/frmts/ecw/pkg/aclocal.m4
 @@ -0,0 +1,202 @@
 +AC_DEFUN(AC_COMPILER_LOCALHACK,
 +[
@@ -309,10 +290,8 @@ Index: gdal/frmts/ecw/pkg/aclocal.m4
 +  AC_SUBST(LD_SHARED

[SCM] gdal branch, master, updated. upstream/1.8.1-93-g6735e3e

2012-02-22 Thread Alan Boudreault 
The following commit has been merged in the master branch:
commit b5397a522c623a2b2260e0c92c0b6c6029e374b9
Author: Alan Boudreault 
Date:   Wed Feb 1 12:40:59 2012 +

fixed build option for ruby

diff --git a/debian/patches/rubymakefile b/debian/patches/rubymakefile
index 9c215a4..d6a5d08 100644
--- a/debian/patches/rubymakefile
+++ b/debian/patches/rubymakefile
@@ -5,7 +5,7 @@
  else
  RUBY_MODULES=$(RUBY_MODULES_LIN)
 -LDFLAGS += -Xcompiler -shared -L$(RUBY_LIB_DIR)
-+LDFLAGS += -fPIC -DPIC -Xcompiler -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)

-- 
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

[SCM] gdal branch, master, updated. upstream/1.8.1-93-g6735e3e

2012-02-22 Thread Alan Boudreault 
The following commit has been merged in the master branch:
commit ccaa9f0fa871c66775e105d232d6c4e3339ad8c3
Author: Alan Boudreault 
Date:   Wed Feb 1 03:50:27 2012 +

minor change in rubymakefile patch

diff --git a/debian/patches/rubymakefile b/debian/patches/rubymakefile
index 6d5d449..9c215a4 100644
--- a/debian/patches/rubymakefile
+++ b/debian/patches/rubymakefile
@@ -1,16 +1,16 @@
 --- a/swig/ruby/RubyMakefile.mk
 +++ b/swig/ruby/RubyMakefile.mk
-@@ -37,7 +37,9 @@
- 
- ifeq ("$(shell uname -s)", "Darwin")
- RUBY_MODULES=$(RUBY_MODULES_MAC)
--LDFLAGS += -Xcompiler -bundle -L$(RUBY_LIB_DIR)
-+LDFLAGS += -fPIC -DPIC -Xcompiler -bundle -L$(RUBY_LIB_DIR)
-+CFLAGS += -fPIC -DPIC
-+CXXFLAGS += -fPIC -DPIC
+@@ -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 -L$(RUBY_LIB_DIR)
++CFLAGS += -fPIC -DPIC
++CXXFLAGS += -fPIC -DPIC
+ RUBY_LIB := -l$(RUBY_SO_NAME)
+ endif
+ 
 @@ -59,7 +61,7 @@
  $(INSTALL_DIR):
mkdir -p $(DESTDIR)$(INSTALL_DIR)

-- 
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

[SCM] gdal branch, master, updated. upstream/1.8.1-93-g6735e3e

2012-02-22 Thread Alan Boudreault 
The following commit has been merged in the master branch:
commit 01c901d8b64042070614c21fa43be13d8f4cf4c2
Author: Alan Boudreault 
Date:   Wed Feb 1 02:55:54 2012 +

Updated changelog

diff --git a/debian/changelog b/debian/changelog
index 43eb5b2..b39a652 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gdal (1.9.0-1~exp1) experimental; urgency=low
+
+  * New upstream release.
+  * Patchset update for the current major release.
+  * Dropped patch: epsilon.
+
+ -- Alan Boudreault   Wed, 01 Feb 2012 02:32:30 +
+
 gdal (1.8.1-2~exp2) experimental; urgency=low
 
   * Changed organization of symbol files in one common file and

-- 
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