[pkg-java] r2920 - in trunk/bcel/debian: . patches

[Paul Cager]

Author: paulcager-guest
Date: 2007-01-09 13:17:25 +0100 (Tue, 09 Jan 2007)
New Revision: 2920

Added:
   trunk/bcel/debian/patches/buildd.xml.patch
Modified:
   trunk/bcel/debian/changelog
   trunk/bcel/debian/control
   trunk/bcel/debian/libbcel-java-doc.docs
   trunk/bcel/debian/rules
Log:
Changes for new BCEL build.xml at rel 5.2

Modified: trunk/bcel/debian/changelog
===================================================================
--- trunk/bcel/debian/changelog	2007-01-08 23:55:17 UTC (rev 2919)
+++ trunk/bcel/debian/changelog	2007-01-09 12:17:25 UTC (rev 2920)
@@ -2,7 +2,7 @@
 
   * New upstream release (Closes #349779)
 
- -- Paul Cager <paul-debian at home.paulcager.org>  Mon, 08 Jan 2006 23:15:00 +0000
+ -- Paul Cager <paul-debian at home.paulcager.org>  Mon, 08 Jan 2007 23:15:00 +0000
 
 bcel (5.1-6) unstable; urgency=low
 

Modified: trunk/bcel/debian/control
===================================================================
--- trunk/bcel/debian/control	2007-01-08 23:55:17 UTC (rev 2919)
+++ trunk/bcel/debian/control	2007-01-09 12:17:25 UTC (rev 2920)
@@ -3,7 +3,8 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Wolfgang Baer <WBaer at gmx.de>, Paul Cager <paul-debian at home.paulcager.org>
-Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, kaffe (>= 2:1.1.5-3), ant, libxerces2-java, libregexp-java
+Build-Depends-Indep:  kaffe (>= 2:1.1.5-3), libxerces2-java, libregexp-java
+Build-Depends: debhelper (>= 4.2.30), cdbs
 Standards-Version: 3.7.2
 
 Package: libbcel-java

Modified: trunk/bcel/debian/libbcel-java-doc.docs
===================================================================
--- trunk/bcel/debian/libbcel-java-doc.docs	2007-01-08 23:55:17 UTC (rev 2919)
+++ trunk/bcel/debian/libbcel-java-doc.docs	2007-01-09 12:17:25 UTC (rev 2920)
@@ -1 +1 @@
-docs/api
+dist/docs

Added: trunk/bcel/debian/patches/buildd.xml.patch
===================================================================
--- trunk/bcel/debian/patches/buildd.xml.patch	2007-01-08 23:55:17 UTC (rev 2919)
+++ trunk/bcel/debian/patches/buildd.xml.patch	2007-01-09 12:17:25 UTC (rev 2920)
@@ -0,0 +1,13 @@
+--- build.xml	2006-06-03 04:48:22.000000000 +0100
++++ build.xml.patched	2007-01-09 11:12:59.000000000 +0000
+@@ -108,10 +108,6 @@
+     </javadoc>
+   </target>
+   <target name="get-deps" unless="noget" depends="init">
+-    <!--Proxy settings works only with a JDK 1.2 and higher.-->
+-
+-    <setproxy>
+-    </setproxy>
+     <get dest="${libdir}/regexp-1.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/regexp/jars/regexp-1.2.jar">
+     </get>
+   </target>

Modified: trunk/bcel/debian/rules
===================================================================
--- trunk/bcel/debian/rules	2007-01-08 23:55:17 UTC (rev 2919)
+++ trunk/bcel/debian/rules	2007-01-09 12:17:25 UTC (rev 2920)
@@ -10,11 +10,11 @@
 JAVA_HOME            := /usr/lib/kaffe
 ANT_HOME             := /usr/share/ant
 DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar xmlParserAPIs xercesImpl regexp
-DEB_ANT_BUILD_TARGET := compile jar apidocs
+DEB_ANT_BUILD_TARGET := compile jar javadoc
 
 clean::
-	rm -rf bin docs
+	rm -rf target dist
 
 install/libbcel-java::
-	install -m 644 bin/bcel.jar debian/libbcel-java/usr/share/java/bcel-$(UPSTREAM_VERSION).jar
+	install -m 644 target/bcel-$(UPSTREAM_VERSION).jar debian/libbcel-java/usr/share/java/bcel-$(UPSTREAM_VERSION).jar
 	ln -s bcel-$(UPSTREAM_VERSION).jar debian/libbcel-java/usr/share/java/bcel.jar