Author: janpascal-guest Date: 2010-01-25 15:30:18 +0000 (Mon, 25 Jan 2010) New Revision: 11412
Added: trunk/lucene2/debian/patches/83_fix-java-IPv4-networking.dpatch trunk/lucene2/debian/patches/99debug_print-unittest-results.dpatch Modified: trunk/lucene2/debian/changelog trunk/lucene2/debian/patches/00list trunk/lucene2/debian/patches/05_add-osgi-metadata-in-manifests.dpatch Log: put patches to upstream source to proper dpatch files Modified: trunk/lucene2/debian/changelog =================================================================== --- trunk/lucene2/debian/changelog 2010-01-25 10:59:04 UTC (rev 11411) +++ trunk/lucene2/debian/changelog 2010-01-25 15:30:18 UTC (rev 11412) @@ -1,3 +1,17 @@ +lucene2 (2.9.1+ds1-6) UNRELEASED; urgency=low + + * Add patch to fix Java networking during package build (workaround for + #560056). + + -- Jan-Pascal van Best <[email protected]> Mon, 25 Jan 2010 15:34:31 +0100 + +lucene2 (2.9.1+ds1-5) unstable; urgency=low + + * Override OSGi Bundle-SymbolicName for lucene-analyzers to be + `analysis' instead of `analyzers' (Closes: #566445) + + -- Jan-Pascal van Best <[email protected]> Sat, 23 Jan 2010 20:27:45 +0100 + lucene2 (2.9.1+ds1-4) unstable; urgency=low * Disable calling svnversion during package build Modified: trunk/lucene2/debian/patches/00list =================================================================== --- trunk/lucene2/debian/patches/00list 2010-01-25 10:59:04 UTC (rev 11411) +++ trunk/lucene2/debian/patches/00list 2010-01-25 15:30:18 UTC (rev 11412) @@ -14,5 +14,6 @@ 61_lucli-script.dpatch 70_fix-contrib-regex-libs.dpatch 80_prevent-downloading-data-files.dpatch -#81_disable-test-tag-backcompat-tests.dpatch +81_disable-test-tag-backcompat-tests.dpatch 82_disable-svnversion-calls.dpatch +83_fix-java-IPv4-networking.dpatch Modified: trunk/lucene2/debian/patches/05_add-osgi-metadata-in-manifests.dpatch =================================================================== --- trunk/lucene2/debian/patches/05_add-osgi-metadata-in-manifests.dpatch 2010-01-25 10:59:04 UTC (rev 11411) +++ trunk/lucene2/debian/patches/05_add-osgi-metadata-in-manifests.dpatch 2010-01-25 15:30:18 UTC (rev 11412) @@ -6,8 +6,8 @@ @DPATCH@ diff -urNad lucene2~/build.xml lucene2/build.xml ---- lucene2~/build.xml 2010-01-20 15:01:22.000000000 +0100 -+++ lucene2/build.xml 2010-01-20 15:01:24.000000000 +0100 +--- lucene2~/build.xml 2010-01-23 20:26:27.000000000 +0100 ++++ lucene2/build.xml 2010-01-23 20:26:30.000000000 +0100 @@ -21,6 +21,16 @@ <property name="junit.includes" value="**/Test*.java"/> @@ -26,8 +26,8 @@ <property name="build.demo.template" value="src/demo/demo-build.template"/> diff -urNad lucene2~/common-build.xml lucene2/common-build.xml ---- lucene2~/common-build.xml 2010-01-20 15:01:22.000000000 +0100 -+++ lucene2/common-build.xml 2010-01-20 15:09:33.000000000 +0100 +--- lucene2~/common-build.xml 2010-01-23 20:26:27.000000000 +0100 ++++ lucene2/common-build.xml 2010-01-23 20:26:30.000000000 +0100 @@ -313,6 +313,29 @@ value="${javac.source}"/> <attribute name="X-Compile-Target-JDK" @@ -59,14 +59,13 @@ </sequential> </macrodef> diff -urNad lucene2~/contrib/analyzers/common/build.xml lucene2/contrib/analyzers/common/build.xml ---- lucene2~/contrib/analyzers/common/build.xml 2010-01-20 15:01:22.000000000 +0100 -+++ lucene2/contrib/analyzers/common/build.xml 2010-01-20 15:01:24.000000000 +0100 -@@ -31,7 +31,16 @@ +--- lucene2~/contrib/analyzers/common/build.xml 2010-01-23 20:26:27.000000000 +0100 ++++ lucene2/contrib/analyzers/common/build.xml 2010-01-23 20:26:30.000000000 +0100 +@@ -30,8 +30,18 @@ + <property name="dist.dir" location="../../../dist/contrib/analyzers/common" /> <property name="maven.dist.dir" location="../../../dist/maven" /> - <import file="../../contrib-build.xml"/> -- -+ ++ <property name="OSGi.symbolicname" value="org.apache.lucene.analysis" /> + <pathconvert property="OSGi.exportpackage" pathsep=","> + <dirset dir="src/java" excludes="org org/apache org/apache/lucene org/apache/lucene/analysis"/> + <mapper> @@ -76,16 +75,19 @@ + </mapper> + </pathconvert> + + <import file="../../contrib-build.xml"/> +- ++ <path id="test.classpath"> <path refid="classpath"/> <pathelement location="../../../build/classes/test/"/> diff -urNad lucene2~/contrib/analyzers/smartcn/build.xml lucene2/contrib/analyzers/smartcn/build.xml ---- lucene2~/contrib/analyzers/smartcn/build.xml 2010-01-20 15:01:22.000000000 +0100 -+++ lucene2/contrib/analyzers/smartcn/build.xml 2010-01-20 15:01:24.000000000 +0100 -@@ -32,6 +32,15 @@ +--- lucene2~/contrib/analyzers/smartcn/build.xml 2010-01-23 20:26:27.000000000 +0100 ++++ lucene2/contrib/analyzers/smartcn/build.xml 2010-01-23 20:26:59.000000000 +0100 +@@ -30,6 +30,15 @@ + <property name="dist.dir" location="../../../dist/contrib/analyzers/smartcn" /> + <property name="maven.dist.dir" location="../../../dist/maven" /> - <import file="../../contrib-build.xml"/> - + <pathconvert property="OSGi.exportpackage" pathsep=","> + <dirset dir="src/java" excludes="org org/apache org/apache/lucene org/apache/lucene/analysis"/> + <mapper> @@ -95,12 +97,12 @@ + </mapper> + </pathconvert> + + <import file="../../contrib-build.xml"/> + <path id="test.classpath"> - <path refid="classpath"/> - <pathelement location="../../../build/classes/test/"/> diff -urNad lucene2~/contrib/contrib-build.xml lucene2/contrib/contrib-build.xml ---- lucene2~/contrib/contrib-build.xml 2010-01-20 15:01:22.000000000 +0100 -+++ lucene2/contrib/contrib-build.xml 2010-01-20 15:01:24.000000000 +0100 +--- lucene2~/contrib/contrib-build.xml 2010-01-23 20:26:27.000000000 +0100 ++++ lucene2/contrib/contrib-build.xml 2010-01-23 20:26:30.000000000 +0100 @@ -24,7 +24,21 @@ <property name="build.dir" location="../../build/contrib/${ant.project.name}"/> <property name="dist.dir" location="../../dist/contrib/${ant.project.name}"/> Added: trunk/lucene2/debian/patches/83_fix-java-IPv4-networking.dpatch =================================================================== --- trunk/lucene2/debian/patches/83_fix-java-IPv4-networking.dpatch (rev 0) +++ trunk/lucene2/debian/patches/83_fix-java-IPv4-networking.dpatch 2010-01-25 15:30:18 UTC (rev 11412) @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 83_fix-java-IPv4-networking.dpatch by Jan-Pascal van Best <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +...@dpatch@ +--- lucene2-2.9.1+ds1.orig/common-build.xml ++++ lucene2-2.9.1+ds1/common-build.xml +@@ -54,7 +54,7 @@ + </path> + + <!-- default arguments to pass to JVM executing tests --> +- <property name="args" value=""/> ++ <property name="args" value="-Djava.net.preferIPv4Stack=true"/> + + <property name="javac.deprecation" value="off"/> + <property name="javac.debug" value="on"/> Property changes on: trunk/lucene2/debian/patches/83_fix-java-IPv4-networking.dpatch ___________________________________________________________________ Added: svn:executable + * Added: trunk/lucene2/debian/patches/99debug_print-unittest-results.dpatch =================================================================== --- trunk/lucene2/debian/patches/99debug_print-unittest-results.dpatch (rev 0) +++ trunk/lucene2/debian/patches/99debug_print-unittest-results.dpatch 2010-01-25 15:30:18 UTC (rev 11412) @@ -0,0 +1,24 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 99debug_print-unittest-results-final.dpatch by Jan-Pascal van Best <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +...@dpatch@ +diff -urNad lucene2~/build.xml lucene2/build.xml +--- lucene2~/build.xml 2010-01-25 15:04:52.000000000 +0100 ++++ lucene2/build.xml 2010-01-25 15:28:13.000000000 +0100 +@@ -88,8 +88,11 @@ + <!-- ================================================================== --> + + <target name="test-core" depends="common.test" +- description="Runs unit tests for the core Lucene code" +- /> ++ description="Runs unit tests for the core Lucene code"> ++ <exec executable="/bin/cat"> ++ <arg path="${junit.output.dir}/TEST-org.apache.lucene.index.TestIndexReaderReopen.xml" /> ++ </exec> ++ </target> + <target name="test" depends="test-core, test-contrib" + description="Runs all unit tests (core and contrib)" + /> _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
