[jcharts] 04/14: * Team upload. * Switch to default-jdk. (Closes: #643515) * Switch to debhelper level 7. * Remove Java runtime from Depends.

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository jcharts.

commit 6a5ef59a4db23481421e3e57744069f052016e46
Author: Torsten Werner <twerner at debian.org>
Date:   Tue Oct 4 20:00:29 2011 +0000

    * Team upload.
    * Switch to default-jdk. (Closes: #643515)
    * Switch to debhelper level 7.
    * Remove Java runtime from Depends.
---
 debian/changelog | 9 +++++++++
 debian/compat    | 2 +-
 debian/control   | 6 +++---
 debian/rules     | 2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 38a3acd..283339d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+jcharts (0.7.5-3) unstable; urgency=low
+
+  * Team upload.
+  * Switch to default-jdk. (Closes: #643515)
+  * Switch to debhelper level 7.
+  * Remove Java runtime from Depends.
+
+ -- Torsten Werner <twerner at debian.org>  Tue, 04 Oct 2011 21:59:52 +0200
+
 jcharts (0.7.5-2) unstable; urgency=low
 
   * debian/patches/01_remove_old_functionality.diff
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index deed734..8c02b11 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Onkar Shinde <onkarshinde at ubuntu.com>
-Build-Depends: debhelper (>=5), cdbs, ant, ant-optional
-Build-Depends-Indep: openjdk-6-jdk, default-jdk-doc, libbatik-java, libservlet2.5-java, libservlet2.5-java-doc
+Build-Depends: debhelper (>= 7), cdbs, ant, ant-optional
+Build-Depends-Indep: default-jdk, default-jdk-doc, libbatik-java, libservlet2.5-java, libservlet2.5-java-doc
 Standards-Version: 3.9.2
 Homepage: http://jcharts.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jcharts
@@ -12,7 +12,7 @@ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/jcharts
 
 Package: libjcharts-java
 Architecture: all
-Depends: default-jre | java2-runtime, libbatik-java, ${misc:Depends}
+Depends: libbatik-java, ${misc:Depends}
 Suggests: libjcharts-java-doc (= ${binary:Version})
 Description: java based charts library
  jCharts is a 100% Java based charting utility that outputs a variety of
diff --git a/debian/rules b/debian/rules
index cc55cb6..b5493f6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME		:= /usr/lib/jvm/java-6-openjdk
+JAVA_HOME		:= /usr/lib/jvm/default-java
 DEB_ANT_BUILDFILE 	:= build/build.xml
 DEB_JARS		:= batik servlet-api-2.5
 ANT_ARGS		:= -Dbatik.classpath=/usr/share/java/batik.jar -Dant.build.javac.source=1.4

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