[pkg-java] r6227 - in trunk/solr/debian: . patches

Tue Apr 22 15:12:53 UTC 2008

Author: janpascal-guest
Date: 2008-04-22 15:12:51 +0000 (Tue, 22 Apr 2008)
New Revision: 6227

Added:
   trunk/solr/debian/patches/07_fix-for-lucene-2.3.dpatch
Modified:
   trunk/solr/debian/changelog
   trunk/solr/debian/control
   trunk/solr/debian/patches/00list
   trunk/solr/debian/rules
Log:
Removed solr-jetty; update to Lucene 2.3



Modified: trunk/solr/debian/changelog
===================================================================

--- trunk/solr/debian/changelog	2008-04-21 20:09:48 UTC (rev 6226)
+++ trunk/solr/debian/changelog	2008-04-22 15:12:51 UTC (rev 6227)
@@ -1,8 +1,11 @@
-solr (1.2.0+ds1-3~pre1) UNRELEASED; urgency=low
+solr (1.2.0+ds1-3) unstable; urgency=low
 
   * Updated control file for new Vcs-* and Homepage fields
+  * Removed solr-jetty binary package since the jetty package 
+    has been removed from Lenny
+  * Update to Lucene 2.3
 
- -- Jan-Pascal van Best <janpascal at vanbest.org>  Wed, 28 Nov 2007 21:17:22 +0100
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Tue, 22 Apr 2008 17:08:50 +0200
 
 solr (1.2.0+ds1-2) unstable; urgency=low
 

Modified: trunk/solr/debian/control
===================================================================
--- trunk/solr/debian/control	2008-04-21 20:09:48 UTC (rev 6226)
+++ trunk/solr/debian/control	2008-04-22 15:12:51 UTC (rev 6227)
@@ -14,9 +14,9 @@
  libcommons-fileupload-java (>= 1.2),
  libcommons-io-java (>= 1.3.1),
  libservlet2.4-java (>= 5.0.30),
- liblucene2-java (>= 2.2),
+ liblucene2-java (>= 2.3),
  libxpp3-java (>= 1.1.3.4.0)
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 
 Package: solr-common
 Architecture: all
@@ -27,7 +27,7 @@
  libcommons-fileupload-java (>= 1.2),
  libcommons-io-java (>= 1.3.1),
  libservlet2.4-java (>= 5.0.30),
- liblucene2-java (>= 2.2),
+ liblucene2-java (>= 2.3),
  libxpp3-java (>= 1.1.3.4.0)
 Recommends: solr-tomcat5.5 (>= ${binary:Version}) | solr-jetty (>= ${binary:Version})
 Homepage: http://lucene.apache.org/solr/
@@ -53,15 +53,15 @@
  .
  This package provides the Tomcat integration files for Solr. 
 
-Package: solr-jetty
-Architecture: all
-Depends: solr-common (>= ${binary:Version}), jetty (>= 5.1)
-Conflicts: solr-tomcat5.5
-Homepage: http://lucene.apache.org/solr/
-Description: enterprise search server based on Lucene - Jetty integration
- Solr is an open source enterprise search server based on the Lucene 
- Java search library, with XML/HTTP and JSON APIs, hit highlighting, 
- faceted search, caching, replication, and a web administration 
- interface. It runs in a Java servlet container such as Tomcat.
- .
- This package provides the Jetty integration files for Solr. 
+#Package: solr-jetty
+#Architecture: all
+#Depends: solr-common (>= ${binary:Version}), jetty (>= 5.1)
+#Conflicts: solr-tomcat5.5
+#Homepage: http://lucene.apache.org/solr/
+#Description: enterprise search server based on Lucene - Jetty integration
+# Solr is an open source enterprise search server based on the Lucene 
+# Java search library, with XML/HTTP and JSON APIs, hit highlighting, 
+# faceted search, caching, replication, and a web administration 
+# interface. It runs in a Java servlet container such as Tomcat.
+# .
+# This package provides the Jetty integration files for Solr. 

Modified: trunk/solr/debian/patches/00list
===================================================================
--- trunk/solr/debian/patches/00list	2008-04-21 20:09:48 UTC (rev 6226)
+++ trunk/solr/debian/patches/00list	2008-04-22 15:12:51 UTC (rev 6227)
@@ -3,3 +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

Added: trunk/solr/debian/patches/07_fix-for-lucene-2.3.dpatch
===================================================================
--- trunk/solr/debian/patches/07_fix-for-lucene-2.3.dpatch	                        (rev 0)
+++ trunk/solr/debian/patches/07_fix-for-lucene-2.3.dpatch	2008-04-22 15:12:51 UTC (rev 6227)
@@ -0,0 +1,24 @@
+#! /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) {


Property changes on: trunk/solr/debian/patches/07_fix-for-lucene-2.3.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/solr/debian/rules
===================================================================
--- trunk/solr/debian/rules	2008-04-21 20:09:48 UTC (rev 6226)
+++ trunk/solr/debian/rules	2008-04-22 15:12:51 UTC (rev 6227)
@@ -63,9 +63,9 @@
 	install --mode 0644 debian/solr-tomcat5.5.xml $(TOMCAT_INSTDIR)/etc/solr/
 	install --mode 0644 debian/tomcat.policy $(TOMCAT_INSTDIR)/etc/solr/tomcat.policy
 
-install/solr-jetty::
-	# Configure Jetty
-	install --mode 0644 debian/jetty-web.xml $(JETTY_INSTDIR)/usr/share/solr/WEB-INF/
+#install/solr-jetty::
+#	# Configure Jetty
+#	install --mode 0644 debian/jetty-web.xml $(JETTY_INSTDIR)/usr/share/solr/WEB-INF/
 
 remove-source:
 	rm -f build.xml
@@ -91,7 +91,8 @@
 	zgrep "^---" ../solr_$(DEB_VERSION).diff.gz | grep -v debian ; [ $$? != 0 ]
 	( dpkg --contents ../solr-common_$(DEB_VERSION)_all.deb ; \
 	  dpkg --contents ../solr-tomcat5.5_$(DEB_VERSION)_all.deb ; \
-	  dpkg --contents ../solr-jetty_$(DEB_VERSION)_all.deb ) | less
+	) | less
+	  #dpkg --contents ../solr-jetty_$(DEB_VERSION)_all.deb ; \
 
 upload:
 	dupload -t mentors $(CHANGESFILE)


