[med-svn] [king] 04/05: Adapt patches

[Andreas Tille]

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

tille pushed a commit to branch master
in repository king.

commit a9954f456b8a815e920214f08343b54bbd76d8d7
Author: Andreas Tille <tille at debian.org>
Date:   Fri Dec 2 14:34:04 2016 +0100

    Adapt patches
---
 debian/control                                |  3 ++-
 debian/patches/use_debian_packaged_jars.patch | 33 ++++++++++++++-------------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/debian/control b/debian/control
index 83a7b8d..e67a5c4 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,8 @@ Build-Depends: debhelper (>= 10),
                default-jdk,
                javahelper,
                ant,
-               libitext-java
+               libitext-java,
+               libjogl2-java
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/king.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/king.git
diff --git a/debian/patches/use_debian_packaged_jars.patch b/debian/patches/use_debian_packaged_jars.patch
index 5254633..df614de 100644
--- a/debian/patches/use_debian_packaged_jars.patch
+++ b/debian/patches/use_debian_packaged_jars.patch
@@ -1,48 +1,49 @@
 Author: Andreas Tille <tille at debian.org>
 Description: Use Debian packaged itext.jar and jogl.jar
 
---- king-2.21.120420.orig/king/build.xml
-+++ king-2.21.120420/king/build.xml
-@@ -68,7 +68,7 @@
+--- a/king/build.xml
++++ b/king/build.xml
+@@ -69,7 +69,7 @@
      <ant antfile="../driftwood/build.xml" inheritAll="false" target="compile">
          <!-- inherited properties go here -->
      </ant>
 -    <copy file="../lib/iText/itext-1.02b.jar" tofile="${basedir}/itext.jar" failonerror="false"/>
 +    <copy file="/usr/share/java/itext.jar" tofile="${basedir}/itext.jar" failonerror="false"/>
      <mkdir dir="${build}"/>
-     <javac srcdir="${src}" destdir="${build}" debug="on" debuglevel="lines,source" target="1.5" source="1.5">
+     <javac srcdir="${src}" destdir="${build}" debug="on" debuglevel="lines,source" target="1.7" source="1.7">
           <include name="**/*.java"/>
-@@ -102,7 +102,7 @@
+@@ -103,8 +103,8 @@
           <classpath>
              <pathelement location="${build}"/>
              <pathelement location="../driftwood/build"/>
--            <pathelement location="../lib/jogl/jogl.jar"/>
-+            <pathelement location="/usr/share/java/jogl.jar"/>
+-            <pathelement location="../lib/jogl2/jogl-all.jar"/>
+-            <pathelement location="../lib/jogl2/gluegen-rt.jar"/>
++            <pathelement location="/usr/share/java/jogl2.jar"/>
++            <pathelement location="/usr/share/java/gluegen2-rt.jar"/>
           </classpath>
      </javac>
  </target>
-@@ -125,8 +125,8 @@
+@@ -127,8 +127,7 @@
          <zipfileset dir="../extratools/dist/" includes="extratools/"/>
          <zipfileset dir="../molikin/dist/" includes="molikin/"/> 
          <zipfileset dir="../lib/" prefix="lib/">
 -            <include name="iText/*.jar"/>
--            <include name="jogl/*.jar"/>
-+            <include name="/usr/share/java/itext.jar"/>
-+            <include name="/usr/share/java/jogl.jar"/>
+-            <include name="jogl2/*.jar"/>
++            <include name="/usr/share/java/*.jar"/>
          </zipfileset>
      </zip>
      <zip basedir="${dist}"
-@@ -164,7 +164,7 @@
+@@ -166,7 +165,7 @@
      <mkdir dir="${dist}/javadocs"/>
      <javadoc packagenames="driftwood.*,Jama.*,king.*"
          sourcepath="src:../driftwood/src"
 -        classpath="../lib:../lib/iText/itext-1.02b.jar:../lib/jogl/jogl.jar"
-+        classpath="../lib:/usr/share/java/itext.jar:/usr/share/java/jogl.jar"
-         destdir="${dist}/javadocs" access="protected" source="1.5"
++        classpath="../lib:/usr/share/java/itext.jar:/usr/share/java/jogl.jar:/usr/share/java/gluegen2-rt.jar"
+         destdir="${dist}/javadocs" access="protected" source="1.7"
          breakiterator="true" noqualifier="all"
          version="true" use="true" author="true"
---- king-2.21.120420.orig/chiropraxis/build.xml
-+++ king-2.21.120420/chiropraxis/build.xml
+--- a/chiropraxis/build.xml
++++ b/chiropraxis/build.xml
 @@ -49,7 +49,7 @@
      <ant antfile="../molikin/build.xml" inheritAll="false" target="compile">
          <!-- inherited properties go here -->

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