[freecol] 89/125: Drop 10-fix-jar-path.diff

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository freecol.

commit bc91812ea91a83d9b43f2656e93ec3ae753b545a
Author: Markus Koschany <apo at debian.org>
Date:   Sat Dec 19 23:15:56 2015 +0100

    Drop 10-fix-jar-path.diff
---
 debian/patches/10-fix-jar-path.diff | 41 -------------------------------------
 debian/patches/series               |  1 -
 2 files changed, 42 deletions(-)

diff --git a/debian/patches/10-fix-jar-path.diff b/debian/patches/10-fix-jar-path.diff
deleted file mode 100644
index fc0ac73..0000000
--- a/debian/patches/10-fix-jar-path.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Date: Sat, 19 Dec 2015 21:53:50 +0100
-Subject: fix-jar-path
-
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10-fix-jar-path.dpatch by  <fourmond at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix the path of the library jars to match those of the debian
-## DP: packages 
-
- at DPATCH@
----
- build.xml | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/build.xml b/build.xml
-index 9faad0b..8d11582 100644
---- a/build.xml
-+++ b/build.xml
-@@ -101,9 +101,10 @@
-     <!-- Compiles the java source files. -->
-     <target name="compile" depends="init">
-         <mkdir dir="${freecol.build.dir}"/>
-+	<!-- Classpath is provided by debian/rules, so commenting this -->
-+	<!--             classpathref="freecol.build.classpath" -->
-         <javac srcdir="${freecol.src.dir}"
-             destdir="${freecol.build.dir}"
--            classpathref="freecol.build.classpath"
-             debug="on"
-             optimize="on"
-             deprecation="off"
-@@ -173,7 +174,7 @@
- 
-     <!-- Compiles the source files and creates a JAR-file. -->
-     <target name="package" depends="init,build,manifest" description="Compiles the source files and creates a JAR-file.">
--        <jar jarfile="${freecol.jar.file}"
-+        <jar jarfile="freecol.jar"
-             basedir="${freecol.build.dir}"
-             manifest="${basedir}/src/MANIFEST.MF"
-             includes="net/**, org/**"
diff --git a/debian/patches/series b/debian/patches/series
index 8a4873f..3441f59 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-10-fix-jar-path.diff
 40-manpage.diff
 commons-cli-1.3.patch

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