[med-svn] [jmodeltest] 07/14: Use Debian packaged JARs

[Andreas Tille]

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

tille pushed a commit to branch master
in repository jmodeltest.

commit 3fcbb6ee5f2200cf81d969e8f71de657382daa8c
Author: Andreas Tille <tille at debian.org>
Date:   Tue May 10 13:49:18 2016 +0200

    Use Debian packaged JARs
---
 debian/patches/use_debian_packaged_jars.patch | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/debian/patches/use_debian_packaged_jars.patch b/debian/patches/use_debian_packaged_jars.patch
index 411103c..e40f8f1 100644
--- a/debian/patches/use_debian_packaged_jars.patch
+++ b/debian/patches/use_debian_packaged_jars.patch
@@ -1,9 +1,13 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Fri, 15 Jan 2016 21:24:19 +0100
+Description: Use Debian packaged JARs
+
 --- a/build.xml
 +++ b/build.xml
-@@ -3,9 +3,9 @@
- 
+@@ -4,9 +4,9 @@
  	<property name="src.dir" location="src/main/java" />
- 	<property name="bin.dir" location="build/classes" />
+ 	<property name="build.base.dir" location="build" />
+   <property name="build.dir" location="${build.base.dir}/classes" />
 -	<property name="lib.dir" location="lib" />
 +	<property name="lib.dir" location="/usr/share/java" />
  	<property name="dist.dir" location="dist" />
@@ -12,11 +16,11 @@
  	<property name="log.dir" location="${dist.dir}/log" />
  	<property name="manual.dir" location="manual" />
  	<property name="src.resources.dir" location="src/main/resources" />
-@@ -29,7 +29,6 @@
+@@ -30,7 +30,6 @@
  
  	<target name="compile" description="Compile code">
- 		<mkdir dir="${bin.dir}" />
+ 		<mkdir dir="${build.dir}" />
 -		<mkdir dir="${lib.dir}" />
  		<property environment="env" />
  		<property name="java6.boot.classpath" value="${env.JAVA6_BOOTCLASSES}" />
- 		<javac srcdir="${src.dir}" destdir="${bin.dir}" includeAntRuntime="no" 
+ 		<javac srcdir="${src.dir}" destdir="${build.dir}" includeAntRuntime="no" 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/jmodeltest.git