[pkg-java] r9422 - in trunk/libbsf-java/debian: . patches
Torsten Werner
twerner at alioth.debian.org
Thu Jul 30 17:16:22 UTC 2009
Author: twerner
Date: 2009-07-30 17:16:22 +0000 (Thu, 30 Jul 2009)
New Revision: 9422
Added:
trunk/libbsf-java/debian/patches/series
Modified:
trunk/libbsf-java/debian/changelog
trunk/libbsf-java/debian/control
trunk/libbsf-java/debian/patches/01_EvaluatorExceptionCompileFix.patch
trunk/libbsf-java/debian/patches/02_Build_Javadoc.patch
trunk/libbsf-java/debian/patches/03_build-properties.patch
trunk/libbsf-java/debian/rules
Log:
* Add myself to Uploaders.
* Fix build errors.
* Switch to quilt.
* Switch to debhelper 5.
* Update Standards-Version: 3.8.2.
* Add Homepage and Vcs headers.
* Change Section: java.
* Add missing Depends: ${misc:Depends}.
Modified: trunk/libbsf-java/debian/changelog
===================================================================
--- trunk/libbsf-java/debian/changelog 2009-07-30 16:35:05 UTC (rev 9421)
+++ trunk/libbsf-java/debian/changelog 2009-07-30 17:16:22 UTC (rev 9422)
@@ -1,9 +1,20 @@
-libbsf-java (1:2.4.0-3) UNRELEASED; urgency=low
+libbsf-java (1:2.4.0-3) unstable; urgency=low
+ [ Matthias Klose ]
* (Build-)depend on default-jre/-jdk.
- -- Matthias Klose <doko at debian.org> Wed, 30 Jul 2008 15:46:14 +0000
+ [ Torsten Werner ]
+ * Add myself to Uploaders.
+ * Fix build errors.
+ * Switch to quilt.
+ * Switch to debhelper 5.
+ * Update Standards-Version: 3.8.2.
+ * Add Homepage and Vcs headers.
+ * Change Section: java.
+ * Add missing Depends: ${misc:Depends}.
+ -- Torsten Werner <twerner at debian.org> Thu, 30 Jul 2009 19:08:55 +0200
+
libbsf-java (1:2.4.0-2) unstable; urgency=low
* Added Build-Depends-Indep on libcommons-logging-java.
Modified: trunk/libbsf-java/debian/control
===================================================================
--- trunk/libbsf-java/debian/control 2009-07-30 16:35:05 UTC (rev 9421)
+++ trunk/libbsf-java/debian/control 2009-07-30 17:16:22 UTC (rev 9422)
@@ -1,16 +1,19 @@
Source: libbsf-java
-Section: libs
+Section: java
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>
-Build-Depends: debhelper (>= 4.2.30), cdbs
+Uploaders: Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Torsten Werner <twerner at debian.org>
+Build-Depends: debhelper (>= 5), cdbs, quilt
Build-Depends-Indep: ant, ant-optional, default-jdk, libservlet2.4-java, libxalan2-java, jython, junit, libcommons-logging-java
-Standards-Version: 3.7.3
+Standards-Version: 3.8.2
+Homepage: http://jakarta.apache.org/bsf/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libbsf-java
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libbsf-java/
Package: libbsf-java
Architecture: all
-Section: libs
-Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless
+Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless,
+ ${misc:Depends}
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
@@ -31,5 +34,3 @@
.
Support for Tcl, NetRexx is not available in this Debian
package since Jacl, NetRexx (non-free) are not packaged.
- .
- See http://jakarta.apache.org/bsf/ for more information about BSF.
Modified: trunk/libbsf-java/debian/patches/01_EvaluatorExceptionCompileFix.patch
===================================================================
--- trunk/libbsf-java/debian/patches/01_EvaluatorExceptionCompileFix.patch 2009-07-30 16:35:05 UTC (rev 9421)
+++ trunk/libbsf-java/debian/patches/01_EvaluatorExceptionCompileFix.patch 2009-07-30 17:16:22 UTC (rev 9422)
@@ -1,6 +1,8 @@
---- src/org/apache/bsf/engines/javascript/JavaScriptEngine.java.orig 2005-03-10 18:51:48.068256016 +0100
-+++ src/org/apache/bsf/engines/javascript/JavaScriptEngine.java 2005-03-10 18:52:12.629522136 +0100
-@@ -119,7 +119,7 @@
+Index: libbsf-java-2.4.0/src/org/apache/bsf/engines/javascript/JavaScriptEngine.java
+===================================================================
+--- libbsf-java-2.4.0.orig/src/org/apache/bsf/engines/javascript/JavaScriptEngine.java 2006-10-06 17:53:00.000000000 +0200
++++ libbsf-java-2.4.0/src/org/apache/bsf/engines/javascript/JavaScriptEngine.java 2009-07-30 19:03:12.000000000 +0200
+@@ -77,7 +77,7 @@
// Any way to make these arguments *sensible?
if (fun == Scriptable.NOT_FOUND)
throw new EvaluatorException("function " + method +
Modified: trunk/libbsf-java/debian/patches/02_Build_Javadoc.patch
===================================================================
--- trunk/libbsf-java/debian/patches/02_Build_Javadoc.patch 2009-07-30 16:35:05 UTC (rev 9421)
+++ trunk/libbsf-java/debian/patches/02_Build_Javadoc.patch 2009-07-30 17:16:22 UTC (rev 9422)
@@ -1,5 +1,7 @@
---- build.xml.orig 2005-03-22 14:58:55.780507536 +0100
-+++ build.xml 2005-03-22 14:46:25.528563168 +0100
+Index: libbsf-java-2.4.0/build.xml
+===================================================================
+--- libbsf-java-2.4.0.orig/build.xml 2006-10-06 17:53:00.000000000 +0200
++++ libbsf-java-2.4.0/build.xml 2009-07-30 19:03:21.000000000 +0200
@@ -267,7 +267,7 @@
<target name="javadocs" description="Generates the API documentation." depends="compile">
<mkdir dir="${build.javadocs}" />
Modified: trunk/libbsf-java/debian/patches/03_build-properties.patch
===================================================================
--- trunk/libbsf-java/debian/patches/03_build-properties.patch 2009-07-30 16:35:05 UTC (rev 9421)
+++ trunk/libbsf-java/debian/patches/03_build-properties.patch 2009-07-30 17:16:22 UTC (rev 9422)
@@ -1,5 +1,7 @@
---- build.xml.orig 2008-01-01 21:05:21.000000000 +0100
-+++ build.xml 2008-01-01 21:05:44.000000000 +0100
+Index: libbsf-java-2.4.0/build.xml
+===================================================================
+--- libbsf-java-2.4.0.orig/build.xml 2009-07-30 19:03:21.000000000 +0200
++++ libbsf-java-2.4.0/build.xml 2009-07-30 19:03:43.000000000 +0200
@@ -73,8 +73,6 @@
<project name="BSF Build" default="compile" basedir=".">
@@ -9,3 +11,11 @@
<!-- =================================================================== -->
<!-- Source files to be compiled -->
<!-- =================================================================== -->
+@@ -136,7 +134,6 @@
+
+ <uptodate property="javac.notRequired" targetfile="${build.lib}/${project.name}.jar">
+ <srcfiles dir="${src.dir}">
+- <patternset refid="javac.source.files" />
+ </srcfiles>
+ </uptodate>
+
Added: trunk/libbsf-java/debian/patches/series
===================================================================
--- trunk/libbsf-java/debian/patches/series (rev 0)
+++ trunk/libbsf-java/debian/patches/series 2009-07-30 17:16:22 UTC (rev 9422)
@@ -0,0 +1,3 @@
+01_EvaluatorExceptionCompileFix.patch
+02_Build_Javadoc.patch
+03_build-properties.patch
Modified: trunk/libbsf-java/debian/rules
===================================================================
--- trunk/libbsf-java/debian/rules 2009-07-30 16:35:05 UTC (rev 9421)
+++ trunk/libbsf-java/debian/rules 2009-07-30 17:16:22 UTC (rev 9422)
@@ -2,7 +2,7 @@
# debian/rules file for libbsf-java (uses cdbs)
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/class/ant.mk
JAVA_HOME := /usr/lib/jvm/default-java
@@ -14,9 +14,11 @@
#DEB_ANT_CHECK_TARGET := test
clean::
- rm -rf build
- rm -f lib/bsf.jar
+ $(RM) -r build lib
+makebuilddir::
+ mkdir -p lib
+
install/libbsf-java::
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
More information about the pkg-java-commits
mailing list