r2060 - trunk/libcommons-lang-java/debian

[Arnaud Vandyck]

Author: avdyk
Date: 2006-04-24 19:17:34 +0000 (Mon, 24 Apr 2006)
New Revision: 2060

Removed:
   trunk/libcommons-lang-java/debian/libcommons-lang-java.links
   trunk/libcommons-lang-java/debian/links
Modified:
   trunk/libcommons-lang-java/debian/
   trunk/libcommons-lang-java/debian/changelog
   trunk/libcommons-lang-java/debian/control
   trunk/libcommons-lang-java/debian/docs
   trunk/libcommons-lang-java/debian/rules
Log:
libcommons-lang-java (2.1-1) unstable; urgency=low

  * New upstream release.
  * Removed Takashi Okamoto <tora at debian.org> from the co-maintainers
    (closes: #352984).
  * Updated Standards-Version to 3.6.2)
  * Re-build the apidoc with gjdoc
  * Using ecj and classpath(-common) to build

Also: removed unused or generated .links files,added libcommons-lang-java.links to svn:ignore;



Property changes on: trunk/libcommons-lang-java/debian
___________________________________________________________________
Name: svn:ignore
   + libcommons-lang-java.links


Modified: trunk/libcommons-lang-java/debian/changelog
===================================================================
--- trunk/libcommons-lang-java/debian/changelog	2006-04-24 16:23:21 UTC (rev 2059)
+++ trunk/libcommons-lang-java/debian/changelog	2006-04-24 19:17:34 UTC (rev 2060)
@@ -1,3 +1,14 @@
+libcommons-lang-java (2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Removed Takashi Okamoto <tora at debian.org> from the co-maintainers
+    (closes: #352984).
+  * Updated Standards-Version to 3.6.2)
+  * Re-build the apidoc with gjdoc
+  * Using ecj and classpath(-common) to build
+
+ -- Arnaud Vandyck <avdyk at debian.org>  Mon, 24 Apr 2006 21:14:48 +0200
+
 libcommons-lang-java (2.0-6) unstable; urgency=low
 
   * debian/watch: added.

Modified: trunk/libcommons-lang-java/debian/control
===================================================================
--- trunk/libcommons-lang-java/debian/control	2006-04-24 16:23:21 UTC (rev 2059)
+++ trunk/libcommons-lang-java/debian/control	2006-04-24 19:17:34 UTC (rev 2060)
@@ -2,9 +2,9 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Ola Lundqvist <opal at debian.org>, Takashi Okamoto <tora at debian.org>, Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>
-Build-Depends-Indep: debhelper (>> 4.0.0), jikes-classpath, fastjar, junit (>= 3.8.1), cdbs, gjdoc
-Standards-Version: 3.6.1
+Uploaders: Ola Lundqvist <opal at debian.org>, Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>
+Build-Depends-Indep: debhelper (>> 4.0.0), ecj-bootstrap, classpath-common, fastjar, junit (>= 3.8.1), cdbs, gjdoc
+Standards-Version: 3.6.2
 
 Package: libcommons-lang-java
 Architecture: all

Modified: trunk/libcommons-lang-java/debian/docs
===================================================================
--- trunk/libcommons-lang-java/debian/docs	2006-04-24 16:23:21 UTC (rev 2059)
+++ trunk/libcommons-lang-java/debian/docs	2006-04-24 19:17:34 UTC (rev 2060)
@@ -1,2 +1,3 @@
 PROPOSAL.html
 STATUS.html
+docs/api

Deleted: trunk/libcommons-lang-java/debian/libcommons-lang-java.links
===================================================================
--- trunk/libcommons-lang-java/debian/libcommons-lang-java.links	2006-04-24 16:23:21 UTC (rev 2059)
+++ trunk/libcommons-lang-java/debian/libcommons-lang-java.links	2006-04-24 19:17:34 UTC (rev 2060)
@@ -1 +0,0 @@
-usr/share/java/commons-lang-2.0.jar usr/share/java/commons-lang.jar

Deleted: trunk/libcommons-lang-java/debian/links
===================================================================
--- trunk/libcommons-lang-java/debian/links	2006-04-24 16:23:21 UTC (rev 2059)
+++ trunk/libcommons-lang-java/debian/links	2006-04-24 19:17:34 UTC (rev 2060)
@@ -1 +0,0 @@
-usr/share/java/commons-lang-2.0.jar usr/share/java/commons-lang.jar

Modified: trunk/libcommons-lang-java/debian/rules
===================================================================
--- trunk/libcommons-lang-java/debian/rules	2006-04-24 16:23:21 UTC (rev 2059)
+++ trunk/libcommons-lang-java/debian/rules	2006-04-24 19:17:34 UTC (rev 2060)
@@ -11,7 +11,7 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 LIBRARY=commons-lang
-VERSION=2.0
+VERSION=2.1
 BUILD=build
 SOURCES=src/java
 DIST=dist
@@ -19,18 +19,19 @@
 APIDOC=$(DOCS)/api
 CLASSPATH=/usr/share/java/junit.jar
 BASE_PKG=org.apache.commons.lang
+BOOTCP=-bootclasspath /usr/share/classpath/glibj.zip
+JAVAC=ecj $(BOOTCP)
 
 install/lib${LIBRARY}-java::
 	find ${SOURCES} -name \*.java | xargs\
-		jikes-classpath -classpath ${CLASSPATH}\
+		$(JAVAC) -classpath ${CLASSPATH}\
 	  -d ${BUILD} -sourcepath ${SOURCES}
 	mkdir ${DIST}
 	fastjar -cf ${DIST}/${LIBRARY}.jar -C ${BUILD} org
 	mkdir -p ${APIDOC}
-# DO NOT BUILD THE DOC AT THE MOMENT... IT FAILS!
-#	gjdoc -d ${APIDOC} -sourcepath ${SOURCES}\
-#		${BASE_PKG} ${BASE_PKG}.builder ${BASE_PKG}.enum\
-#		${BASE_PKG}.exception ${BASE_PKG}.math ${BASE_PKG}.time
+	gjdoc -d ${APIDOC} -sourcepath ${SOURCES}\
+		${BASE_PKG} ${BASE_PKG}.builder ${BASE_PKG}.enum\
+		${BASE_PKG}.exception ${BASE_PKG}.math ${BASE_PKG}.time
 	install -m 644 dist/${LIBRARY}.jar debian/lib${LIBRARY}-java/usr/share/java/${LIBRARY}-${VERSION}.jar
 	echo "usr/share/java/${LIBRARY}-${VERSION}.jar usr/share/java/${LIBRARY}.jar" > debian/lib${LIBRARY}-java.links