[pkg-java] r15146 - trunk/jcharts/debian

[Torsten Werner]

Author: twerner
Date: 2011-10-04 20:00:29 +0000 (Tue, 04 Oct 2011)
New Revision: 15146

Modified:
   trunk/jcharts/debian/changelog
   trunk/jcharts/debian/compat
   trunk/jcharts/debian/control
   trunk/jcharts/debian/rules
Log:
* Team upload.
* Switch to default-jdk. (Closes: #643515)
* Switch to debhelper level 7.
* Remove Java runtime from Depends.

Modified: trunk/jcharts/debian/changelog
===================================================================
--- trunk/jcharts/debian/changelog	2011-10-04 19:50:38 UTC (rev 15145)
+++ trunk/jcharts/debian/changelog	2011-10-04 20:00:29 UTC (rev 15146)
@@ -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

Modified: trunk/jcharts/debian/compat
===================================================================
--- trunk/jcharts/debian/compat	2011-10-04 19:50:38 UTC (rev 15145)
+++ trunk/jcharts/debian/compat	2011-10-04 20:00:29 UTC (rev 15146)
@@ -1 +1 @@
-5
+7

Modified: trunk/jcharts/debian/control
===================================================================
--- trunk/jcharts/debian/control	2011-10-04 19:50:38 UTC (rev 15145)
+++ trunk/jcharts/debian/control	2011-10-04 20:00:29 UTC (rev 15146)
@@ -3,8 +3,8 @@
 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 @@
 
 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

Modified: trunk/jcharts/debian/rules
===================================================================
--- trunk/jcharts/debian/rules	2011-10-04 19:50:38 UTC (rev 15145)
+++ trunk/jcharts/debian/rules	2011-10-04 20:00:29 UTC (rev 15146)
@@ -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