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

[Paul Cager]

Author: paulcager-guest
Date: 2007-01-16 23:58:58 +0100 (Tue, 16 Jan 2007)
New Revision: 2944

Added:
   trunk/bcel/debian/doc-base
Modified:
   trunk/bcel/debian/control
   trunk/bcel/debian/patches/build.xml.patch
   trunk/bcel/debian/rules
Log:
Corrected dependencies.
Added doc-base and API linkages to Java API docs.
Used gcj rather than kaffe

Modified: trunk/bcel/debian/control
===================================================================
--- trunk/bcel/debian/control	2007-01-15 17:41:44 UTC (rev 2943)
+++ trunk/bcel/debian/control	2007-01-16 22:58:58 UTC (rev 2944)
@@ -10,7 +10,7 @@
 Package: libbcel-java
 Architecture: all
 Section: libs
-Depends: kaffe | java1-runtime | java2-runtime, libregexp-java
+Depends: libregexp-java
 Suggests: libbcel-java-doc
 Description: Analyze, create, and manipulate (binary) Java class files
  The Byte Code Engineering Library is intended to give users a convenient
@@ -31,6 +31,7 @@
 Package: libbcel-java-doc
 Architecture: all
 Section: doc
+Depends: classpath-doc, libxerces2-java-doc
 Suggests: libbcel-java
 Description: Documentation for Byte Code Engineering Library (BCEL)
  Documentation for the BCEL Java library which is used to manipulate Java 

Added: trunk/bcel/debian/doc-base
===================================================================
--- trunk/bcel/debian/doc-base	2007-01-15 17:41:44 UTC (rev 2943)
+++ trunk/bcel/debian/doc-base	2007-01-16 22:58:58 UTC (rev 2944)
@@ -0,0 +1,9 @@
+Document: libbcel-java
+Title: API Javadoc for BCEL
+Author: BCEL developers
+Abstract: This is the API Javadoc provided by the BCEL library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libbcel-java/api/index.html
+Files: /usr/share/doc/libbcel-java/api/*

Modified: trunk/bcel/debian/patches/build.xml.patch
===================================================================
--- trunk/bcel/debian/patches/build.xml.patch	2007-01-15 17:41:44 UTC (rev 2943)
+++ trunk/bcel/debian/patches/build.xml.patch	2007-01-16 22:58:58 UTC (rev 2944)
@@ -11,3 +11,13 @@
      <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>
+--- build.xml	2007-01-14 22:11:59.000000000 +0000
++++ build.xml.patched	2007-01-14 22:21:35.000000000 +0000
+@@ -105,6 +105,7 @@
+         <path refid="build.classpath">
+         </path>
+       </classpath>
++      <link offline="true" packagelistLoc="/usr/share/doc/classpath-doc/api" href="/usr/share/doc/classpath-doc/api/" />
+     </javadoc>
+   </target>
+   <target name="get-deps" unless="noget" depends="init">

Modified: trunk/bcel/debian/rules
===================================================================
--- trunk/bcel/debian/rules	2007-01-15 17:41:44 UTC (rev 2943)
+++ trunk/bcel/debian/rules	2007-01-16 22:58:58 UTC (rev 2944)
@@ -7,7 +7,7 @@
 
 export UPSTREAM_VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
 
-JAVA_HOME            := /usr/lib/kaffe
+JAVA_HOME            := /usr/lib/jvm/java-gcj
 ANT_HOME             := /usr/share/ant
 DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar xmlParserAPIs xercesImpl regexp
 DEB_ANT_BUILD_TARGET := compile jar javadoc