[mkgmap] 07/08: Refresh patches.

Bas Couwenberg sebastic at debian.org
Thu Sep 1 08:24:00 UTC 2016


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

sebastic pushed a commit to branch master
in repository mkgmap.

commit 7620ac9fa06876704a7a4de35ceb867921b6a317
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Sep 1 10:16:42 2016 +0200

    Refresh patches.
---
 debian/changelog               |  1 +
 debian/patches/build_xml.patch | 15 ++++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 023d58b..3f4e40c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ mkgmap (0.0.0+svn3694-1) UNRELEASED; urgency=medium
   * Update JDK & JRE dependencies to require at least version 1.8.
   * Update ant.properties to use 1.8 source & target.
   * Drop OpenJDK 7 from launcher script.
+  * Refresh patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Thu, 01 Sep 2016 09:59:27 +0200
 
diff --git a/debian/patches/build_xml.patch b/debian/patches/build_xml.patch
index 7b8cc31..f495060 100644
--- a/debian/patches/build_xml.patch
+++ b/debian/patches/build_xml.patch
@@ -12,15 +12,16 @@ Author: Andreas Tille <tille at debian.org>
 
 --- a/build.xml
 +++ b/build.xml
-@@ -19,6 +19,7 @@
- 		xmlns:ivy="antlib:org.apache.ivy.ant">
+@@ -30,6 +30,8 @@
+ 	<!--suppress AntResolveInspection,AntMissingPropertiesFileInspection -->
+ 	<property file="${top}/local.properties"/>
  
- 	<!-- Set default javac target value -->
 +	<property name="deblib" location="/usr/share/java"/>
- 	<property name="ant.build.javac.target" value="1.7"/>
- 	<property name="ant.build.javac.source" value="1.7"/>
++
+ 	<property name="build" value="build"/>
+ 	<property name="dist" value="dist"/>
  
-@@ -71,7 +72,7 @@
+@@ -67,7 +69,7 @@
  
  	<!-- For class paths -->
  	<path id="compile.classpath">
@@ -29,7 +30,7 @@ Author: Andreas Tille <tille at debian.org>
  	</path>
  	<path id="test.classpath">
  		<fileset dir="${ivy.lib.dir}/test" />
-@@ -231,7 +232,7 @@
+@@ -227,7 +229,7 @@
  	</target>
  
  	<!-- Compile the product itself (no tests). -->

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



More information about the Pkg-grass-devel mailing list