r1995 - in trunk/libjfreechart-java: . debian debian/patches

Wolfgang Bär wbaer-guest at costa.debian.org
Sun Mar 12 15:42:04 UTC 2006


Author: wbaer-guest
Date: 2006-03-12 15:42:04 +0000 (Sun, 12 Mar 2006)
New Revision: 1995

Added:
   trunk/libjfreechart-java/debian/README.Debian-source
   trunk/libjfreechart-java/debian/compat
   trunk/libjfreechart-java/debian/dirs
   trunk/libjfreechart-java/debian/libjfreechart-java-doc.doc-base
   trunk/libjfreechart-java/debian/libjfreechart-java-doc.docs
   trunk/libjfreechart-java/debian/patches/
   trunk/libjfreechart-java/debian/patches/00_BuildXml_Manifest.patch
Removed:
   trunk/libjfreechart-java/debian/README.Debian
   trunk/libjfreechart-java/debian/libjfreechart-java.dirs
   trunk/libjfreechart-java/debian/libjfreechart-java.docs
   trunk/libjfreechart-java/debian_patch
Modified:
   trunk/libjfreechart-java/debian/changelog
   trunk/libjfreechart-java/debian/control
   trunk/libjfreechart-java/debian/copyright
   trunk/libjfreechart-java/debian/rules
Log:
  * New upstream release (closes: #299628)
  * Build-depends and depends on libjcommons-java (>= 1.0.0-1
  * Dropped now unneeded patch
  * Convert build system to cdbs - added build-dependency
  * Although build with free tools its not yet completely usable with free
    tools alone (needs Java2D) - therefore it stays in contrib for now.
  * Move package to pkg-java-maintainers for comaintenance, 
    added Christian Bayle and myself as uploaders
  * Removed README.Debian - not needed
  * Move big documentation in an own -doc package
  * Added README.Debian-source how the upstream tarball was cleaned
  * Added patch to remove bogus manifest classpath from jar
  * Register javadoc api with doc-base
  * Standards-Version 3.6.2 (no changes)


Deleted: trunk/libjfreechart-java/debian/README.Debian
===================================================================
--- trunk/libjfreechart-java/debian/README.Debian	2006-03-12 15:35:36 UTC (rev 1994)
+++ trunk/libjfreechart-java/debian/README.Debian	2006-03-12 15:42:04 UTC (rev 1995)
@@ -1,21 +0,0 @@
-jfreechart-java for Debian
---------------------------
-You can see demo running:
-	/usr/lib/j2se/1.4/bin/java -jar /usr/share/java/jfreechart-0.9.8-demo.jar
-
-If you manage tu run this with kaffe or sablevm, let me know
-
-Web site is http://www.jfree.org
-
-About Object Refinery Limited:
-
-Since late 1999, Object Refinery Limited has been actively involved in developing free (also referred to as "open source")
-software and related products. They make use of the web and open, collaborative development techniques to extend the reach
-of one small company to a world-wide audience. At the current time, they are:
-
-    * the principal sponsor of www.jfree.org;
-    * managers of the JFreeChart project;
-    * suppliers of documentation and support services for JFreeChart;
-    * the publisher of a free user guide for GnuCash.
- 
- -- Christian Bayle <bayle at debian.org>, Wed,  2 Jul 2003 22:49:43 +0200

Added: trunk/libjfreechart-java/debian/README.Debian-source
===================================================================
--- trunk/libjfreechart-java/debian/README.Debian-source	2006-03-12 15:35:36 UTC (rev 1994)
+++ trunk/libjfreechart-java/debian/README.Debian-source	2006-03-12 15:42:04 UTC (rev 1995)
@@ -0,0 +1,10 @@
+libjfreechart-java
+-------------
+
+Upstream does not provide source only tarballs. Therefore the following
+actions were taken to produce the orig.tar.gz:
+
+- rm lib/*
+- rm *.jar
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Thu, 02 Feb 2006 15:48:42 +0100 

Modified: trunk/libjfreechart-java/debian/changelog
===================================================================
--- trunk/libjfreechart-java/debian/changelog	2006-03-12 15:35:36 UTC (rev 1994)
+++ trunk/libjfreechart-java/debian/changelog	2006-03-12 15:42:04 UTC (rev 1995)
@@ -1,3 +1,29 @@
+libjfreechart-java (1.0.1-1) unstable; urgency=low
+
+  * New upstream release (closes: #299628)
+  * Build-depends and depends on libjcommons-java (>= 1.0.0-1
+  * Dropped now unneeded patch
+  * Convert build system to cdbs - added build-dependency
+  * Although build with free tools its not yet completely usable with free
+    tools alone (needs Java2D) - therefore it stays in contrib for now.
+  * Move package to pkg-java-maintainers for comaintenance, 
+    added Christian Bayle and myself as uploaders
+  * Removed README.Debian - not needed
+  * Move big documentation in an own -doc package
+  * Added README.Debian-source how the upstream tarball was cleaned
+  * Added patch to remove bogus manifest classpath from jar
+  * Register javadoc api with doc-base
+  * Standards-Version 3.6.2 (no changes)
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Thu, 02 Feb 2006 15:48:42 +0100
+
+libjfreechart-java (0.9.8-3.1) unstable; urgency=low
+
+  * NMU
+  * Removed libservlet2.2-java from the Build-Depends-Indep.
+
+ -- Arnaud Vandyck <avdyk at debian.org>  Sun, 24 Apr 2005 22:01:13 +0200
+
 libjfreechart-java (0.9.8-3) unstable; urgency=low
 
   * Change the way to deal with externals java libs 

Added: trunk/libjfreechart-java/debian/compat
===================================================================
--- trunk/libjfreechart-java/debian/compat	2006-03-12 15:35:36 UTC (rev 1994)
+++ trunk/libjfreechart-java/debian/compat	2006-03-12 15:42:04 UTC (rev 1995)
@@ -0,0 +1 @@
+4

Modified: trunk/libjfreechart-java/debian/control
===================================================================
--- trunk/libjfreechart-java/debian/control	2006-03-12 15:35:36 UTC (rev 1994)
+++ trunk/libjfreechart-java/debian/control	2006-03-12 15:42:04 UTC (rev 1995)
@@ -1,23 +1,34 @@
 Source: libjfreechart-java
 Section: contrib/libs
 Priority: optional
-Maintainer: Christian Bayle <bayle at debian.org>
-Build-Depends-Indep: debhelper (>> 4.0.0), j2sdk1.4, libjcommon-java, libgnujaxp-java, libservlet2.3-java | libservlet2.2-java, junit, ant
-Standards-Version: 3.5.8
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Christian Bayle <bayle at debian.org>, Wolfgang Baer <WBaer at gmx.de>
+Build-Depends-Indep: debhelper (>= 4.2.30), kaffe, ant, cdbs, libjcommon-java (>= 1.0.0-1), libservlet2.3-java
+Standards-Version: 3.6.2
 
 Package: libjfreechart-java
 Section: contrib/libs
 Architecture: all
-Depends: j2re1.4 | java2-runtime, libjcommon-java
+Depends: 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:
-    * pie charts;
-    * line charts and horizontal/vertical bar charts
-    (regular and stacked, with optional 3D-effect);
-    * XY plots and scatter plots;
-    * time series, high/low/open/close charts and candle stick charts;
-    * combination charts;
-    * Pareto charts;
-    * Gantt charts;
-    * bubble charts;
-    * wind plots, meter charts and symbol charts;
+   * pie charts (2D and 3D)
+   * bar charts (regular and stacked, with an optional 3D effect)
+   * line and area charts
+   * scatter plots and bubble charts
+   * time series, high/low/open/close charts and candle stick charts
+   * combination charts
+   * Pareto charts
+   * Gantt charts
+   * wind plots, meter charts and symbol charts
+   * wafer map charts
+
+Package: libjfreechart-java-doc
+Section: contrib/doc
+Architecture: all
+Suggests: libjfreechart-java
+Description: Chart library for Java - documentation
+ JFreeChart is a free Java class library for generating charts.
+ .
+ This package includes the documentation.

Modified: trunk/libjfreechart-java/debian/copyright
===================================================================
--- trunk/libjfreechart-java/debian/copyright	2006-03-12 15:35:36 UTC (rev 1994)
+++ trunk/libjfreechart-java/debian/copyright	2006-03-12 15:42:04 UTC (rev 1995)
@@ -1,7 +1,8 @@
 This package was debianized by Christian Bayle <bayle at debian.org> on
 Wed,  2 Jul 2003 22:49:43 +0200.
 
-It was downloaded from http://sourceforge.net/projects/jfreechart/ and http://www.jfree.org
+It was downloaded from http://sourceforge.net/projects/jfreechart/ 
+and http://www.jfree.org
 
 Upstream Authors: David Gilbert (david.gilbert at object-refinery.com) and others
 
@@ -11,9 +12,9 @@
 Mantzios, Thomas Meier, Krzysztof Paz, Andrzej Porebski, Nabuo
 Tamemasa, Mark Watson and Hari.
 
-Copyright:
+Copyright: 
 
-    (C)opyright, 2000-2003, by Simba Management Limited and Contributors.
+    2000-2006, by Object Refinery Limited and Contributors.
 
     This package is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -25,10 +26,5 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Lesser General Public License for more details.
 
-    You should have received a copy of the GNU Lesser General Public
-    License along with this package; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-
 On Debian systems, the complete text of the GNU Lesser General
 Public License can be found in `/usr/share/common-licenses/LGPL'.
-

Added: trunk/libjfreechart-java/debian/dirs
===================================================================
--- trunk/libjfreechart-java/debian/dirs	2006-03-12 15:35:36 UTC (rev 1994)
+++ trunk/libjfreechart-java/debian/dirs	2006-03-12 15:42:04 UTC (rev 1995)
@@ -0,0 +1 @@
+usr/share/java

Added: trunk/libjfreechart-java/debian/libjfreechart-java-doc.doc-base
===================================================================
--- trunk/libjfreechart-java/debian/libjfreechart-java-doc.doc-base	2006-03-12 15:35:36 UTC (rev 1994)
+++ trunk/libjfreechart-java/debian/libjfreechart-java-doc.doc-base	2006-03-12 15:42:04 UTC (rev 1995)
@@ -0,0 +1,10 @@
+Document: libjfreechart-java-doc
+Title: Programmer API for JFreeChart
+Author: David Gilbert (david.gilbert at object-refinery.com)
+Abstract: This is the programmer API of JFreeChart is a free Java class 
+ library for generating various types of charts
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libjfreechart-java-doc/javadoc/index.html
+Files: /usr/share/doc/libjfreechart-java-doc/javadoc/*.html

Added: trunk/libjfreechart-java/debian/libjfreechart-java-doc.docs
===================================================================
--- trunk/libjfreechart-java/debian/libjfreechart-java-doc.docs	2006-03-12 15:35:36 UTC (rev 1994)
+++ trunk/libjfreechart-java/debian/libjfreechart-java-doc.docs	2006-03-12 15:42:04 UTC (rev 1995)
@@ -0,0 +1,3 @@
+javadoc
+README.txt
+CHANGELOG.txt

Deleted: trunk/libjfreechart-java/debian/libjfreechart-java.dirs
===================================================================
--- trunk/libjfreechart-java/debian/libjfreechart-java.dirs	2006-03-12 15:35:36 UTC (rev 1994)
+++ trunk/libjfreechart-java/debian/libjfreechart-java.dirs	2006-03-12 15:42:04 UTC (rev 1995)
@@ -1 +0,0 @@
-/usr/share/java

Deleted: trunk/libjfreechart-java/debian/libjfreechart-java.docs
===================================================================
--- trunk/libjfreechart-java/debian/libjfreechart-java.docs	2006-03-12 15:35:36 UTC (rev 1994)
+++ trunk/libjfreechart-java/debian/libjfreechart-java.docs	2006-03-12 15:42:04 UTC (rev 1995)
@@ -1,2 +0,0 @@
-jfreechart-0.9.8/javadoc
-jfreechart-0.9.8/README

Added: trunk/libjfreechart-java/debian/patches/00_BuildXml_Manifest.patch
===================================================================
--- trunk/libjfreechart-java/debian/patches/00_BuildXml_Manifest.patch	2006-03-12 15:35:36 UTC (rev 1994)
+++ trunk/libjfreechart-java/debian/patches/00_BuildXml_Manifest.patch	2006-03-12 15:42:04 UTC (rev 1995)
@@ -0,0 +1,12 @@
+--- ant/build.xml.orig	2006-02-02 15:44:24.000000000 +0100
++++ ant/build.xml	2006-02-02 19:42:50.000000000 +0100
+@@ -82,9 +82,6 @@
+         <!-- make the jar -->
+         <jar jarfile="${basedir}/${jfreechart.name}-${jfreechart.version}.jar"
+              basedir="${basedir}/build" >
+-	      <manifest>
+-    	    <attribute name="Class-Path" value="lib/${jcommon.name}-${jcommon.version}.jar"/>
+-	      </manifest>
+ 		</jar>
+ 
+         <!-- delete the temp directory -->

Modified: trunk/libjfreechart-java/debian/rules
===================================================================
--- trunk/libjfreechart-java/debian/rules	2006-03-12 15:35:36 UTC (rev 1994)
+++ trunk/libjfreechart-java/debian/rules	2006-03-12 15:42:04 UTC (rev 1995)
@@ -1,93 +1,24 @@
 #!/usr/bin/make -f
+# debian/rules file for jfreechart (uses cdbs)
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
 
-# Build 
-export JAVA_HOME=/usr/lib/j2se/1.4
-export JAVA=/usr/lib/j2se/1.4/bin/java
-export JAVAC=/usr/lib/j2se/1.4/bin/javac
-export CLASSPATH=/usr/lib/j2se/1.4/jre/lib/rt.jar
+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
 
-export LIBRARY = $(shell head -1 debian/control | sed 's/Source. lib\(.*\)-java/\1/')
-export VERSION = $(shell head -1 debian/changelog | sed 's/.*(\(.*\)-.*).*/\1/' )
-export SRCDIR=$(LIBRARY)-$(VERSION)
-export CURDIR=$(shell pwd)
+JAVA_HOME := /usr/lib/kaffe
+ANT_HOME := /usr/share/ant
 
+DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar jcommon servlet-2.3
+DEB_ANT_BUILDFILE := ant/build.xml
+DEB_ANT_BUILD_TARGET := compile javadoc
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-	mkdir $(SRCDIR)
-	tar xvzf $(LIBRARY)-$(VERSION).tar.gz
-	./debian_patch $(SRCDIR)/ant/build.xml
-	touch configure-stamp
+clean::
+	-rm -rf build
+	-rm -rf javadoc
+	-rm -f jfreechart-$(VERSION).jar
 
-build: configure build-stamp
-build-stamp:
-	dh_testdir
-	# Use debian jar to use debian jars
-	#./debian_jar.sh $(SRCDIR)
-	# Ant compile
-	cd $(SRCDIR)/ant; ant compile-demo
-	touch build-stamp
-
-javadoc: 
-	echo $(SRCDIR)/javadoc > debian/libjfreechart-java.docs
-	echo $(SRCDIR)/README >> debian/libjfreechart-java.docs
-	-rm -rf $(SRCDIR)/javadoc
-	# Ant
-	cd $(SRCDIR)/ant; ant javadoc
-
-clean:
-	dh_testdir
-	dh_testroot
-	-rm -f build-stamp
-	-rm -f configure-stamp
-	-rm -rf $(SRCDIR)
-	dh_clean
-
-install: build javadoc
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	#
-	# Package 
-	#
-	install -m 644 $(SRCDIR)/$(LIBRARY)-$(VERSION).jar \
-	debian/tmp/usr/share/java/
-	install -m 644 $(SRCDIR)/$(LIBRARY)-$(VERSION)-demo.jar \
-	debian/tmp/usr/share/java/
-	ln -s $(LIBRARY)-$(VERSION).jar debian/tmp/usr/share/java/$(LIBRARY).jar
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-#	dh_installdebconf
-	dh_installdocs
-	dh_installexamples
-#	dh_installmenu
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installinit
-#	dh_installcron
-#	dh_installman
-#	dh_installinfo
-#	dh_undocumented
-	dh_installchangelogs
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-#	dh_perl
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-
-binary: binary-indep 
-
-.PHONY: binary binary-indep clean
+install/libjfreechart-java::
+	install -m 644 jfreechart-$(VERSION).jar debian/libjfreechart-java/usr/share/java/jfreechart-$(VERSION).jar
+	ln -s jfreechart-$(VERSION).jar debian/libjfreechart-java/usr/share/java/jfreechart.jar

Deleted: trunk/libjfreechart-java/debian_patch
===================================================================
--- trunk/libjfreechart-java/debian_patch	2006-03-12 15:35:36 UTC (rev 1994)
+++ trunk/libjfreechart-java/debian_patch	2006-03-12 15:42:04 UTC (rev 1995)
@@ -1,6 +0,0 @@
-perl -pi -e 's:\${basedir}/lib:/usr/share/java:g' $1
-perl -pi -e 's:\${jcommon.name}-\${jcommon.version}.jar:jcommon.jar:g' $1
-perl -pi -e 's:/usr/share/java/servlet.jar:/usr/share/java/servlet-2.3.jar:g' $1
-# BEurk
-#perl -pi -e 's:.*Class-Path.*::' $1
-perl -pi -e 's:lib/jcommon.jar:jcommon.jar:' $1




More information about the pkg-java-commits mailing list