[SCM] gdal branch, master, updated. upstream/1.10.0-157-g72ed954

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 7e6c12966be02831bc5fd38a2a6dd02d99f7ad41
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Mon Jul 1 13:39:44 2013 +0200

    Fixed a b-d for java and added a new patch.

diff --git a/debian/changelog b/debian/changelog
index d8d3ca5..5e93140 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,8 @@ gdal (1.10.0-0~exp3) experimental; urgency=low
   * Added netcdf-bin build-dep to get nc-config, as required by current config.
   * Fixed gdalpaths patch for version 1.10.
   * Fixed symbols files to manage correctly library dependencies.
-  * Added java support. Thanks Ezequiel Lara Gómez for initial patch.
+  * Added java support. Thanks Ezequiel Lara Gómez for the initial patch.
+    Added a pair of new b-deps for that, along with two new patches java*.
     (closes: #628022)
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 26 Jun 2013 11:19:15 +0200
diff --git a/debian/control b/debian/control
index e87467d..48948c2 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 8), zlib1g-dev, libnetcdf-dev (>= 1:4.0.0),
  libdap-dev, libxml2-dev, libspatialite-dev (>= 2.4.0~rc2-4), libepsilon-dev (>= 0.9.1-1~),
  libpoppler-private-dev, liblzma-dev, libopenjpeg-dev, libarmadillo-dev, libfreexl-dev (>= 1.0.0),
  libkml-dev (>= 1.3.0~), liburiparser-dev, python3-all-dev, python3-numpy,
- netcdf-bin, default-jdk
+ netcdf-bin, default-jdk, ant
 Build-Conflicts: python-setuptools
 Standards-Version: 3.9.4
 XS-Python-Version: all
diff --git a/debian/patches/java-make b/debian/patches/java-make
new file mode 100644
index 0000000..82506e8
--- /dev/null
+++ b/debian/patches/java-make
@@ -0,0 +1,13 @@
+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 @@
+ 
+ clean:
+ 	-rm -f ${JAVA_MODULES}
+-	-rm *.$(OBJ_EXT)
++	-rm -f *.$(OBJ_EXT)
+ 	ant clean
+ 
+ veryclean: clean
diff --git a/debian/patches/series b/debian/patches/series
index e52fe93..f827348 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ symver
 spatialite
 force-ruby1.8
 java.opt
+java-make

-- 
GDAL/OGR library and tools