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

[janpascal-guest at alioth.debian.org]

Author: janpascal-guest
Date: 2008-11-25 12:23:18 +0000 (Tue, 25 Nov 2008)
New Revision: 7421

Removed:
   trunk/lucene2/debian/patches/81_prevent-network-access.dpatch
Modified:
   trunk/lucene2/debian/changelog
   trunk/lucene2/debian/patches/00list
Log:
Re-enable Highlighter unit test because it no longer causes network access

Modified: trunk/lucene2/debian/changelog
===================================================================
--- trunk/lucene2/debian/changelog	2008-11-24 00:49:25 UTC (rev 7420)
+++ trunk/lucene2/debian/changelog	2008-11-25 12:23:18 UTC (rev 7421)
@@ -1,3 +1,10 @@
+lucene2 (2.4.0+ds1-3) unstable; urgency=low
+
+  * Re-enable Highlighter unit test because it no longer causes network access
+    (Closes: 50678).
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Tue, 25 Nov 2008 11:01:26 +0100
+
 lucene2 (2.4.0+ds1-2) unstable; urgency=low
 
   * switch to libdb4.6-java as we need the armel binary of it since OOo/armel

Modified: trunk/lucene2/debian/patches/00list
===================================================================
--- trunk/lucene2/debian/patches/00list	2008-11-24 00:49:25 UTC (rev 7420)
+++ trunk/lucene2/debian/patches/00list	2008-11-25 12:23:18 UTC (rev 7421)
@@ -8,4 +8,3 @@
 61_lucli-script.dpatch
 70_fix-contrib-regex-libs.dpatch
 80_prevent-downloading-data-files.dpatch
-81_prevent-network-access.dpatch

Deleted: trunk/lucene2/debian/patches/81_prevent-network-access.dpatch
===================================================================
--- trunk/lucene2/debian/patches/81_prevent-network-access.dpatch	2008-11-24 00:49:25 UTC (rev 7420)
+++ trunk/lucene2/debian/patches/81_prevent-network-access.dpatch	2008-11-25 12:23:18 UTC (rev 7421)
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 81_prevent-network-access.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Disable one of the tests in contrib/highlighter. It seems the XML parser
-## DP: resolves the DTD or xmlns address, causing network access which can cause
-## DP: trouble when running automated builds.
-
- at DPATCH@
-diff -urNad lucene2~/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java lucene2/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
---- lucene2~/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java	2008-09-18 19:03:28.000000000 +0200
-+++ lucene2/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java	2008-09-23 17:31:55.000000000 +0200
-@@ -975,6 +975,8 @@
-    * 
-    * @throws Exception
-    */
-+
-+  /* Disabled for Debian packaging, causes network access during builds
-   public void testEncoding() throws Exception {
- 
-     String rawDocContent = "\"Smith & sons' prices < 3 and >4\" claims article";
-@@ -1014,6 +1016,7 @@
-     String decodedSnippet = h2.getFirstChild().getNodeValue();
-     assertEquals("XHTML Encoding should have worked:", rawDocContent, decodedSnippet);
-   }
-+  */
- 
-   public void testMultiSearcher() throws Exception {
-     // setup index 1