[libcommons-lang-java] 18/51: libcommons-lang-java (2.1-1) unstable; urgency=low

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libcommons-lang-java.

commit 5ae6138e53aac758194567ed9455a565383c1191
Author: Arnaud Vandyck <avdyk at debian.org>
Date:   Mon Apr 24 19:17:34 2006 +0000

    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;
---
 debian/changelog                  | 11 +++++++++++
 debian/control                    |  6 +++---
 debian/docs                       |  1 +
 debian/libcommons-lang-java.links |  1 -
 debian/links                      |  1 -
 debian/rules                      | 13 +++++++------
 6 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8bdab7a..bf8676e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.
diff --git a/debian/control b/debian/control
index 9ea9c5a..bcdc65c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: libcommons-lang-java
 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
diff --git a/debian/docs b/debian/docs
index e764b5c..ba39ec1 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1,3 @@
 PROPOSAL.html
 STATUS.html
+docs/api
diff --git a/debian/libcommons-lang-java.links b/debian/libcommons-lang-java.links
deleted file mode 100644
index 4f0bc96..0000000
--- a/debian/libcommons-lang-java.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java/commons-lang-2.0.jar usr/share/java/commons-lang.jar
diff --git a/debian/links b/debian/links
deleted file mode 100644
index 4f0bc96..0000000
--- a/debian/links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java/commons-lang-2.0.jar usr/share/java/commons-lang.jar
diff --git a/debian/rules b/debian/rules
index 8a67248..dbd0e85 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 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 @@ DOCS=docs
 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
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libcommons-lang-java.git