[latexdraw] 120/147: Change over to openjdk-7

[Stuart Prescott]

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

stuart pushed a commit to branch master
in repository latexdraw.

commit cc56c695124ce4aadfdce4cc071343168caa2c54
Author: Stuart Prescott <stuart at debian.org>
Date:   Tue Jun 19 23:03:18 2012 +0000

    Change over to openjdk-7
---
 debian/changelog                  | 7 +++++++
 debian/control                    | 2 +-
 debian/patches/build_system.patch | 5 +++--
 debian/rules                      | 3 +--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 95eb97d..35bf955 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+latexdraw (2.0.8+1-3) unstable; urgency=low
+
+  * Use openjdk-7 as preferred java compiler for building package.
+  * Drop (optional) build-dependency on removed sun-java6-jdk.
+
+ -- Stuart Prescott <stuart+debian at nanonanonano.net>  Wed, 20 Jun 2012 00:02:33 +0100
+
 latexdraw (2.0.8+1-2) unstable; urgency=low
 
   * use java-wrappers to find appropriate JREs including for multi-arch
diff --git a/debian/control b/debian/control
index 7b6063e..195f9da 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: graphics
 Priority: optional
 Maintainer: Stuart Prescott <stuart+debian at nanonanonano.net>
 Build-Depends: debhelper (>= 7.3.5~)
-Build-Depends-Indep: openjdk-6-jdk | sun-java6-jdk,
+Build-Depends-Indep: openjdk-7-jdk | openjdk-6-jdk,
                      ant,
                      imagemagick,
                      libjiu-java,
diff --git a/debian/patches/build_system.patch b/debian/patches/build_system.patch
index dc194e1..7e2aa6f 100644
--- a/debian/patches/build_system.patch
+++ b/debian/patches/build_system.patch
@@ -22,7 +22,7 @@ Alter build system to make use of external libraries rather than bundling them i
  	<target name="doc" depends="jar" description="Generation of the documentation.">
  	    <javadoc destdir="${dir.doc}" author="true" version="true" use="true"
  	    	notree="false" nonavbar="false" noindex="false" access="private">
-@@ -25,47 +25,50 @@
+@@ -25,47 +25,51 @@
  	      </fileset>
  	    </javadoc>
  	</target>
@@ -37,6 +37,7 @@ Alter build system to make use of external libraries rather than bundling them i
 +
 +	<target name="compile">
 +		<javac srcdir="latexDraw" destdir="" classpathref="classpathlib" debug="on" encoding="utf8" />
++                <javac target="1.6" />
 +	</target>
 +
  	<!-- Creates the jar -->
@@ -89,7 +90,7 @@ Alter build system to make use of external libraries rather than bundling them i
  
  	<target name="zip src" depends="jar">
          <copy todir="out/${release.name}_src">
-@@ -76,16 +79,16 @@
+@@ -76,16 +80,16 @@
  		</zip>
          <delete dir="out/${release.name}_src" />
      </target>
diff --git a/debian/rules b/debian/rules
index 24efb71..279e831 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,14 +7,13 @@
 # to make sure that the correct compiler is used by ant.
 # * prefer openjdk-6 then sun-java6;
 # * include both multi-arch and non-multi-arch paths for ease of backporting
-# * don't accept openjdk-7 to ensure the class files are of a supported format
 #   "export JAVA_HOME=/usr/lib/jvm/java-6-openjdk-i386" or similar if you want
 #   to build locally using openjdk-7.
 JAVA_HOME ?= $(shell echo \
   ` for jre in \
+      /usr/lib/jvm/java-7-openjdk-\`dpkg-architecture -qDEB_BUILD_ARCH\` \
       /usr/lib/jvm/java-6-openjdk-\`dpkg-architecture -qDEB_BUILD_ARCH\` \
       /usr/lib/jvm/java-6-openjdk \
-      /usr/lib/jvm/java-6-sun \
       ; do \
       test -d $$jre && test -f $$jre/bin/javac && echo $$jre && break ; \
     done ` \

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