Author: mkoch
Date: 2007-06-17 17:34:28 +0000 (Sun, 17 Jun 2007)
New Revision: 3699
Modified:
trunk/libjfreechart-java/debian/changelog
trunk/libjfreechart-java/debian/control
trunk/libjfreechart-java/debian/rules
Log:
libjfreechart-java (1.0.2-3) unstable; urgency=low
* Merged from Ubuntu.
* Moved Build-Depends-Indep to Build-Depends.
* Removed Wolfgang and added myself to Uploaders.
* Updated Standards-Version.
-- Michael Koch <[EMAIL PROTECTED]> Sun, 17 Jun 2007 18:38:20 +0200
libjfreechart-java (1.0.2-2ubuntu1) feisty; urgency=low
* Re-merge with Debian. Changes kept:
* Fix versioned build dependency on libjcommon-java.
* Build-depend on libservlet2.4-java instead of libservlet2.3-java
-- Matthias Klose <[EMAIL PROTECTED]> Wed, 11 Oct 2006 22:30:49 +0000
-- Barry deFreese <[EMAIL PROTECTED]> Tue, 6 Feb 2007 09:50:59 -0500
libjfreechart-java (1.0.2-2) unstable; urgency=low
* Reupload with changed section names.
-- Matthias Klose <[EMAIL PROTECTED]> Sun, 1 Oct 2006 15:24:27 +0200
libjfreechart-java (1.0.2-1) unstable; urgency=low
* New upstream release. + * Change section from contrib to main; "JFreeChart
should work quite well
with free runtimes based on GNU Classpath 0.92 or later".
* Build using java-gcj-compat-dev.
-- Matthias Klose <[EMAIL PROTECTED]> Sun, 1 Oct 2006 14:21:26 +0200
Modified: trunk/libjfreechart-java/debian/changelog
===================================================================
--- trunk/libjfreechart-java/debian/changelog 2007-06-17 17:33:15 UTC (rev
3698)
+++ trunk/libjfreechart-java/debian/changelog 2007-06-17 17:34:28 UTC (rev
3699)
@@ -1,3 +1,36 @@
+libjfreechart-java (1.0.2-3) unstable; urgency=low
+
+ * Merged from Ubuntu.
+ * Moved Build-Depends-Indep to Build-Depends.
+ * Removed Wolfgang and added myself to Uploaders.
+ * Updated Standards-Version.
+
+ -- Michael Koch <[EMAIL PROTECTED]> Sun, 17 Jun 2007 18:38:20 +0200
+
+libjfreechart-java (1.0.2-2ubuntu1) feisty; urgency=low
+
+ * Re-merge with Debian. Changes kept:
+ * Fix versioned build dependency on libjcommon-java.
+ * Build-depend on libservlet2.4-java instead of libservlet2.3-java
+ -- Matthias Klose <[EMAIL PROTECTED]> Wed, 11 Oct 2006 22:30:49 +0000
+
+ -- Barry deFreese <[EMAIL PROTECTED]> Tue, 6 Feb 2007 09:50:59 -0500
+
+libjfreechart-java (1.0.2-2) unstable; urgency=low
+
+ * Reupload with changed section names.
+
+ -- Matthias Klose <[EMAIL PROTECTED]> Sun, 1 Oct 2006 15:24:27 +0200
+
+libjfreechart-java (1.0.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * Change section from contrib to main; "JFreeChart should work quite well
+ with free runtimes based on GNU Classpath 0.92 or later".
+ * Build using java-gcj-compat-dev.
+
+ -- Matthias Klose <[EMAIL PROTECTED]> Sun, 1 Oct 2006 14:21:26 +0200
+
libjfreechart-java (1.0.1-1) unstable; urgency=low
* New upstream release (closes: #299628)
Modified: trunk/libjfreechart-java/debian/control
===================================================================
--- trunk/libjfreechart-java/debian/control 2007-06-17 17:33:15 UTC (rev
3698)
+++ trunk/libjfreechart-java/debian/control 2007-06-17 17:34:28 UTC (rev
3699)
@@ -1,15 +1,15 @@
Source: libjfreechart-java
-Section: contrib/libs
+Section: libs
Priority: optional
Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]>
-Uploaders: Christian Bayle <[EMAIL PROTECTED]>, Wolfgang Baer <[EMAIL
PROTECTED]>
-Build-Depends-Indep: debhelper (>= 4.2.30), kaffe, ant, cdbs, libjcommon-java
(>= 1.0.0-1), libservlet2.3-java
-Standards-Version: 3.6.2
+Uploaders: Christian Bayle <[EMAIL PROTECTED]>, Michael Koch <[EMAIL
PROTECTED]>
+Build-Depends: debhelper (>= 4.2.30), java-gcj-compat-dev, ant, cdbs,
libjcommon-java (>= 1.0.6), libservlet2.4-java
+Standards-Version: 3.7.2
Package: libjfreechart-java
-Section: contrib/libs
+Section: libs
Architecture: all
-Depends: j2re1.4 | java2-runtime, libjcommon-java (>= 1.0.0-1)
+Depends: java-gcj-compat | j2re1.4 | java2-runtime, libjcommon-java (>=
1.0.0-1)
Suggests: java-virtual-machine, libjfreechart-java-doc
Description: Chart library for Java
JFreeChart is a free Java class library for generating charts, including:
@@ -25,7 +25,7 @@
* wafer map charts
Package: libjfreechart-java-doc
-Section: contrib/doc
+Section: doc
Architecture: all
Suggests: libjfreechart-java
Description: Chart library for Java - documentation
Modified: trunk/libjfreechart-java/debian/rules
===================================================================
--- trunk/libjfreechart-java/debian/rules 2007-06-17 17:33:15 UTC (rev
3698)
+++ trunk/libjfreechart-java/debian/rules 2007-06-17 17:34:28 UTC (rev
3699)
@@ -7,13 +7,19 @@
include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-JAVA_HOME := /usr/lib/kaffe
+JAVA_HOME := /usr/lib/jvm/java-gcj
ANT_HOME := /usr/share/ant
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar jcommon servlet-2.3
+DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar jcommon servlet-api-2.4
DEB_ANT_BUILDFILE := ant/build.xml
DEB_ANT_BUILD_TARGET := compile 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
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
