r2283 - in trunk/libbsf-java/debian: . patches
Arnaud Vandyck
avdyk at costa.debian.org
Mon Jul 17 16:09:41 UTC 2006
Author: avdyk
Date: 2006-07-17 16:09:40 +0000 (Mon, 17 Jul 2006)
New Revision: 2283
Added:
trunk/libbsf-java/debian/watch
Removed:
trunk/libbsf-java/debian/patches/02_Build_xml.patch
Modified:
trunk/libbsf-java/debian/changelog
trunk/libbsf-java/debian/control
trunk/libbsf-java/debian/rules
Log:
libbsf-java (1:2.3.0+cvs20050308a-1) unstable; urgency=low
* Updated Standards-Version to 3.7.2: moved debhelper and cdbs to
Build-Depends
* Build with java-gcj-compat-dev
* debian/rules: removed ant-launcher from the classpath (no more needed)
* Updated dependency to libservlet2.4-java
* Not a new upstream but reupload the sources to the main archive
(closes: #352172, #376107).
* debian/watch: added
Modified: trunk/libbsf-java/debian/changelog
===================================================================
--- trunk/libbsf-java/debian/changelog 2006-07-17 15:21:57 UTC (rev 2282)
+++ trunk/libbsf-java/debian/changelog 2006-07-17 16:09:40 UTC (rev 2283)
@@ -1,3 +1,16 @@
+libbsf-java (1:2.3.0+cvs20050308a-1) unstable; urgency=low
+
+ * Updated Standards-Version to 3.7.2: moved debhelper and cdbs to
+ Build-Depends
+ * Build with java-gcj-compat-dev
+ * debian/rules: removed ant-launcher from the classpath (no more needed)
+ * Updated dependency to libservlet2.4-java
+ * Not a new upstream but reupload the sources to the main archive
+ (closes: #352172, #376107).
+ * debian/watch: added
+
+ -- Arnaud Vandyck <avdyk at debian.org> Mon, 17 Jul 2006 17:41:28 +0200
+
libbsf-java (1:2.3.0+cvs20050308-6) unstable; urgency=low
* Removed explicit usage of jikes build compiler property
Modified: trunk/libbsf-java/debian/control
===================================================================
--- trunk/libbsf-java/debian/control 2006-07-17 15:21:57 UTC (rev 2282)
+++ trunk/libbsf-java/debian/control 2006-07-17 16:09:40 UTC (rev 2283)
@@ -3,14 +3,15 @@
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>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, ant, ant-optional, kaffe (>=2:1.1.5-1), libservlet2.3-java, libxalan2-java, jython, rhino, junit
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 4.2.30), cdbs
+Build-Depends-Indep: ant, ant-optional, java-gcj-compat-dev, libservlet2.4-java, libxalan2-java, jython, rhino, junit
+Standards-Version: 3.7.2
Package: libbsf-java
Architecture: all
Section: libs
-Depends: kaffe | java1-runtime | java2-runtime
-Suggests: libservlet2.3-java, libxalan2-java, jython, rhino, bsh
+Depends: java-gcj-compat | java1-runtime | java2-runtime
+Suggests: libservlet2.4-java, libxalan2-java, jython, rhino, bsh
Description: Bean Scripting Framework to support scripting languages in Java
Bean Scripting Framework (BSF) is a set of Java classes which provides
scripting language support within Java applications, and access to Java
Deleted: trunk/libbsf-java/debian/patches/02_Build_xml.patch
===================================================================
--- trunk/libbsf-java/debian/patches/02_Build_xml.patch 2006-07-17 15:21:57 UTC (rev 2282)
+++ trunk/libbsf-java/debian/patches/02_Build_xml.patch 2006-07-17 16:09:40 UTC (rev 2283)
@@ -1,65 +0,0 @@
---- build.xml.orig 2005-05-12 19:19:30.000000000 +0200
-+++ build.xml 2005-05-12 19:18:05.000000000 +0200
-@@ -219,6 +219,20 @@
- <exclude name="**/test/**" unless="junit.present"/>
- </patternset>
-
-+ <patternset id="jarpatterns">
-+ <!-- Optionally includes engines based on dependencies being present -->
-+ <!-- FIXME: Exclude the first three, temporarily -->
-+ <exclude name="**/java/**"/>
-+ <exclude name="**/javaclass/**"/>
-+ <exclude name="**/activescript/**"/>
-+ <exclude name="**/jacl/**" unless="jacl.present"/>
-+ <exclude name="**/javascript/**" unless="rhino.present"/>
-+ <exclude name="**/jython/**" unless="jython.present"/>
-+ <exclude name="**/netrexx/**" unless="netrexx.present"/>
-+ <exclude name="**/xslt/**" unless="xalan.present"/>
-+ <exclude name="**/test/**"/>
-+ </patternset>
-+
- <!-- =================================================================== -->
- <!-- Compiles the source directory -->
- <!-- =================================================================== -->
-@@ -234,7 +248,7 @@
- <javac srcdir="${src.dir}"
- destdir="${build.dest}"
- debug="${project.debug}"
-- deprecation="${project.deprecation}">
-+ deprecation="${project.deprecation}" target="1.3">
- <patternset refid="javac.source.files"/>
- </javac>
-
-@@ -242,7 +256,9 @@
- <!-- Produces the jar file -->
- <!-- ================================================================= -->
- <mkdir dir="${build.lib}"/>
-- <jar jarfile="${build.lib}/${project.name}.jar" basedir="${build.dest}"/>
-+ <jar jarfile="${build.lib}/${project.name}.jar" basedir="${build.dest}">
-+ <patternset refid="jarpatterns"/>
-+ </jar>
-
- <uptodate property="javadoc.required"
- targetfile="${build.lib}/${project.name}.jar">
-@@ -302,7 +318,10 @@
- depends="compile">
- <junit>
- <classpath>
-- <pathelement location="${build.lib}/${name}.jar" />
-+ <pathelement location="${build.dest}" />
-+ <pathelement location="${build.lib}/bsf.jar" />
-+ <pathelement location="/usr/share/java/js.jar" />
-+ <pathelement location="/usr/share/java/jython.jar" />
- </classpath>
- <formatter type="brief" usefile="false" />
- <test name="org.apache.bsf.test.BSFTest" />
-@@ -318,7 +337,8 @@
- <mkdir dir="${build.javadocs}"/>
- <!-- FIXME: Excluding some packages temporarily -->
- <javadoc packagenames="${packages}"
-- excludepackagenames="org.apache.bsf.engines.java, org.apache.bsf.engines.javaclass, org.apache.bsf.engines.activescript"
-+ excludepackagenames="org.apache.bsf.engines.java, org.apache.bsf.engines.javaclass, org.apache.bsf.engines.activescript,org.apache.bsf.engines.netrexx,org.apache.bsf.engines.jacl,
-+org.apache.bsf.test,org.apache.bsf.test.engineTests,org.apache.bsf.test.utilTests"
- sourcepath="${src.dir}"
- destdir="${build.javadocs}"
- author="true"
Modified: trunk/libbsf-java/debian/rules
===================================================================
--- trunk/libbsf-java/debian/rules 2006-07-17 15:21:57 UTC (rev 2282)
+++ trunk/libbsf-java/debian/rules 2006-07-17 16:09:40 UTC (rev 2283)
@@ -7,10 +7,10 @@
export UPSTREAM_VERSION = 2.3.0
-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 xalan2 servlet-2.3 jython js ${ANT_HOME}/lib/ant-junit.jar junit
+DEB_JARS := xalan2 servlet-2.3 jython js ${ANT_HOME}/lib/ant-junit.jar junit
DEB_ANT_BUILD_TARGET := compile javadocs
DEB_ANT_CHECK_TARGET := test
Added: trunk/libbsf-java/debian/watch
===================================================================
--- trunk/libbsf-java/debian/watch 2006-07-17 15:21:57 UTC (rev 2282)
+++ trunk/libbsf-java/debian/watch 2006-07-17 16:09:40 UTC (rev 2283)
@@ -0,0 +1,2 @@
+version=2
+http://cvs.apache.org/dist/jakarta/bsf/v2.3.0rc1/src/bsf-src-(.*).tar.gz debian uupdate
More information about the pkg-java-commits
mailing list