[pkg-java] r7896 - in branches/solr/1.2.0+ds2/debian: . patches

janpascal-guest at alioth.debian.org janpascal-guest at alioth.debian.org
Wed Jan 28 14:18:41 UTC 2009 

Author: janpascal-guest
Date: 2009-01-28 14:18:41 +0000 (Wed, 28 Jan 2009)
New Revision: 7896

Added:
   branches/solr/1.2.0+ds2/debian/patches/07_fix-for-lucene-2.4.dpatch
Removed:
   branches/solr/1.2.0+ds2/debian/patches/07_fix-for-lucene-2.3.dpatch
Modified:
   branches/solr/1.2.0+ds2/debian/changelog
   branches/solr/1.2.0+ds2/debian/control
   branches/solr/1.2.0+ds2/debian/patches/00list
Log:
Update for Lucene 2.4 (version now in unstable)

Modified: branches/solr/1.2.0+ds2/debian/changelog
===================================================================
--- branches/solr/1.2.0+ds2/debian/changelog	2009-01-28 14:01:46 UTC (rev 7895)
+++ branches/solr/1.2.0+ds2/debian/changelog	2009-01-28 14:18:41 UTC (rev 7896)
@@ -1,8 +1,9 @@
 solr (1.2.0+ds2-3) unstable; urgency=low
 
   * Update Galician translations in gl.po (closes: 513148).
+  * Update to compile with Lucene 2.4.
 
- -- Jan-Pascal van Best <janpascal at vanbest.org>  Tue, 27 Jan 2009 11:10:19 +0100
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Wed, 28 Jan 2009 13:30:55 +0100
 
 solr (1.2.0+ds2-2) unstable; urgency=low
 

Modified: branches/solr/1.2.0+ds2/debian/control
===================================================================
--- branches/solr/1.2.0+ds2/debian/control	2009-01-28 14:01:46 UTC (rev 7895)
+++ branches/solr/1.2.0+ds2/debian/control	2009-01-28 14:18:41 UTC (rev 7896)
@@ -16,7 +16,7 @@
  libcommons-fileupload-java (>= 1.2),
  libcommons-io-java (>= 1.3.1),
  libservlet2.4-java (>= 5.0.30),
- liblucene2-java (>= 2.3.2), liblucene2-java (<< 2.4.0),
+ liblucene2-java (>= 2.4.0),
  libxpp3-java (>= 1.1.3.4.0)
 Standards-Version: 3.8.0
 
@@ -29,7 +29,7 @@
  libcommons-fileupload-java (>= 1.2),
  libcommons-io-java (>= 1.3.1),
  libservlet2.4-java (>= 5.0.30),
- liblucene2-java (>= 2.3), liblucene2-java (<< 2.4.0),
+ liblucene2-java (>= 2.4)
  libxpp3-java (>= 1.1.3.4.0)
 Recommends: solr-tomcat5.5 (>= ${binary:Version}) | solr-jetty (>= ${binary:Version})
 Description: enterprise search server based on Lucene - common files

Modified: branches/solr/1.2.0+ds2/debian/patches/00list
===================================================================
--- branches/solr/1.2.0+ds2/debian/patches/00list	2009-01-28 14:01:46 UTC (rev 7895)
+++ branches/solr/1.2.0+ds2/debian/patches/00list	2009-01-28 14:18:41 UTC (rev 7896)
@@ -3,4 +3,4 @@
 03_relocate-datadir.dpatch
 04_fix-lucene-lock-directory.dpatch
 05_use-debian-java-libraries.dpatch
-07_fix-for-lucene-2.3.dpatch
+07_fix-for-lucene-2.4.dpatch

Deleted: branches/solr/1.2.0+ds2/debian/patches/07_fix-for-lucene-2.3.dpatch
===================================================================
--- branches/solr/1.2.0+ds2/debian/patches/07_fix-for-lucene-2.3.dpatch	2009-01-28 14:01:46 UTC (rev 7895)
+++ branches/solr/1.2.0+ds2/debian/patches/07_fix-for-lucene-2.3.dpatch	2009-01-28 14:18:41 UTC (rev 7896)
@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 07_fix-for-lucene-2.3.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix for update to Lucene 2.3 (upstream SVN rev. 614789).
-
- at DPATCH@
-diff -urNad solr~/src/java/org/apache/solr/analysis/StopFilterFactory.java solr/src/java/org/apache/solr/analysis/StopFilterFactory.java
---- solr~/src/java/org/apache/solr/analysis/StopFilterFactory.java	2008-04-22 16:47:42.000000000 +0200
-+++ solr/src/java/org/apache/solr/analysis/StopFilterFactory.java	2008-04-22 16:49:19.000000000 +0200
-@@ -44,10 +44,12 @@
-       } catch (IOException e) {
-         throw new RuntimeException(e);
-       }
-+    } else {
-+      stopWords = StopFilter.makeStopSet(StopAnalyzer.ENGLISH_STOP_WORDS, ignoreCase);
-     }
-   }
- 
--  private Set stopWords = StopFilter.makeStopSet(StopAnalyzer.ENGLISH_STOP_WORDS);
-+  private Set stopWords;
-   private boolean ignoreCase;
- 
-   public TokenStream create(TokenStream input) {

Copied: branches/solr/1.2.0+ds2/debian/patches/07_fix-for-lucene-2.4.dpatch (from rev 7133, branches/solr/1.2.0+ds2/debian/patches/07_fix-for-lucene-2.3.dpatch)
===================================================================
--- branches/solr/1.2.0+ds2/debian/patches/07_fix-for-lucene-2.4.dpatch	                        (rev 0)
+++ branches/solr/1.2.0+ds2/debian/patches/07_fix-for-lucene-2.4.dpatch	2009-01-28 14:18:41 UTC (rev 7896)
@@ -0,0 +1,42 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07_fix-for-lucene-2.3.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix for update to Lucene 2.3 (upstream SVN rev. 614789).
+
+ at DPATCH@
+diff -urNad 1.2.0+ds2~/src/java/org/apache/solr/analysis/EnglishPorterFilterFactory.java 1.2.0+ds2/src/java/org/apache/solr/analysis/EnglishPorterFilterFactory.java
+--- 1.2.0+ds2~/src/java/org/apache/solr/analysis/EnglishPorterFilterFactory.java	2007-05-30 17:51:11.000000000 +0200
++++ 1.2.0+ds2/src/java/org/apache/solr/analysis/EnglishPorterFilterFactory.java	2009-01-28 13:26:02.000000000 +0100
+@@ -59,12 +59,12 @@
+  */
+ class EnglishPorterFilter extends TokenFilter {
+   private final Set protWords;
+-  private net.sf.snowball.ext.EnglishStemmer stemmer;
++  private org.tartarus.snowball.ext.EnglishStemmer stemmer;
+ 
+   public EnglishPorterFilter(TokenStream source, Set protWords) {
+     super(source);
+     this.protWords=protWords;
+-    stemmer = new net.sf.snowball.ext.EnglishStemmer();
++    stemmer = new org.tartarus.snowball.ext.EnglishStemmer();
+   }
+ 
+ 
+diff -urNad 1.2.0+ds2~/src/java/org/apache/solr/analysis/StopFilterFactory.java 1.2.0+ds2/src/java/org/apache/solr/analysis/StopFilterFactory.java
+--- 1.2.0+ds2~/src/java/org/apache/solr/analysis/StopFilterFactory.java	2009-01-28 13:24:37.000000000 +0100
++++ 1.2.0+ds2/src/java/org/apache/solr/analysis/StopFilterFactory.java	2009-01-28 13:24:38.000000000 +0100
+@@ -44,10 +44,12 @@
+       } catch (IOException e) {
+         throw new RuntimeException(e);
+       }
++    } else {
++      stopWords = StopFilter.makeStopSet(StopAnalyzer.ENGLISH_STOP_WORDS, ignoreCase);
+     }
+   }
+ 
+-  private Set stopWords = StopFilter.makeStopSet(StopAnalyzer.ENGLISH_STOP_WORDS);
++  private Set stopWords;
+   private boolean ignoreCase;
+ 
+   public TokenStream create(TokenStream input) {


Property changes on: branches/solr/1.2.0+ds2/debian/patches/07_fix-for-lucene-2.4.dpatch
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mergeinfo
   +

More information about the pkg-java-commits mailing list