[pkg-java] r3976 - trunk/libjcommon-java/debian

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2007-08-02 05:53:27 +0000 (Thu, 02 Aug 2007)
New Revision: 3976

Modified:
   trunk/libjcommon-java/debian/changelog
   trunk/libjcommon-java/debian/control
   trunk/libjcommon-java/debian/rules
Log:
libjcommon-java (1.0.6-2) unstable; urgency=low

  * Fixed typo in java1-runtime dependency.
  * Fixed clean target to delete the created jars on second build.
  * Removed Build-Depends on ecj-bootstrap and special handling for it in
    debian/rules.
  * Added myself and Removed Wolfgang from Uploaders.

 -- Michael Koch <konqueror at gmx.de>  Thu, 02 Aug 2007 07:51:01 +0200



Modified: trunk/libjcommon-java/debian/changelog
===================================================================
--- trunk/libjcommon-java/debian/changelog	2007-08-02 05:33:50 UTC (rev 3975)
+++ trunk/libjcommon-java/debian/changelog	2007-08-02 05:53:27 UTC (rev 3976)
@@ -1,3 +1,13 @@
+libjcommon-java (1.0.6-2) unstable; urgency=low
+
+  * Fixed typo in java1-runtime dependency.
+  * Fixed clean target to delete the created jars on second build.
+  * Removed Build-Depends on ecj-bootstrap and special handling for it in
+    debian/rules.
+  * Added myself and Removed Wolfgang from Uploaders.
+
+ -- Michael Koch <konqueror at gmx.de>  Thu, 02 Aug 2007 07:51:01 +0200
+
 libjcommon-java (1.0.6-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/libjcommon-java/debian/control
===================================================================
--- trunk/libjcommon-java/debian/control	2007-08-02 05:33:50 UTC (rev 3975)
+++ trunk/libjcommon-java/debian/control	2007-08-02 05:53:27 UTC (rev 3976)
@@ -2,15 +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>, Arnaud Vandyck <avdyk at debian.org>
+Uploaders: Christian Bayle <bayle at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
 Build-Depends: debhelper (>= 4.2.30), cdbs
-Build-Depends-Indep: java-gcj-compat-dev, ecj-bootstrap, ant, libservlet2.4-java
+Build-Depends-Indep: java-gcj-compat-dev, ant, libservlet2.4-java
 Standards-Version: 3.7.2
 
 Package: libjcommon-java
 Section: libs
 Architecture: all
-Depends: java-gcj-compat | java1-runtime1 | java2-runtime
+Depends: java-gcj-compat | 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

Modified: trunk/libjcommon-java/debian/rules
===================================================================
--- trunk/libjcommon-java/debian/rules	2007-08-02 05:33:50 UTC (rev 3975)
+++ trunk/libjcommon-java/debian/rules	2007-08-02 05:53:27 UTC (rev 3976)
@@ -15,20 +15,15 @@
 	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-$(API_VERSION).jar
-	-rm -f jcommon-xml-$(API_VERSION).jar
-	-rm -f jcommon-$(API_VERSION)-junit.jar
+	-rm -f jcommon.jar
+	-rm -f jcommon-xml.jar
+	-rm -f jcommon-junit.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