The following commit has been merged in the master branch:
commit a3f6c046e5613637b29786dc55b5e0eb8d5f8faa
Author: James Page <james.p...@ubuntu.com>
Date: Mon May 28 10:05:52 2012 +0100
Annotated patches and fixed icu4.4 test failure
diff --git a/debian/patches/disable-ivy.patch b/debian/patches/disable-ivy.patch
index 9ed29f1..0339e34 100644
--- a/debian/patches/disable-ivy.patch
+++ b/debian/patches/disable-ivy.patch
@@ -1,3 +1,7 @@
+Description: Disable ivy resolution for offline builds.
+Author: James Page <james.p...@ubuntu.com>
+Forwarded: not-needed
+
Index: lucene-solr/lucene/common-build.xml
===================================================================
--- lucene-solr.orig/lucene/common-build.xml 2012-05-23 10:50:17.331614071
+0100
diff --git a/debian/patches/fix-jar-matches.patch
b/debian/patches/fix-jar-matches.patch
index 1d4a555..69c305a 100644
--- a/debian/patches/fix-jar-matches.patch
+++ b/debian/patches/fix-jar-matches.patch
@@ -1,3 +1,8 @@
+Description: Misc patches to build process to pickup
+ unversioned jar files to support use of system libraries
+Author: James Page <james.p...@ubuntu.com>
+Forwarded: not-needed
+
Index: lucene-solr/lucene/contrib/benchmark/build.xml
===================================================================
--- lucene-solr.orig/lucene/contrib/benchmark/build.xml 2012-05-23
11:15:26.156364644 +0100
diff --git a/debian/patches/icu4.4-compat.patch
b/debian/patches/icu4.4-compat.patch
new file mode 100644
index 0000000..d60a46f
--- /dev/null
+++ b/debian/patches/icu4.4-compat.patch
@@ -0,0 +1,19 @@
+Description: Update ICU test as Debian/Ubuntu ship ICU
+ 4.4 not 4.6/4.8 as used by upstream - this alters the
+ collation key order slightly
+Origin:
https://github.com/apache/lucene-solr/commit/694ec2f6589ddefa1828437621f4dda7e827ae47#diff-18
+Author: James Page <james.p...@ubuntu.com>
+Forwarded: not-needed
+
+Index:
lucene-solr/lucene/contrib/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyFilter.java
+===================================================================
+---
lucene-solr.orig/lucene/contrib/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyFilter.java
2012-05-28 10:02:19.878070608 +0100
++++
lucene-solr/lucene/contrib/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyFilter.java
2012-05-28 10:03:17.442563034 +0100
+@@ -94,6 +94,6 @@
+ // orderings - "BFJHD" is the ordering for the ICU Collator for Locale.US.
+ testCollationKeySort
+ (usAnalyzer, franceAnalyzer, swedenAnalyzer, denmarkAnalyzer,
+- "BFJHD", "ECAGI", "BJDFH", "BJDHF");
++ "BFJHD", "EACGI", "BJDFH", "BJDHF");
+ }
+ }
diff --git a/debian/patches/ignore-failing-tests.patch
b/debian/patches/ignore-failing-tests.patch
deleted file mode 100644
index 339aab5..0000000
--- a/debian/patches/ignore-failing-tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index:
lucene-solr/lucene/contrib/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyFilter.java
-===================================================================
----
lucene-solr.orig/lucene/contrib/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyFilter.java
2012-05-23 09:39:25.597827260 +0100
-+++
lucene-solr/lucene/contrib/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyFilter.java
2012-05-25 11:18:53.803044361 +0100
-@@ -27,6 +27,7 @@
-
- import java.io.Reader;
- import java.util.Locale;
-+import org.junit.Ignore;
-
-
- public class TestICUCollationKeyFilter extends CollationTestBase {
-@@ -80,7 +81,8 @@
- //
- // Copied (and slightly modified) from
- // org.apache.lucene.search.TestSort.testInternationalSort()
-- //
-+ //
-+ @Ignore
- public void testCollationKeySort() throws Exception {
- Analyzer usAnalyzer = new TestAnalyzer(Collator.getInstance(Locale.US));
- Analyzer franceAnalyzer
diff --git a/debian/patches/javacc-system.patch
b/debian/patches/javacc-system.patch
index 5da55bd..bcbba08 100644
--- a/debian/patches/javacc-system.patch
+++ b/debian/patches/javacc-system.patch
@@ -1,3 +1,8 @@
+Description: Point javacc configuration at the jar files
+ provided as part of the distribution.
+Author: James Page <james.p...@ubuntu.com>
+Forwarded: not-needed
+
Index: lucene-solr/lucene/common-build.xml
===================================================================
--- lucene-solr.orig/lucene/common-build.xml 2012-05-23 10:00:18.885978436
+0100
diff --git a/debian/patches/series b/debian/patches/series
index af018f6..48bba52 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,4 @@
javacc-system.patch
fix-jar-matches.patch
disable-ivy.patch
-ignore-failing-tests.patch
+icu4.4-compat.patch
--
lucene-solr packaging
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
