[pkg-java] r5587 - in trunk/lucene2/debian: . patches

[janpascal-guest at alioth.debian.org]

Author: janpascal-guest
Date: 2008-02-01 09:43:52 +0000 (Fri, 01 Feb 2008)
New Revision: 5587

Added:
   trunk/lucene2/debian/patches/80_prevent-downloading-data-files.dpatch
Modified:
   trunk/lucene2/debian/changelog
   trunk/lucene2/debian/patches/00list
   trunk/lucene2/debian/rules
Log:
Disable the contrib/benchmark tests, since they need to download stuff to run

Modified: trunk/lucene2/debian/changelog
===================================================================
--- trunk/lucene2/debian/changelog	2008-02-01 06:17:06 UTC (rev 5586)
+++ trunk/lucene2/debian/changelog	2008-02-01 09:43:52 UTC (rev 5587)
@@ -24,8 +24,10 @@
     main package
   * Added Debian packaging copyright information
   * Added missing descriptions to patch files
+  * Prevent the test run to download anything, which would not work for
+    autobuilders
 
- -- Jan-Pascal van Best <janpascal at vanbest.org>  Fri, 01 Feb 2008 07:16:26 +0100
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Fri, 01 Feb 2008 10:42:29 +0100
 
 lucene2 (2.2.0-2) unstable; urgency=low
 

Modified: trunk/lucene2/debian/patches/00list
===================================================================
--- trunk/lucene2/debian/patches/00list	2008-02-01 06:17:06 UTC (rev 5586)
+++ trunk/lucene2/debian/patches/00list	2008-02-01 09:43:52 UTC (rev 5587)
@@ -1,6 +1,5 @@
 01_remove_all_jarfiles.dpatch
 10_fix-javacc-locations.dpatch
-#20_remove-gdata-server.dpatch
 30_fix-contrib-ant-libs.dpatch
 40_fix-contrib-benchmark-libs.dpatch
 50_fix-contrib-db-libs.dpatch
@@ -8,5 +7,6 @@
 60_fix-contrib-lucli-libs.dpatch
 61_lucli-script.dpatch
 70_fix-contrib-regex-libs.dpatch
+80_prevent-downloading-data-files.dpatch
 #80_fix-javadocs-classpath.dpatch
 #81_fix-javadocs-links.dpatch

Added: trunk/lucene2/debian/patches/80_prevent-downloading-data-files.dpatch
===================================================================
--- trunk/lucene2/debian/patches/80_prevent-downloading-data-files.dpatch	                        (rev 0)
+++ trunk/lucene2/debian/patches/80_prevent-downloading-data-files.dpatch	2008-02-01 09:43:52 UTC (rev 5587)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 80_prevent-downloading-data-files.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Disable running the tests for contrib/benchmark, since it requires
+## DP: downloading test data which may not be possible during automated builds
+
+ at DPATCH@
+diff -urNad lucene2~/contrib/benchmark/build.xml lucene2/contrib/benchmark/build.xml
+--- lucene2~/contrib/benchmark/build.xml	2008-02-01 10:11:32.000000000 +0100
++++ lucene2/contrib/benchmark/build.xml	2008-02-01 10:12:47.000000000 +0100
+@@ -167,9 +167,8 @@
+ 
+     <target name="init" depends="common.init,compile-demo,check-files"/>
+ 
+-    <!-- make sure online collections (reuters) are first downloaded -->
+-    <target name="test" depends="init,get-files">
+-      <antcall target="common.test" inheritRefs="true" />
++    <!-- test empty, since automatic builds cannot download test data -->
++    <target name="test" depends="init">
+     </target>
+     
+ </project>


Property changes on: trunk/lucene2/debian/patches/80_prevent-downloading-data-files.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/lucene2/debian/rules
===================================================================
--- trunk/lucene2/debian/rules	2008-02-01 06:17:06 UTC (rev 5586)
+++ trunk/lucene2/debian/rules	2008-02-01 09:43:52 UTC (rev 5587)
@@ -31,6 +31,8 @@
 	# Same for 'ant test' in contrib/benchmark
 	rm -rf $(CURDIR)/contrib/benchmark/temp
 	rm -rf $(CURDIR)/contrib/benchmark/work/index
+	rm -rf $(CURDIR)/contrib/benchmark/work/reuters
+	rm -rf $(CURDIR)/contrib/benchmark/work/reuters-out
 	# remove keyring, since it is a binary file
 	rm -f debian/lucene-keyring.gpg
 	# remove all javacc-generated files from src and contrib, except those