r1906 - trunk/libjcommon-java/debian

Wolfgang Bär wbaer-guest at costa.debian.org
Sun Feb 12 18:49:08 UTC 2006


Author: wbaer-guest
Date: 2006-02-12 18:49:08 +0000 (Sun, 12 Feb 2006)
New Revision: 1906

Added:
   trunk/libjcommon-java/debian/README.Debian-source
   trunk/libjcommon-java/debian/ant.properties
   trunk/libjcommon-java/debian/compat
   trunk/libjcommon-java/debian/dirs
   trunk/libjcommon-java/debian/libcommon-java-doc.doc-base
   trunk/libjcommon-java/debian/libjcommon-java-doc.docs
Removed:
   trunk/libjcommon-java/debian/README.Debian
   trunk/libjcommon-java/debian/libjcommon-java.dirs
   trunk/libjcommon-java/debian/libjcommon-java.docs
Modified:
   trunk/libjcommon-java/debian/changelog
   trunk/libjcommon-java/debian/control
   trunk/libjcommon-java/debian/copyright
   trunk/libjcommon-java/debian/rules
Log:
libjcommon-java (1.0.0-1) unstable; urgency=low

  * New stable upstream release (closes: #328574)
  * Move to main - build with kaffe
  * Use cdbs build system - added cdbs build-dependency
  * Move package to pkg-java-maintainers for comaintenance,
    added Christian Bayle and myself as uploaders
  * Removed unneeded README.Debian
  * Added README.Debian-source how the upstream tarball was cleaned
  * Move big documentation in an own -doc package
  * Register javadoc api with doc-base
  * Standards-Version 3.6.2 (no changes)


Deleted: trunk/libjcommon-java/debian/README.Debian
===================================================================
--- trunk/libjcommon-java/debian/README.Debian	2006-02-12 18:39:38 UTC (rev 1905)
+++ trunk/libjcommon-java/debian/README.Debian	2006-02-12 18:49:08 UTC (rev 1906)
@@ -1,18 +0,0 @@
-jcommon-java for Debian
---------------------------
-Web site is http://www.jfree.org
-
-I took JCommon version as a reference version 
-
-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/libjcommon-java/debian/README.Debian-source
===================================================================
--- trunk/libjcommon-java/debian/README.Debian-source	2006-02-12 18:39:38 UTC (rev 1905)
+++ trunk/libjcommon-java/debian/README.Debian-source	2006-02-12 18:49:08 UTC (rev 1906)
@@ -0,0 +1,10 @@
+libjcommon-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 

Added: trunk/libjcommon-java/debian/ant.properties
===================================================================
--- trunk/libjcommon-java/debian/ant.properties	2006-02-12 18:39:38 UTC (rev 1905)
+++ trunk/libjcommon-java/debian/ant.properties	2006-02-12 18:49:08 UTC (rev 1906)
@@ -0,0 +1,17 @@
+jcommon.name=jcommon
+jcommon.version=1.0.0
+build.debug=true
+build.optimize=false
+build.deprecation=true
+build.target=1.3
+
+libdir=/usr/share/java
+junit-dir=/usr/share/java
+junit-jar-file=junit.jar
+
+# Generated files
+jcommon-jar-file=jcommon-1.0.0.jar
+jcommon-bundle-file=jcommon-1.0.0-bundle.jar
+jcommon-junit-jar-file=jcommon-1.0.0-junit.jar
+jcommon-xml-jar-file=jcommon-xml-1.0.0.jar
+jcommon-xml-bundle-file=jcommon-xml-1.0.0-bundle.jar

Modified: trunk/libjcommon-java/debian/changelog
===================================================================
--- trunk/libjcommon-java/debian/changelog	2006-02-12 18:39:38 UTC (rev 1905)
+++ trunk/libjcommon-java/debian/changelog	2006-02-12 18:49:08 UTC (rev 1906)
@@ -1,8 +1,17 @@
-libjcommon-java (0.8.3-4) unstable; urgency=low
+libjcommon-java (1.0.0-1) unstable; urgency=low
 
-  * Fixed FTBFS: ./debian_patch: Permission denied (Closes: #306636)
+  * New stable upstream release (closes: #328574)
+  * Move to main - build with kaffe
+  * Use cdbs build system - added cdbs build-dependency
+  * Move package to pkg-java-maintainers for comaintenance, 
+    added Christian Bayle and myself as uploaders
+  * Removed unneeded README.Debian
+  * Added README.Debian-source how the upstream tarball was cleaned
+  * Move big documentation in an own -doc package
+  * Register javadoc api with doc-base
+  * Standards-Version 3.6.2 (no changes)
 
- -- Christian Bayle <bayle at debian.org>  Thu, 28 Apr 2005 22:14:20 +0200
+ -- Wolfgang Baer <WBaer at gmx.de>  Thu, 09 Feb 2006 15:58:13 +0100
 
 libjcommon-java (0.8.3-3) unstable; urgency=low
 

Added: trunk/libjcommon-java/debian/compat
===================================================================
--- trunk/libjcommon-java/debian/compat	2006-02-12 18:39:38 UTC (rev 1905)
+++ trunk/libjcommon-java/debian/compat	2006-02-12 18:49:08 UTC (rev 1906)
@@ -0,0 +1 @@
+4

Modified: trunk/libjcommon-java/debian/control
===================================================================
--- trunk/libjcommon-java/debian/control	2006-02-12 18:39:38 UTC (rev 1905)
+++ trunk/libjcommon-java/debian/control	2006-02-12 18:49:08 UTC (rev 1906)
@@ -1,22 +1,35 @@
 Source: libjcommon-java
-Section: contrib/libs
+Section: libs
 Priority: optional
-Maintainer: Christian Bayle <bayle at debian.org>
-Build-Depends-Indep: debhelper (>> 4.0.0), j2sdk1.4, ant, junit
-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), cdbs, kaffe, ant
+Standards-Version: 3.6.2
 
 Package: libjcommon-java
-Section: contrib/libs
+Section: libs
 Architecture: all
-Depends: j2re1.4 | java2-runtime
+Depends: kaffe | java1-runtime | java2-runtime
+Suggests: java-virtual-machine, libjcommon-java-doc
 Description: General Purpose library for Java
  JCommon is a free general purpose Java class library that is used in
  several projects at The Object Refinery, including JFreeChart and
  JFreeReport.
+ .
  The library includes:
-    * user interface classes for displaying information about applications
-    * custom layout managers
-    * a date chooser panel
-    * serialization utilities
-    * XML parser support classes
+  * user interface classes for displaying information about applications
+  * custom layout managers
+  * a date chooser panel
+  * serialization utilities
+  * XML parser support classes
 
+Package: libjcommon-java-doc
+Section: doc
+Architecture: all
+Suggests: libjcommon-java
+Description: General Purpose library for Java - documentation
+ JCommon is a free general purpose Java class library that is used in
+ several projects at The Object Refinery, including JFreeChart and
+ JFreeReport.
+ .
+ This package includes the documentation.

Modified: trunk/libjcommon-java/debian/copyright
===================================================================
--- trunk/libjcommon-java/debian/copyright	2006-02-12 18:39:38 UTC (rev 1905)
+++ trunk/libjcommon-java/debian/copyright	2006-02-12 18:49:08 UTC (rev 1906)
@@ -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
 
@@ -13,7 +14,7 @@
 
 Copyright:
 
-    (C)opyright, 2000-2003, by Simba Management Limited and Contributors.
+    (C)opyright, 2000-2005, 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
@@ -27,8 +28,7 @@
 
     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
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, 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/libjcommon-java/debian/dirs
===================================================================
--- trunk/libjcommon-java/debian/dirs	2006-02-12 18:39:38 UTC (rev 1905)
+++ trunk/libjcommon-java/debian/dirs	2006-02-12 18:49:08 UTC (rev 1906)
@@ -0,0 +1 @@
+usr/share/java

Added: trunk/libjcommon-java/debian/libcommon-java-doc.doc-base
===================================================================
--- trunk/libjcommon-java/debian/libcommon-java-doc.doc-base	2006-02-12 18:39:38 UTC (rev 1905)
+++ trunk/libjcommon-java/debian/libcommon-java-doc.doc-base	2006-02-12 18:49:08 UTC (rev 1906)
@@ -0,0 +1,11 @@
+Document: libjcommon-java-doc
+Title: Programmer API for the JCommon
+Author: David Gilbert (david.gilbert at object-refinery.com)
+Abstract: This is the programmer API of JCommon is a free general purpose 
+ Java class library that is used in several projects including JFreeChart
+ and JFreeReport.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libjcommon-java-doc/javadoc/index.html
+Files: /usr/share/doc/libjcommon-java-doc/javadoc/*.html

Added: trunk/libjcommon-java/debian/libjcommon-java-doc.docs
===================================================================
--- trunk/libjcommon-java/debian/libjcommon-java-doc.docs	2006-02-12 18:39:38 UTC (rev 1905)
+++ trunk/libjcommon-java/debian/libjcommon-java-doc.docs	2006-02-12 18:49:08 UTC (rev 1906)
@@ -0,0 +1,2 @@
+javadoc
+README.txt

Deleted: trunk/libjcommon-java/debian/libjcommon-java.dirs
===================================================================
--- trunk/libjcommon-java/debian/libjcommon-java.dirs	2006-02-12 18:39:38 UTC (rev 1905)
+++ trunk/libjcommon-java/debian/libjcommon-java.dirs	2006-02-12 18:49:08 UTC (rev 1906)
@@ -1 +0,0 @@
-/usr/share/java

Deleted: trunk/libjcommon-java/debian/libjcommon-java.docs
===================================================================
--- trunk/libjcommon-java/debian/libjcommon-java.docs	2006-02-12 18:39:38 UTC (rev 1905)
+++ trunk/libjcommon-java/debian/libjcommon-java.docs	2006-02-12 18:49:08 UTC (rev 1906)
@@ -1,2 +0,0 @@
-jcommon-0.8.3/javadoc
-jcommon-0.8.3/README

Modified: trunk/libjcommon-java/debian/rules
===================================================================
--- trunk/libjcommon-java/debian/rules	2006-02-12 18:39:38 UTC (rev 1905)
+++ trunk/libjcommon-java/debian/rules	2006-02-12 18:49:08 UTC (rev 1906)
@@ -1,89 +1,27 @@
 #!/usr/bin/make -f
+# debian/rules file for jcommon (uses cdbs)
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export VERSION = 1.0.0
 
-# Build 
-JAVA_HOME_DIRS=/usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.4-blackdown
-export JAVA_HOME ?= $(shell for j in $(JAVA_HOME_DIRS); do [ -d "$$j" ] && echo $$j && exit 0; done)
+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
+DEB_ANT_BUILDFILE := ant/build.xml
+DEB_ANT_BUILD_TARGET := compile compile-xml javadoc
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-	tar xvzf $(LIBRARY)-$(VERSION).tar.gz
-	sh ./debian_patch $(SRCDIR)/ant/build.xml
-	touch configure-stamp
+clean::
+	-rm -rf build
+	-rm -rf javadoc
+	-rm -f jcommon-$(VERSION).jar
+	-rm -f jcommon-xml-$(VERSION).jar
 
-
-build: configure build-stamp
-build-stamp:
-	dh_testdir
-	# Use debian jar
-	[ ! -f $(SRCDIR)/src/jcommon_overview.html ] && cp jcommon_overview.html $(SRCDIR)/src/ || true
-	# Compile
-	cd $(SRCDIR)/ant; ant compile
-	touch build-stamp
-
-javadoc: 
-	# Remove Empty code
-	echo $(SRCDIR)/javadoc > debian/libjcommon-java.docs
-	echo $(SRCDIR)/README >> debian/libjcommon-java.docs
-	-rm -rf $(SRCDIR)/javadoc
-	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/$(LIBRARY)-$(VERSION).jar
-	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/libjcommon-java::
+	install -m 644 jcommon-$(VERSION).jar debian/libjcommon-java/usr/share/java/jcommon-$(VERSION).jar
+	ln -s jcommon-$(VERSION).jar debian/libjcommon-java/usr/share/java/jcommon.jar
+	install -m 644 jcommon-xml-$(VERSION).jar debian/libjcommon-java/usr/share/java/jcommon-xml-$(VERSION).jar
+	ln -s jcommon-xml-$(VERSION).jar debian/libjcommon-java/usr/share/java/jcommon-xml.jar




More information about the pkg-java-commits mailing list