[mkgmap-splitter] 07/09: Refresh patches.
Bas Couwenberg
sebastic at debian.org
Sat Aug 6 11:17:13 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository mkgmap-splitter.
commit d629b04de1418e01d2abcbb590f03b9425fef95d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Aug 6 12:58:19 2016 +0200
Refresh patches.
---
debian/changelog | 1 +
debian/patches/local-dependencies.patch | 138 ++++++++++++++++----------------
2 files changed, 70 insertions(+), 69 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 63c1f62..1d638f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ mkgmap-splitter (0.0.0+svn438-1) UNRELEASED; urgency=medium
- Add license & copyright for build.xml
* Update JDK & JRE dependencies to require at least version 1.8.
* Bump Standards-Version to 3.9.8, no changes.
+ * Refresh patches.
-- Bas Couwenberg <sebastic at debian.org> Sat, 06 Aug 2016 12:01:54 +0200
diff --git a/debian/patches/local-dependencies.patch b/debian/patches/local-dependencies.patch
index b580fcd..7df8bfd 100644
--- a/debian/patches/local-dependencies.patch
+++ b/debian/patches/local-dependencies.patch
@@ -4,72 +4,72 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -28,6 +28,8 @@
-
- <property name="project.name" value="${ant.project.name}"/>
-
-+ <property name="deblib" value="/usr/share/java"/>
-+
- <!--
- This file is not checked into svn, so you can create it and put any
- property definitions that you want to override those below.
-@@ -50,7 +52,7 @@
- <property name="project.jar" value="${dist}/${project.name}.jar"/>
-
- <!-- Third party libraries -->
-- <property name="xpp.jar" location="${lib}/compile/xpp3-1.1.4c.jar"/>
-+ <property name="xpp.jar" location="${deblib}/xpp3.jar"/>
-
- <!-- the project's build timestamp -->
- <tstamp>
-@@ -67,13 +69,22 @@
- <!-- Classpaths -->
- <path id="classpath">
- <pathelement location="${build.classes}"/>
-- <fileset dir="${ivy.lib.dir}/compile" />
-+ <fileset dir="${deblib}/">
-+ <include name="fastutil.jar"/>
-+ <include name="protobuf.jar"/>
-+ <include name="osmpbf.jar"/>
-+ <include name="xpp3.jar"/>
-+ </fileset>
- </path>
-
- <path id="test.classpath">
- <path refid="classpath"/>
- <pathelement location="${build.test-classes}"/>
-- <fileset dir="${ivy.lib.dir}/test" includes="*.jar"/>
-+ <fileset dir="${deblib}/">
-+ <include name="testng.jar"/>
-+ <include name="bsh.jar"/>
-+ <include name="jcommander.jar"/>
-+ </fileset>
- </path>
-
- <!-- targets for downloading and registering ivy -->
-@@ -208,14 +219,14 @@
- </propertyfile>
- </target>
-
-- <target name="compile" depends="prepare, resolve-compile" description="main compilation">
-+ <target name="compile" depends="prepare" description="main compilation">
- <javac srcdir="${src}" destdir="${build.classes}" debug="yes" includeantruntime="false">
- <include name="**/*.java"/>
- <classpath refid="classpath"/>
- </javac>
- </target>
-
-- <target name="compile.tests" depends="prepare, resolve-test" description="test compilation">
-+ <target name="compile.tests" depends="prepare" description="test compilation">
- <javac srcdir="${test}" destdir="${build.test-classes}" debug="yes" includeantruntime="false">
- <include name="**/*.java"/>
- <classpath refid="test.classpath"/>
-@@ -251,7 +262,7 @@
- </copy>
-
- <copy todir="${dist}/lib">
-- <fileset dir="${lib}/compile"/>
-+ <path refid="classpath" />
- </copy>
-
- <!-- misc -->
+@@ -24,6 +24,8 @@
+
+ <property name="project.name" value="${ant.project.name}"/>
+
++ <property name="deblib" value="/usr/share/java"/>
++
+ <!--
+ This file is not checked into svn, so you can create it and put any
+ property definitions that you want to override those below.
+@@ -46,7 +48,7 @@
+ <property name="project.jar" value="${dist}/${project.name}.jar"/>
+
+ <!-- Third party libraries -->
+- <property name="xpp.jar" location="${lib}/compile/xpp3-1.1.4c.jar"/>
++ <property name="xpp.jar" location="${deblib}/xpp3.jar"/>
+
+ <!-- the project's build timestamp -->
+ <tstamp>
+@@ -63,13 +65,22 @@
+ <!-- Classpaths -->
+ <path id="classpath">
+ <pathelement location="${build.classes}"/>
+- <fileset dir="${ivy.lib.dir}/compile" />
++ <fileset dir="${deblib}/">
++ <include name="fastutil.jar"/>
++ <include name="protobuf.jar"/>
++ <include name="osmpbf.jar"/>
++ <include name="xpp3.jar"/>
++ </fileset>
+ </path>
+
+ <path id="test.classpath">
+ <path refid="classpath"/>
+ <pathelement location="${build.test-classes}"/>
+- <fileset dir="${ivy.lib.dir}/test" includes="*.jar"/>
++ <fileset dir="${deblib}/">
++ <include name="testng.jar"/>
++ <include name="bsh.jar"/>
++ <include name="jcommander.jar"/>
++ </fileset>
+ </path>
+
+ <!-- targets for downloading and registering ivy -->
+@@ -204,14 +215,14 @@
+ </propertyfile>
+ </target>
+
+- <target name="compile" depends="prepare, resolve-compile" description="main compilation">
++ <target name="compile" depends="prepare" description="main compilation">
+ <javac srcdir="${src}" destdir="${build.classes}" debug="yes" includeantruntime="false">
+ <include name="**/*.java"/>
+ <classpath refid="classpath"/>
+ </javac>
+ </target>
+
+- <target name="compile.tests" depends="prepare, resolve-test" description="test compilation">
++ <target name="compile.tests" depends="prepare" description="test compilation">
+ <javac srcdir="${test}" destdir="${build.test-classes}" debug="yes" includeantruntime="false">
+ <include name="**/*.java"/>
+ <classpath refid="test.classpath"/>
+@@ -247,7 +258,7 @@
+ </copy>
+
+ <copy todir="${dist}/lib">
+- <fileset dir="${lib}/compile"/>
++ <path refid="classpath" />
+ </copy>
+
+ <!-- misc -->
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap-splitter.git
More information about the Pkg-grass-devel
mailing list