[lucene2] 70/104: Move unused patch to old/; add patches to fix a contrib/ant test when running with pbuilder (it urldecoded a local path which contains a '+' sign from the Debian version number) and to disable back compat tests (they download older revisions from the upstream svn).

Wed Mar 23 16:27:33 UTC 2016

This is an automated email from the git hooks/post-receive script.

seamlik-guest pushed a commit to branch master
in repository lucene2.

commit 49c4b476bd37e7853acc5c48d0a320fbf945659d
Author: Jan-Pascal van Best <janpascal at vanbest.org>
Date:   Thu Nov 5 10:17:54 2009 +0000

    Move unused patch to old/; add patches to fix a contrib/ant test when running with
    pbuilder (it urldecoded a local path which contains a '+' sign from the Debian
    version number) and to disable back compat tests (they download older revisions
    from the upstream svn).
---
 debian/changelog                                   |  8 +++
 debian/patches/00list                              |  2 +
 .../31_fix-contrib-ant-test-wrong-encoding.dpatch  | 21 +++++++
 .../81_disable-test-tag-backcompat-tests.dpatch    | 72 ++++++++++++++++++++++
 .../11_run-javacc-for-contrib-queryparser.dpatch   |  0
 5 files changed, 103 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index feb5969..c089778 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lucene2 (2.9.0+ds1-3) UNRELEASED; urgency=low
+
+  * Fix contrib/ant unit test for running under pbuilder
+  * Disable backwards compatibility tests because these download older versions
+    from the Apache Lucene svn repository
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Thu, 05 Nov 2009 11:07:28 +0100
+
 lucene2 (2.9.0+ds1-2) unstable; urgency=low
 
   * Updated Java source and target version to 1.5 (Closes: #549812)
diff --git a/debian/patches/00list b/debian/patches/00list
index 07e6aa1..b58a86f 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -3,6 +3,7 @@
 11_fix-javacc-generated-files.dpatch
 20_fix-java-compiler-version.dpatch
 30_fix-contrib-ant-libs.dpatch
+31_fix-contrib-ant-test-wrong-encoding.dpatch
 40_fix-contrib-benchmark-libs.dpatch
 45_fix-contrib-collation-libs.dpatch
 50_fix-contrib-db-libs.dpatch
@@ -11,3 +12,4 @@
 61_lucli-script.dpatch
 70_fix-contrib-regex-libs.dpatch
 80_prevent-downloading-data-files.dpatch
+81_disable-test-tag-backcompat-tests.dpatch
diff --git a/debian/patches/31_fix-contrib-ant-test-wrong-encoding.dpatch b/debian/patches/31_fix-contrib-ant-test-wrong-encoding.dpatch
new file mode 100755
index 0000000..eca735e
--- /dev/null
+++ b/debian/patches/31_fix-contrib-ant-test-wrong-encoding.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 31_fix-contrib-ant-test-wrong-encoding.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: The URL decoding caused the test to fail when building with pbuilder,
+## DP: because the '+' sign in the Debian version number was converted to
+## DP: a space. This patch removes the URL decoding.
+
+ at DPATCH@
+diff -urNad lucene2~/contrib/ant/src/test/org/apache/lucene/ant/DocumentTestCase.java lucene2/contrib/ant/src/test/org/apache/lucene/ant/DocumentTestCase.java
+--- lucene2~/contrib/ant/src/test/org/apache/lucene/ant/DocumentTestCase.java	2009-06-27 12:58:40.000000000 +0200
++++ lucene2/contrib/ant/src/test/org/apache/lucene/ant/DocumentTestCase.java	2009-11-05 09:34:23.000000000 +0100
+@@ -33,7 +33,7 @@
+         String fullname =
+                      this.getClass().getResource(filename).getFile();
+         
+-        File file = new File(URLDecoder.decode(fullname, "UTF-8"));
++        File file = new File(fullname);
+         
+         return file;
+     }
diff --git a/debian/patches/81_disable-test-tag-backcompat-tests.dpatch b/debian/patches/81_disable-test-tag-backcompat-tests.dpatch
new file mode 100755
index 0000000..732ca74
--- /dev/null
+++ b/debian/patches/81_disable-test-tag-backcompat-tests.dpatch
@@ -0,0 +1,72 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 81_disable-test-tag-backcompat-tests.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad lucene2~/build.xml lucene2/build.xml
+--- lucene2~/build.xml	2009-09-18 01:03:43.000000000 +0200
++++ lucene2/build.xml	2009-11-05 10:43:38.000000000 +0100
+@@ -80,8 +80,8 @@
+   <target name="test-core" depends="common.test"
+           description="Runs unit tests for the core Lucene code"
+   />
+-  <target name="test" depends="test-core, test-contrib, test-tag"
+-          description="Runs all unit tests (core, contrib and back-compat)"
++  <target name="test" depends="test-core, test-contrib"
++          description="Runs all unit tests (core and contrib)"
+   />
+ 
+   <property name="tag" value="${compatibility.tag}"/>
+@@ -100,50 +100,6 @@
+     <pathelement path="${java.class.path}"/>
+   </path>
+ 
+-  <target name="download-tag"
+-  	description="Downloads a previous Lucene version. Specify tag version like this: -Dtag=lucene_2_4_back_compat_tests_20090127">
+-	<sequential>
+-	  <mkdir dir="${tags.dir}/${tag}"/>
+-      <exec dir="${tags.dir}/${tag}" executable="${svn.exe}"
+-            failifexecutionfails="false">
+-        <arg line="checkout http://svn.apache.org/repos/asf/lucene/java/tags/${tag}/src/"/>
+-      </exec>
+-	</sequential>
+-  </target>
+-	
+-  <target name="test-tag" depends="download-tag, compile-core, compile-demo, jar-core"
+-  	description="Runs tests of a previous Lucene version. Specify tag version like this: -Dtag=branches/lucene_2_4_back_compat_tests">
+-	<sequential>
+-      <available property="tag.available" file="${tags.dir}/${tag}/src/test" />
+-
+-	  <fail unless="tag.available">
+-	  	Specified tag '${tag}' could not be found in directory '${tags.dir}/${tag}'.
+-	  </fail>
+-	  <mkdir dir="${build.dir}/${tag}"/>	  
+-		
+-	  <!-- first compile tag classes -->
+-	  <compile
+-	    srcdir="${tags.dir}/${tag}/src/java"
+-	    destdir="${build.dir}/${tag}/classes/java">
+-	  <classpath refid="tag.classpath"/>
+-	  </compile>
+-
+-	  <!-- compile jar for tag -->
+-      <jarify basedir="${build.dir}/${tag}/classes/java"
+-			  destfile="${build.dir}/${tag}/${tag}.jar" />
+-		  	
+-	  <!-- compile tag tests against tag jar -->	
+-	  <compile-test-macro srcdir="${tags.dir}/${tag}/src/test" destdir="${build.dir}/${tag}/classes/test"
+-			  			  test.classpath="tag.test.classpath"/>
+-		
+-	  <!-- run tag tests against trunk jar -->
+-      <test-macro dataDir="${tags.dir}/${tag}/src/test" 
+-      			  tempDir="${build.dir}/${tag}"
+-      			  junit.classpath="tag.junit.classpath"/>
+-  	</sequential>
+-  </target>	
+-
+-	
+   <target name="clean-tags"
+     description="Removes contents of the tags directory">
+     <delete dir="${tags.dir}"/>
diff --git a/debian/patches/11_run-javacc-for-contrib-queryparser.dpatch b/debian/patches/old/11_run-javacc-for-contrib-queryparser.dpatch
similarity index 100%
rename from debian/patches/11_run-javacc-for-contrib-queryparser.dpatch
rename to debian/patches/old/11_run-javacc-for-contrib-queryparser.dpatch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lucene2.git

