[jlm] 11/16: use system jarfiles for ant tasks definitions

[Martin Quinson]

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

mquinson pushed a commit to branch debian-debian
in repository jlm.

commit 8d236093053bba0b2e0d3bbbee95eed064af6811
Author: Martin Quinson <martin.quinson at loria.fr>
Date:   Mon Aug 12 19:42:04 2013 +0200

    use system jarfiles for ant tasks definitions
---
 debian/changelog                |    1 +
 debian/patches/series           |    1 +
 debian/patches/system-ant-tasks |   11 +++++++++++
 3 files changed, 13 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 054179c..88b8a67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ jlm (2.0+repack-1) UNRELEASED; urgency=low
   * d/p/review-french: integrate a post-release upstream patch that
     greatly improve the french translations
   * Add a watch file.
+  * d/p/system-ant-tasks: use system jarfiles for ant tasks definitions
   * d/rules: add a get-orig-source target that prunes the binary
     jarfiles of all our dependencies. We don't use them in Debian anyway.
 
diff --git a/debian/patches/series b/debian/patches/series
index d6fa888..5074b36 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+system-ant-tasks
 review-french
 no-xmpp
 no-twitter
diff --git a/debian/patches/system-ant-tasks b/debian/patches/system-ant-tasks
new file mode 100644
index 0000000..2fba2cd
--- /dev/null
+++ b/debian/patches/system-ant-tasks
@@ -0,0 +1,11 @@
+--- a/build.xml
++++ b/build.xml
+@@ -148,7 +148,7 @@
+       </propertyfile>
+     </target>
+ 
+-    <property name="gettexttasks.jar" value="lib/gettext-ant-tasks-0.9.3.jar"/>
++    <property name="gettexttasks.jar" value="/usr/share/java/gettext-ant-tasks.jar"/>
+     <target name="i18n-init" description="Loads the Ant gettext tasks">
+       <taskdef name="gettext-extract" classname="org.xnap.commons.ant.gettext.GettextExtractKeysTask" classpath="${gettexttasks.jar}"/>
+       <taskdef name="gettext-merge"   classname="org.xnap.commons.ant.gettext.GettextMergeKeysTask"   classpath="${gettexttasks.jar}"/>

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