[gdal] 08/12: Drop java-version.patch, applied upstream. Refresh remaining patches.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch experimental-2.1
in repository gdal.

commit ecb8fe4fcce0bfc7194b65b55259b2e93ae175f7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Apr 18 20:02:07 2016 +0200

    Drop java-version.patch, applied upstream. Refresh remaining patches.
---
 debian/changelog                  |  1 +
 debian/patches/hdf4               | 10 +++++-----
 debian/patches/java-version.patch | 17 -----------------
 debian/patches/series             |  1 -
 debian/patches/spatialite         |  6 +++---
 5 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e37404a..1355d6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ gdal (2.1.0~rc1+dfsg-1) UNRELEASED; urgency=medium
   * Update watch file for 2.1.0 pre-releases.
   * New upstream release candidate.
   * Update copyright file, add license & copyright for JPNG_band.cpp.
+  * Drop java-version.patch, applied upstream. Refresh remaining patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 18 Apr 2016 19:33:05 +0200
 
diff --git a/debian/patches/hdf4 b/debian/patches/hdf4
index 11a326c..c196989 100644
--- a/debian/patches/hdf4
+++ b/debian/patches/hdf4
@@ -5,7 +5,7 @@ Forwarded: not-needed
 
 --- a/configure
 +++ b/configure
-@@ -22484,7 +22484,7 @@ fi
+@@ -22478,7 +22478,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 :
@@ -14,7 +14,7 @@ Forwarded: not-needed
  else
    HDF_LIB_NAME=missing
  fi
-@@ -22544,7 +22544,7 @@ if ${ac_cv_lib_mfhdf_SDreaddata+:} false
+@@ -22538,7 +22538,7 @@ if ${ac_cv_lib_mfhdf_SDreaddata+:} false
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -23,7 +23,7 @@ Forwarded: not-needed
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -22575,7 +22575,7 @@ fi
+@@ -22569,7 +22569,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 :
@@ -32,7 +32,7 @@ Forwarded: not-needed
  else
    HDF_LIB_NAME=missing
  fi
-@@ -22590,7 +22590,7 @@ if ${ac_cv_lib_mfhdf_SDreaddata+:} false
+@@ -22584,7 +22584,7 @@ if ${ac_cv_lib_mfhdf_SDreaddata+:} false
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -41,7 +41,7 @@ Forwarded: not-needed
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -22621,7 +22621,7 @@ fi
+@@ -22615,7 +22615,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-version.patch b/debian/patches/java-version.patch
deleted file mode 100644
index eb415af..0000000
--- a/debian/patches/java-version.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Bump minimum Java version to 5.
-Author: Bas Couwenberg <sebastic at debian.org>
-Bug: https://trac.osgeo.org/gdal/ticket/6433
-Forwarded: https://trac.osgeo.org/gdal/attachment/ticket/6433/java-version.patch
-Applied-Upstream: https://trac.osgeo.org/gdal/changeset/33866
-
---- a/swig/java/build.xml
-+++ b/swig/java/build.xml
-@@ -18,7 +18,7 @@
- 	<target name="compile" depends="init" description="Compile the source files.">
- 		<mkdir dir="build/classes"/>
- 		<javac srcdir="org" destdir="build/classes" 
--		       debug="on" source="1.4" target="1.4"
-+		       debug="on" source="1.5" target="1.5"
- 		       includeantruntime="false" deprecation="true">
- 		</javac>
- 		<echo>compilation complete</echo>
diff --git a/debian/patches/series b/debian/patches/series
index 9eaf430..4a9b77a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,5 +7,4 @@ mrsid-plugin
 spatialite
 java.opt
 perl-vendor
-java-version.patch
 privacy-breach-logo.patch
diff --git a/debian/patches/spatialite b/debian/patches/spatialite
index bbf4c86..01c5c75 100644
--- a/debian/patches/spatialite
+++ b/debian/patches/spatialite
@@ -5,7 +5,7 @@ Forwarded: not-needed
 
 --- a/configure
 +++ b/configure
-@@ -27158,7 +27158,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini
+@@ -27152,7 +27152,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -14,7 +14,7 @@ Forwarded: not-needed
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -27222,7 +27222,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini
+@@ -27216,7 +27216,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -23,7 +23,7 @@ Forwarded: not-needed
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -27612,7 +27612,7 @@ if ${ac_cv_lib_spatialite_spatialite_tar
+@@ -27606,7 +27606,7 @@ if ${ac_cv_lib_spatialite_spatialite_tar
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal.git