[latexdraw] 123/147: Use default-jre

[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 5dddec385313f8e836e2d6d524350077da1306cc
Author: Stuart Prescott <stuart at debian.org>
Date:   Tue May 14 14:37:06 2013 +0000

    Use default-jre
---
 debian/changelog | 7 +++++++
 debian/control   | 7 +++----
 debian/rules     | 1 +
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 69bf65c..750a0e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+latexdraw (2.0.8+1-4) UNRELEASED; urgency=low
+
+  * Use default-jre rather than specifying the compiler to use; thanks to
+    James Page for his suggestions (Closes: #684018).
+
+ -- Stuart Prescott <stuart at debian.org>  Wed, 15 May 2013 00:35:27 +1000
+
 latexdraw (2.0.8+1-3) unstable; urgency=low
 
   * Use openjdk-7 as preferred java compiler for building package.
diff --git a/debian/control b/debian/control
index 4a3bb52..434c321 100644
--- a/debian/control
+++ b/debian/control
@@ -1,20 +1,19 @@
 Source: latexdraw
 Section: graphics
 Priority: optional
-Maintainer: Stuart Prescott <stuart+debian at nanonanonano.net>
+Maintainer: Stuart Prescott <stuart at debian.org>
 Build-Depends: debhelper (>= 7.3.5~)
-Build-Depends-Indep: openjdk-7-jdk | openjdk-6-jdk,
+Build-Depends-Indep: default-jre (>= 1:1.6) | java6-runtime,
                      ant,
                      imagemagick,
                      libjiu-java,
                      libjlibeps-java
 Standards-Version: 3.9.3
 Homepage: http://latexdraw.sourceforge.net/
-DM-Upload-Allowed: yes
 
 Package: latexdraw
 Architecture: all
-Depends: openjdk-7-jre | openjdk-6-jre | sun-java6-jre,
+Depends: default-jre (>= 1:1.6) | java6-runtime,
          libjiu-java,
          libjlibeps-java,
          java-wrappers,
diff --git a/debian/rules b/debian/rules
index 279e831..459fddf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,7 @@
 #   to build locally using openjdk-7.
 JAVA_HOME ?= $(shell echo \
   ` for jre in \
+      /usr/lib/jvm/default-java \
       /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 \

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