[pkg-java] r11102 - trunk/libjfreechart-java/debian

[Onkar Shinde]

Author: onkarshinde-guest
Date: 2009-11-23 10:25:34 +0000 (Mon, 23 Nov 2009)
New Revision: 11102

Removed:
   trunk/libjfreechart-java/debian/dirs
Modified:
   trunk/libjfreechart-java/debian/changelog
   trunk/libjfreechart-java/debian/control
   trunk/libjfreechart-java/debian/rules
Log:
default-jdk/jre and other cleanup

Modified: trunk/libjfreechart-java/debian/changelog
===================================================================
--- trunk/libjfreechart-java/debian/changelog	2009-11-21 18:45:17 UTC (rev 11101)
+++ trunk/libjfreechart-java/debian/changelog	2009-11-23 10:25:34 UTC (rev 11102)
@@ -1,3 +1,25 @@
+libjfreechart-java (1.0.13-2) unstable; urgency=low
+
+  [ Onkar Shinde ]
+  * debian/control
+    - default-jdk/jre conversion.
+    - Change runtime jre dependency to match target JVM version specified in
+      build.xml.
+    - Change build-dep libservlet2.4-java -> libservlet2.5-java.
+    - Sync runtime version of libjcommon-java with build-dep version.
+    - Change standards version to 3.8.3.
+  * debian/rules
+    - There are no patches. Remove simple patchsys include. 
+    - Change JAV_HOME to match default-jdk. Remove ANT_HOME.
+    - Remove unnecessary ant-launcher jar from DEB_JARS.
+    - Remove DEB_ANT_COMPILER. Not needed these days.
+    - Change servelet-api jar to 2.5.
+    - Build experimental jar as well.
+  * debian/dirs
+    - Remove. Not really needed.
+
+ -- Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>  Mon, 23 Nov 2009 14:58:02 +0530
+
 libjfreechart-java (1.0.13-1) unstable; urgency=low
 
   * New upstream release (closes: #533374)

Modified: trunk/libjfreechart-java/debian/control
===================================================================
--- trunk/libjfreechart-java/debian/control	2009-11-21 18:45:17 UTC (rev 11101)
+++ trunk/libjfreechart-java/debian/control	2009-11-23 10:25:34 UTC (rev 11102)
@@ -6,15 +6,15 @@
  Varun Hiremath <varun at debian.org>, Kumar Appaiah <akumar at ee.iitm.ac.in>,
  Vincent Fourmond <fourmond at debian.org>
 Build-Depends: debhelper (>= 5), cdbs
-Build-Depends-Indep: java-gcj-compat-dev, ant, libjcommon-java (>= 1.0.6), libservlet2.4-java
-Standards-Version: 3.8.2
+Build-Depends-Indep: default-jdk, ant, libjcommon-java (>= 1.0.6), libservlet2.5-java
+Standards-Version: 3.8.3
 Homepage: http://www.jfree.org/jfreechart/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjfreechart-java-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjfreechart-java-java
 
 Package: libjfreechart-java
 Architecture: all
-Depends: java-gcj-compat | java2-runtime, libjcommon-java (>= 1.0.0-1),
+Depends: default-jre | java5-runtime, libjcommon-java (>= 1.0.6),
  ${misc:Depends}
 Suggests: java-virtual-machine, libjfreechart-java-doc
 Description: Chart library for Java

Deleted: trunk/libjfreechart-java/debian/dirs
===================================================================
--- trunk/libjfreechart-java/debian/dirs	2009-11-21 18:45:17 UTC (rev 11101)
+++ trunk/libjfreechart-java/debian/dirs	2009-11-23 10:25:34 UTC (rev 11102)
@@ -1 +0,0 @@
-usr/share/java

Modified: trunk/libjfreechart-java/debian/rules
===================================================================
--- trunk/libjfreechart-java/debian/rules	2009-11-21 18:45:17 UTC (rev 11101)
+++ trunk/libjfreechart-java/debian/rules	2009-11-23 10:25:34 UTC (rev 11102)
@@ -3,29 +3,23 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME := /usr/lib/jvm/java-gcj
-ANT_HOME := /usr/share/ant
+JAVA_HOME := /usr/lib/jvm/default-java
 
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar jcommon servlet-api-2.4
+DEB_JARS := jcommon servlet-api-2.5
 DEB_ANT_BUILDFILE := ant/build.xml
-DEB_ANT_BUILD_TARGET := compile javadoc
+DEB_ANT_BUILD_TARGET := compile compile-experimental javadoc
 
-# Build compiler
-DEB_ANT_COMPILER := org.eclipse.jdt.core.JDTCompilerAdapter
-ifneq (,$(findstring eclipse,$(DEB_ANT_COMPILER)))
-    DEB_JARS += ecj.jar /usr/share/ant/lib/ecj-adapter.jar
-endif
-
 clean::
 	-rm -rf build
 	-rm -rf javadoc
-	-rm -f jfreechart-$(DEB_UPSTREAM_VERSION).jar
+	-rm -f lib/jfreechart-$(DEB_UPSTREAM_VERSION)*.jar
 
 install/libjfreechart-java::
 	dh_install lib/jfreechart-$(DEB_UPSTREAM_VERSION).jar usr/share/java
+	dh_install lib/jfreechart-$(DEB_UPSTREAM_VERSION)-experimental.jar usr/share/java
 	dh_link usr/share/java/jfreechart-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jfreechart.jar
+	dh_link usr/share/java/jfreechart-$(DEB_UPSTREAM_VERSION)-experimental.jar usr/share/java/jfreechart-experimental.jar
 
 get-orig-source:
 	-uscan --upstream-version 0 --rename