[libcommons-lang-java] 21/51: libcommons-lang-java (2.3-3) 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 33691386ef4d0c952ea3b74ec82596b64959b8ed
Author: Michael Koch <konqueror at gmx.de>
Date:   Fri Jan 4 07:41:46 2008 +0000

    libcommons-lang-java (2.3-3) unstable; urgency=low
    
      * debian/control:
        - (Build-)Depends on java-gcj-compat(-dev).
        - Updated Standards-Version to 3.7.3.
        - Added Vcs-Svn and Vcs-Browser fields.
        - Removed comment about Jakarta project which doesnt apply anymore
          in long descripion
      * debian/rules:
        - Rewritten to use CDBS' ant task.
    
     -- Michael Koch <konqueror at gmx.de>  Fri, 04 Jan 2008 08:43:15 +0100
---
 debian/ant.properties |  3 ++-
 debian/changelog      | 13 +++++++++++++
 debian/control        | 10 +++++-----
 debian/dirs           |  1 -
 debian/docs           |  2 +-
 debian/rules          | 38 ++++++++++----------------------------
 6 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
index f55ce1f..7b2df8f 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -1 +1,2 @@
-build.sysclasspath=only
+build.home=build
+dist.home=dist
diff --git a/debian/changelog b/debian/changelog
index 1989e18..bffb37d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+libcommons-lang-java (2.3-3) unstable; urgency=low
+
+  * debian/control:
+    - (Build-)Depends on java-gcj-compat(-dev).
+    - Updated Standards-Version to 3.7.3.
+    - Added Vcs-Svn and Vcs-Browser fields.
+    - Removed comment about Jakarta project which doesnt apply anymore
+      in long descripion
+  * debian/rules:
+    - Rewritten to use CDBS' ant task.
+
+ -- Michael Koch <konqueror at gmx.de>  Fri, 04 Jan 2008 08:43:15 +0100
+
 libcommons-lang-java (2.3-2) unstable; urgency=low
 
   * Use ecj instead of ecj-bootstrap in Build-Depends. Closes: #444506.
diff --git a/debian/control b/debian/control
index 82f7e9d..439a0bb 100644
--- a/debian/control
+++ b/debian/control
@@ -4,13 +4,15 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
 Build-Depends: debhelper (>> 5), cdbs
-Build-Depends-Indep: ecj, classpath-common, fastjar, junit (>= 3.8.1), gjdoc
-Standards-Version: 3.7.2
+Build-Depends-Indep: java-gcj-compat-dev, junit (>= 3.8.1)
+Standards-Version: 3.7.3
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-lang-java
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-lang-java
 Homepage: http://jakarta.apache.org/commons/lang/
 
 Package: libcommons-lang-java
 Architecture: all
-Depends:  gij | sablevm | kaffe (>= 1.1.1) | java1-runtime | java2-runtime
+Depends: java-gcj-compat | java1-runtime | java2-runtime
 Description: Extension of the java.lang package
  The Lang Component contains a set of Java classes that provide helper
  methods for standard Java classes, especially those found in the
@@ -30,5 +32,3 @@ Description: Extension of the java.lang package
   * Enum package - A sub-package for the creation of enumerated types.
   * Builder package - A sub-package for the creation of equals, hashCode,
     compareTo and toString methods.
- .
- This is a part of the Apache Jakarta Project.
diff --git a/debian/dirs b/debian/dirs
index 6dbe9df..13c9f03 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,2 +1 @@
 usr/share/java
-
diff --git a/debian/docs b/debian/docs
index bf4a55c..2471b9b 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1,2 @@
 STATUS.html
-docs/api
+dist/docs/api
diff --git a/debian/rules b/debian/rules
index b461961..5c453cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,36 +1,18 @@
 #!/usr/bin/make -f
 
-#export DH_VERBOSE=1
-
-export VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
-
 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
+
+JAVA_HOME := /usr/lib/jvm/java-gcj
 
-LIBRARY=commons-lang
-BUILD=build
-SOURCES=src/java
-DIST=dist
-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)
+DEB_JARS := junit
+DEB_ANT_BUILD_TARGET := jar javadoc
 
-install/lib${LIBRARY}-java::
-	find ${SOURCES} -name \*.java | xargs\
-		$(JAVAC) -classpath ${CLASSPATH}\
-	  -d ${BUILD} -sourcepath ${SOURCES}
-	mkdir ${DIST}
-	fastjar -cf ${DIST}/${LIBRARY}.jar -C ${BUILD} org
-	mkdir -p ${APIDOC}
-	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
+install/libcommons-lang-java::
+	install -m 644 dist/commons-lang-${DEB_UPSTREAM_VERSION}.jar debian/libcommons-lang-java/usr/share/java/commons-lang-${DEB_UPSTREAM_VERSION}.jar
+	dh_link -p libcommons-lang-java usr/share/java/commons-lang-${DEB_UPSTREAM_VERSION}.jar usr/share/java/commons-lang.jar
 
 clean::
-	-rm debian/lib${LIBRARY}-java.links gjdoc_rawcomment.cache
-	-rm -fr ${DIST} ${BUILD} ${APIDOC}
+	-rm gjdoc_rawcomment.cache
+	-rm -rf docs/api/*

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