Author: mkoch
Date: 2008-01-03 14:00:04 +0000 (Thu, 03 Jan 2008)
New Revision: 5275
Added:
trunk/libbsf-java/debian/ant.properties
trunk/libbsf-java/debian/libbsf-java.doc-base
trunk/libbsf-java/debian/libbsf-java.docs
trunk/libbsf-java/debian/patches/03_build-properties.patch
Removed:
trunk/libbsf-java/debian/doc-base.1
trunk/libbsf-java/debian/doc-base.2
trunk/libbsf-java/debian/docs
trunk/libbsf-java/debian/patches/03_RemoveUnsupportedTestcases.patch
Modified:
trunk/libbsf-java/debian/changelog
trunk/libbsf-java/debian/patches/02_Build_Javadoc.patch
trunk/libbsf-java/debian/rules
Log:
libbsf-java (1:2.4.0-1) unstable; urgency=low
* New upstream version.
-- Michael Koch <[EMAIL PROTECTED]> Tue, 01 Jan 2008 20:39:26 +0100
Added: trunk/libbsf-java/debian/ant.properties
===================================================================
--- trunk/libbsf-java/debian/ant.properties (rev 0)
+++ trunk/libbsf-java/debian/ant.properties 2008-01-03 14:00:04 UTC (rev
5275)
@@ -0,0 +1,10 @@
+build.dest=build/classes
+build.dir=build/dist
+build.lib=lib
+build.javadocs=build/api
+build.tests=build/test
+project.name=bsf
+project.fullname=Bean Scripting Framework
+source.level=1.3
+src.dir=src
+tests.dir=src
Modified: trunk/libbsf-java/debian/changelog
===================================================================
--- trunk/libbsf-java/debian/changelog 2008-01-03 13:48:59 UTC (rev 5274)
+++ trunk/libbsf-java/debian/changelog 2008-01-03 14:00:04 UTC (rev 5275)
@@ -1,3 +1,9 @@
+libbsf-java (1:2.4.0-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Michael Koch <[EMAIL PROTECTED]> Tue, 01 Jan 2008 20:39:26 +0100
+
libbsf-java (1:2.3.0+cvs20050308a-3) unstable; urgency=low
[ Kumar Appaiah ]
Deleted: trunk/libbsf-java/debian/doc-base.1
===================================================================
--- trunk/libbsf-java/debian/doc-base.1 2008-01-03 13:48:59 UTC (rev 5274)
+++ trunk/libbsf-java/debian/doc-base.1 2008-01-03 14:00:04 UTC (rev 5275)
@@ -1,10 +0,0 @@
-Document: libbsf-java1
-Title: Programmer API for libbsf-java
-Author: Apache BSF developer team
-Abstract: Javadocs programmer API of libbsf-java, the Bean Scripting
- Framework to support scripting languages in Java.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libbsf-java/api/index.html
-Files: /usr/share/doc/libbsf-java/api/*.html
Deleted: trunk/libbsf-java/debian/doc-base.2
===================================================================
--- trunk/libbsf-java/debian/doc-base.2 2008-01-03 13:48:59 UTC (rev 5274)
+++ trunk/libbsf-java/debian/doc-base.2 2008-01-03 14:00:04 UTC (rev 5275)
@@ -1,10 +0,0 @@
-Document: libbsf-java2
-Title: Manual for libbsf-java
-Author: Apache BSF developer team
-Abstract: Manual of libbsf-java, the Bean Scripting
- Framework to support scripting languages in Java.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libbsf-java/docs/index.html
-Files: /usr/share/doc/libbsf-java/docs/*.html
Deleted: trunk/libbsf-java/debian/docs
===================================================================
--- trunk/libbsf-java/debian/docs 2008-01-03 13:48:59 UTC (rev 5274)
+++ trunk/libbsf-java/debian/docs 2008-01-03 14:00:04 UTC (rev 5275)
@@ -1 +0,0 @@
-docs
Added: trunk/libbsf-java/debian/libbsf-java.doc-base
===================================================================
--- trunk/libbsf-java/debian/libbsf-java.doc-base
(rev 0)
+++ trunk/libbsf-java/debian/libbsf-java.doc-base 2008-01-03 14:00:04 UTC
(rev 5275)
@@ -0,0 +1,10 @@
+Document: libbsf-java1
+Title: Programmer API for libbsf-java
+Author: Apache BSF developer team
+Abstract: Javadocs programmer API of libbsf-java, the Bean Scripting
+ Framework to support scripting languages in Java.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libbsf-java/api/index.html
+Files: /usr/share/doc/libbsf-java/api/*.html
Added: trunk/libbsf-java/debian/libbsf-java.docs
===================================================================
--- trunk/libbsf-java/debian/libbsf-java.docs (rev 0)
+++ trunk/libbsf-java/debian/libbsf-java.docs 2008-01-03 14:00:04 UTC (rev
5275)
@@ -0,0 +1 @@
+docs
Modified: trunk/libbsf-java/debian/patches/02_Build_Javadoc.patch
===================================================================
--- trunk/libbsf-java/debian/patches/02_Build_Javadoc.patch 2008-01-03
13:48:59 UTC (rev 5274)
+++ trunk/libbsf-java/debian/patches/02_Build_Javadoc.patch 2008-01-03
14:00:04 UTC (rev 5275)
@@ -1,12 +1,11 @@
--- build.xml.orig 2005-03-22 14:58:55.780507536 +0100
+++ build.xml 2005-03-22 14:46:25.528563168 +0100
-@@ -318,7 +318,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"
+@@ -267,7 +267,7 @@
+ <target name="javadocs" description="Generates the API documentation."
depends="compile">
+ <mkdir dir="${build.javadocs}" />
+ <!-- FIXME: Excluding some packages temporarily -->
+- <javadoc packagenames="${packages}" failonerror="true"
excludepackagenames="org.apache.bsf.engines.java,
org.apache.bsf.engines.javaclass" destdir="${build.javadocs}" author="true"
version="false" use="true" windowtitle="${project.fullName} API"
doctitle="${project.fullName}" source="${source.level}">
++ <javadoc packagenames="${packages}" failonerror="true"
excludepackagenames="org.apache.bsf.engines.java,
org.apache.bsf.engines.javaclass, org.apache.bsf.engines.netrexx,
org.apache.bsf.engines.jacl, org.apache.bsf.test,
org.apache.bsf.test.engineTests, org.apache.bsf.test.utilTests"
destdir="${build.javadocs}" author="true" version="false" use="true"
windowtitle="${project.fullName} API" doctitle="${project.fullName}"
source="${source.level}">
+ <classpath refid="compile.classpath" />
+ <fileset dir="${src.dir}">
+ <patternset
refid="java.source.files"></patternset>
Deleted: trunk/libbsf-java/debian/patches/03_RemoveUnsupportedTestcases.patch
===================================================================
--- trunk/libbsf-java/debian/patches/03_RemoveUnsupportedTestcases.patch
2008-01-03 13:48:59 UTC (rev 5274)
+++ trunk/libbsf-java/debian/patches/03_RemoveUnsupportedTestcases.patch
2008-01-03 14:00:04 UTC (rev 5275)
@@ -1,33 +0,0 @@
---- src/org/apache/bsf/test/BSFTest.java.orig 2005-05-12 19:25:50.000000000
+0200
-+++ src/org/apache/bsf/test/BSFTest.java 2005-05-12 19:25:22.000000000
+0200
-@@ -97,24 +97,20 @@
- * Please add testcases here as needed.
- */
- TestSuite suite = new TestSuite();
-- testNames = new String [8];
-+ testNames = new String [6];
-
- suite.addTestSuite(BSFTest.class);
- testNames[0] = "BSFManager Base Tests";
-- suite.addTestSuite(jaclTest.class);
-- testNames[1] = "Jacl Engine Tests";
- suite.addTestSuite(javascriptTest.class);
-- testNames[2] = "Rhino Engine Tests";
-+ testNames[1] = "Rhino Engine Tests";
- suite.addTestSuite(jythonTest.class);
-- testNames[3] = "Jython Engine Tests";
-- suite.addTestSuite(netrexxTest.class);
-- testNames[4] = "NetRexx Engine Tests";
-+ testNames[2] = "Jython Engine Tests";
- suite.addTestSuite(StringUtilsTest.class);
-- testNames[5] = "StringUtils Test";
-+ testNames[3] = "StringUtils Test";
- suite.addTestSuite(IOUtilsTest.class);
-- testNames[6] = "IOUtils Test";
-+ testNames[4] = "IOUtils Test";
- suite.addTestSuite(EngineUtilsTest.class);
-- testNames[7] = "EngineUtils Test";
-+ testNames[5] = "EngineUtils Test";
-
- return suite;
- }
Added: trunk/libbsf-java/debian/patches/03_build-properties.patch
===================================================================
--- trunk/libbsf-java/debian/patches/03_build-properties.patch
(rev 0)
+++ trunk/libbsf-java/debian/patches/03_build-properties.patch 2008-01-03
14:00:04 UTC (rev 5275)
@@ -0,0 +1,11 @@
+--- build.xml.orig 2008-01-01 21:05:21.000000000 +0100
++++ build.xml 2008-01-01 21:05:44.000000000 +0100
+@@ -73,8 +73,6 @@
+
+ <project name="BSF Build" default="compile" basedir=".">
+
+- <import file="build-properties.xml" />
+-
+ <!--
=================================================================== -->
+ <!-- Source files to be compiled
-->
+ <!--
=================================================================== -->
Modified: trunk/libbsf-java/debian/rules
===================================================================
--- trunk/libbsf-java/debian/rules 2008-01-03 13:48:59 UTC (rev 5274)
+++ trunk/libbsf-java/debian/rules 2008-01-03 14:00:04 UTC (rev 5275)
@@ -5,19 +5,21 @@
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/ant.mk
-export UPSTREAM_VERSION = 2.3.0
-
JAVA_HOME := /usr/lib/jvm/java-gcj
ANT_HOME := /usr/share/ant
-DEB_JARS := 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
commons-logging
-DEB_ANT_BUILD_TARGET := compile javadocs
-DEB_ANT_CHECK_TARGET := test
+DEB_ANT_BUILD_TARGET := jar javadocs
+#DEB_ANT_CHECK_TARGET := test
+clean::
+ rm -rf build
+ rm -f lib/bsf.jar
+
install/libbsf-java::
- install -m 644 build/lib/bsf.jar
debian/libbsf-java/usr/share/java/bsf-$(UPSTREAM_VERSION).jar
- ln -s bsf-$(UPSTREAM_VERSION).jar
debian/libbsf-java/usr/share/java/bsf.jar
+ install -m 644 lib/bsf.jar
debian/libbsf-java/usr/share/java/bsf-$(DEB_UPSTREAM_VERSION).jar
+ ln -s bsf-$(DEB_UPSTREAM_VERSION).jar
debian/libbsf-java/usr/share/java/bsf.jar
# install the javadocs into api directory
install -d $(CURDIR)/debian/libbsf-java/usr/share/doc/libbsf-java/api/
- cp -a build/javadocs/*
$(CURDIR)/debian/libbsf-java/usr/share/doc/libbsf-java/api/
+ cp -a build/api/*
$(CURDIR)/debian/libbsf-java/usr/share/doc/libbsf-java/api/
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
