r2287 - trunk/libjcommon-java/debian

[Arnaud Vandyck]

Author: avdyk
Date: 2006-07-19 10:44:49 +0000 (Wed, 19 Jul 2006)
New Revision: 2287

Modified:
   trunk/libjcommon-java/debian/ant.properties
   trunk/libjcommon-java/debian/changelog
   trunk/libjcommon-java/debian/control
   trunk/libjcommon-java/debian/rules
Log:
libjcommon-java (1.0.5-1) unstable; urgency=low

  Robert Schuster <robert.schuster at tarent.de>:
  * New stable upstream release
  * Build with java-gcj-compat-dev and ecj-bootstrap
  Arnaud Vandyck <avdyk at debian.org>:
  * Updated Standards-Version to 3.7.2: added cdbs and debhelper in
    Build-Depends.
  * Added myself to uploaders.
  * debian/rules: removed ant-launcher.jar, no more needed by cdbs-ant

 -- Arnaud Vandyck <avdyk at debian.org>  Wed, 19 Jul 2006 12:39:50 +0200


Modified: trunk/libjcommon-java/debian/ant.properties
===================================================================
--- trunk/libjcommon-java/debian/ant.properties	2006-07-17 17:02:15 UTC (rev 2286)
+++ trunk/libjcommon-java/debian/ant.properties	2006-07-19 10:44:49 UTC (rev 2287)
@@ -1,17 +1,30 @@
+###########################################################
+#
+#  Global settings ...
 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
+# needed for the Docs
+jcommon.version=1.0.5
 
-# 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
+# If you specify a non-empty string, then dont forget the
+# trailing / here or your results wont fit your expectations...
+#
+targetdir=
+manifest-lib-prefix=lib/
+
+###########################################################
+#
+#  Used libraries ...
+# Provided via rules file
+jaxp-jar-file=
+servlet-jar-file=
+junit-jar-file=
+
+##############################################################
+#
+# Generated files ...
+jcommon-jar-file=jcommon.jar
+jcommon-bundle-file=jcommon-bundle.jar
+jcommon-junit-jar-file=jcommon-junit.jar
+jcommon-xml-jar-file=jcommon-xml.jar
+jcommon-xml-bundle-file=jcommon-xml-bundle.jar

Modified: trunk/libjcommon-java/debian/changelog
===================================================================
--- trunk/libjcommon-java/debian/changelog	2006-07-17 17:02:15 UTC (rev 2286)
+++ trunk/libjcommon-java/debian/changelog	2006-07-19 10:44:49 UTC (rev 2287)
@@ -1,3 +1,16 @@
+libjcommon-java (1.0.5-1) unstable; urgency=low
+  
+  Robert Schuster <robert.schuster at tarent.de>:
+  * New stable upstream release
+  * Build with java-gcj-compat-dev and ecj-bootstrap
+  Arnaud Vandyck <avdyk at debian.org>:
+  * Updated Standards-Version to 3.7.2: added cdbs and debhelper in
+    Build-Depends.
+  * Added myself to uploaders.
+  * debian/rules: removed ant-launcher.jar, no more needed by cdbs-ant
+
+ -- Arnaud Vandyck <avdyk at debian.org>  Wed, 19 Jul 2006 12:39:50 +0200
+
 libjcommon-java (1.0.0-1) unstable; urgency=low
 
   * New stable upstream release (closes: #328574)

Modified: trunk/libjcommon-java/debian/control
===================================================================
--- trunk/libjcommon-java/debian/control	2006-07-17 17:02:15 UTC (rev 2286)
+++ trunk/libjcommon-java/debian/control	2006-07-19 10:44:49 UTC (rev 2287)
@@ -2,14 +2,15 @@
 Section: libs
 Priority: optional
 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
+Uploaders: Christian Bayle <bayle at debian.org>, Wolfgang Baer <WBaer at gmx.de>, Arnaud Vandyck <avdyk at debian.org>
+Build-Depends: debhelper (>= 4.2.30), cdbs
+Build-Depends-Indep: java-gcj-compat-dev, ecj-bootstrap, ant, libservlet2.4-java
+Standards-Version: 3.7.2
 
 Package: libjcommon-java
 Section: libs
 Architecture: all
-Depends: kaffe | java1-runtime | java2-runtime
+Depends: java-gcj-compat | java1-runtime1 | 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

Modified: trunk/libjcommon-java/debian/rules
===================================================================
--- trunk/libjcommon-java/debian/rules	2006-07-17 17:02:15 UTC (rev 2286)
+++ trunk/libjcommon-java/debian/rules	2006-07-19 10:44:49 UTC (rev 2287)
@@ -1,27 +1,38 @@
 #!/usr/bin/make -f
-# debian/rules file for jcommon (uses cdbs)
+# debian/rules file for libjcommon-java (uses cdbs)
+LIBRARY_PACKAGE := jcommon
+API_VERSION     := 1.0.5
 
-export VERSION = 1.0.0
-
+# Add here any variable or target overrides you need
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 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
+DEB_JARS := \
+	junit \
+	servlet-api-2.4
+
+# 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
 DEB_ANT_BUILDFILE := ant/build.xml
 DEB_ANT_BUILD_TARGET := compile compile-xml javadoc
 
 clean::
 	-rm -rf build
 	-rm -rf javadoc
-	-rm -f jcommon-$(VERSION).jar
-	-rm -f jcommon-xml-$(VERSION).jar
+	-rm -f jcommon-$(API_VERSION).jar
+	-rm -f jcommon-xml-$(API_VERSION).jar
+	-rm -f jcommon-$(API_VERSION)-junit.jar
 
-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
+install/lib$(LIBRARY_PACKAGE)-java:: 
+	install -m 644 $(LIBRARY_PACKAGE).jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE)-$(API_VERSION).jar
+	ln -s $(LIBRARY_PACKAGE)-$(API_VERSION).jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE).jar
+
+	install -m 644 $(LIBRARY_PACKAGE)-xml.jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE)-xml-$(API_VERSION).jar
+	ln -s $(LIBRARY_PACKAGE)-xml-$(API_VERSION).jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE)-xml.jar