[pkg-java] r13038 - in trunk/libbsf-java/debian: . patches source

[Tony Mancill]

Author: tmancill
Date: 2010-10-29 05:18:37 +0000 (Fri, 29 Oct 2010)
New Revision: 13038

Added:
   trunk/libbsf-java/debian/patches/04_external_libs.patch
   trunk/libbsf-java/debian/source/
   trunk/libbsf-java/debian/source/format
Modified:
   trunk/libbsf-java/debian/ant.properties
   trunk/libbsf-java/debian/changelog
   trunk/libbsf-java/debian/control
   trunk/libbsf-java/debian/patches/series
Log:
apply patch for 601685

Modified: trunk/libbsf-java/debian/ant.properties
===================================================================
--- trunk/libbsf-java/debian/ant.properties	2010-10-28 21:01:57 UTC (rev 13037)
+++ trunk/libbsf-java/debian/ant.properties	2010-10-29 05:18:37 UTC (rev 13038)
@@ -8,3 +8,4 @@
 source.level=1.3
 src.dir=src
 tests.dir=src
+os.jar.dir=/usr/share/java

Modified: trunk/libbsf-java/debian/changelog
===================================================================
--- trunk/libbsf-java/debian/changelog	2010-10-28 21:01:57 UTC (rev 13037)
+++ trunk/libbsf-java/debian/changelog	2010-10-29 05:18:37 UTC (rev 13038)
@@ -1,3 +1,13 @@
+libbsf-java (1:2.4.0-5) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Apply patch detecting optional languages at build time
+    Thanks to Ximin Lao.  (Closes: #601685)
+  * Update standards version to 3.9.1 (no changes)
+  * Convert to source format 3.0 (quilt); drop build-depends on quilt.
+
+ -- tony mancill <tmancill at debian.org>  Thu, 28 Oct 2010 21:49:02 -0700
+
 libbsf-java (1:2.4.0-4) unstable; urgency=low
 
   * Disable jython support because it is broken for jython >= 2.5.

Modified: trunk/libbsf-java/debian/control
===================================================================
--- trunk/libbsf-java/debian/control	2010-10-28 21:01:57 UTC (rev 13037)
+++ trunk/libbsf-java/debian/control	2010-10-29 05:18:37 UTC (rev 13038)
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Michael Koch <konqueror at gmx.de>, Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 5), cdbs, quilt
+Build-Depends: debhelper (>= 5), cdbs
 Build-Depends-Indep: ant, ant-optional, default-jdk, libxalan2-java, jython, junit, libcommons-logging-java
-Standards-Version: 3.8.2
+Standards-Version: 3.9.1
 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/

Added: trunk/libbsf-java/debian/patches/04_external_libs.patch
===================================================================
--- trunk/libbsf-java/debian/patches/04_external_libs.patch	                        (rev 0)
+++ trunk/libbsf-java/debian/patches/04_external_libs.patch	2010-10-29 05:18:37 UTC (rev 13038)
@@ -0,0 +1,61 @@
+diff -ru libbsf-java-2.4.0.debian/build.xml libbsf-java-2.4.0.new/build.xml
+--- libbsf-java-2.4.0.orig/build.xml	2010-10-28 14:16:36.697889355 +0100
++++ libbsf-java-2.4.0/build.xml	2010-10-28 14:11:49.987052496 +0100
+@@ -88,10 +88,23 @@
+ 		<include name="**/test/**" if="junit.present" />
+ 	</patternset>
+ 
++	<path id="lib.classpath">
++		<fileset dir="${os.jar.dir}">
++			<include name="commons-logging.jar"/>
++			<!-- JACL not packaged by debian -->
++			<!-- Jython support broken for >=2.5 -->
++			<!--<include name="jython.jar"/>-->
++			<!-- NetRexx not packaged by debian -->
++			<include name="js.jar"/>
++			<include name="xalan2.jar"/>
++		</fileset>
++	</path>
++
+ 	<path id="compile.classpath">
+ 		<fileset dir="lib">
+ 			<include name="*.jar" />
+ 		</fileset>
++		<path refid="lib.classpath"/>
+ 		<pathelement location="${build.dest}" />
+ 	</path>
+ 
+@@ -120,15 +133,15 @@
+ 		<!-- ================================================================= -->
+ 		<!-- Determines what optional components are available                 -->
+ 		<!-- ================================================================= -->
+-		<available property="jacl.present" classname="tcl.lang.JACL" />
++		<available property="jacl.present" classname="tcl.lang.JACL" classpathref="lib.classpath" />
+ 
+-		<available property="jython.present" classname="org.python.util.jython" />
++		<available property="jython.present" classname="org.python.util.jython" classpathref="lib.classpath" />
+ 
+-		<available property="netrexx.present" classname="netrexx.lang.Rexx" />
++		<available property="netrexx.present" classname="netrexx.lang.Rexx" classpathref="lib.classpath" />
+ 
+-		<available property="rhino.present" classname="org.mozilla.javascript.Scriptable" />
++		<available property="rhino.present" classname="org.mozilla.javascript.Scriptable" classpathref="lib.classpath" />
+ 
+-		<available property="xalan.present" classname="org.apache.xalan.xslt.EnvironmentCheck" />
++		<available property="xalan.present" classname="org.apache.xalan.xslt.EnvironmentCheck" classpathref="lib.classpath" />
+ 
+ 		<available property="junit.present" classname="junit.framework.TestCase" />
+ 
+@@ -212,11 +225,7 @@
+ 	<target name="compile" description="Compiles the BSF *.java files." depends="prepare">
+ 		<mkdir dir="${build.dest}"/>
+ 		<javac srcdir="${src.dir}" destdir="${build.dest}" debug="${project.debug}" deprecation="${project.deprecation}" source="${source.level}">
+-			<classpath>
+-				<fileset dir="lib">
+-					<include name="*.jar"/>
+-				</fileset>
+-			</classpath>
++			<classpath refid="compile.classpath"/>
+ 			<patternset refid="java.source.files"/>
+ 		</javac>
+ 	</target>

Modified: trunk/libbsf-java/debian/patches/series
===================================================================
--- trunk/libbsf-java/debian/patches/series	2010-10-28 21:01:57 UTC (rev 13037)
+++ trunk/libbsf-java/debian/patches/series	2010-10-29 05:18:37 UTC (rev 13038)
@@ -1,3 +1,4 @@
 01_EvaluatorExceptionCompileFix.patch 
 02_Build_Javadoc.patch 
 03_build-properties.patch 
+04_external_libs.patch

Added: trunk/libbsf-java/debian/source/format
===================================================================
--- trunk/libbsf-java/debian/source/format	                        (rev 0)
+++ trunk/libbsf-java/debian/source/format	2010-10-29 05:18:37 UTC (rev 13038)
@@ -0,0 +1 @@
+3.0 (quilt)