[pkg-java] r6979 - trunk/solr/debian

Mon Sep 8 13:24:09 UTC 2008

Author: janpascal-guest
Date: 2008-09-08 13:24:08 +0000 (Mon, 08 Sep 2008)
New Revision: 6979

Modified:
   trunk/solr/debian/README.Debian
   trunk/solr/debian/changelog
   trunk/solr/debian/control
   trunk/solr/debian/rules
Log:
Reinstated solr-jetty build

Modified: trunk/solr/debian/README.Debian
===================================================================

--- trunk/solr/debian/README.Debian	2008-09-08 08:27:12 UTC (rev 6978)
+++ trunk/solr/debian/README.Debian	2008-09-08 13:24:08 UTC (rev 6979)
@@ -2,12 +2,23 @@
 ---------------
 
 Solr is an enterprise search server based on the Lucene Java library. The
-Debian packaging of Solr consists of two binary packages:
+Debian packaging of Solr consists of three binary packages:
 - solr-common contains the Solr software itself and general configuration.
 - solr-tomcat5.5 installs Solr as a servlet in Tomcat 5.5. After installation,
   point your browser to http://localhost:8180/solr/admin
   to see the Solr web administration interface.
+- solr-jetty installs Solr as a servlet in Jetty. After installation,
+  point your browser to http://localhost:8280/solr/admin
+  to see the Solr web administration interface.
 
+Solr-tomcat5.5 and solr-jetty use the same index files. If you remove solr-tomcat5.5 
+and install solr-jetty, you keep the indexes. This implies that solr-tomcat5.5 and 
+solr-jetty cannot be installed at the same time.
+
+Jetty is broken as of version 5.1.14-1: you need to add the line
+  $(tomcat.lib.home)/jasper-compiler-jdt.jar       ! available org.eclipse.jdt.core.JDTCompilerAdapter
+near the end of your /etc/jetty/start.config
+
 Homepage: http://lucene.apache.org/solr/
 
 Replication

Modified: trunk/solr/debian/changelog
===================================================================
--- trunk/solr/debian/changelog	2008-09-08 08:27:12 UTC (rev 6978)
+++ trunk/solr/debian/changelog	2008-09-08 13:24:08 UTC (rev 6979)
@@ -1,5 +1,13 @@
-solr (1.2.0+ds1-4) UNRELEASED; urgency=low
+solr (1.2.0+ds2-1) unstable; urgency=low
 
+  * New (fake) upstream version to work around a bug in dak.
+  * Reinstated solr-jetty since Jetty is back in Lenny. Added workaround
+    of bug #452586 in Jetty to debian/README.Debian.
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Mon, 08 Sep 2008 15:16:49 +0200
+
+solr (1.2.0+ds1-4) unstable; urgency=low
+
   * Build with OpenJDK, move to main
   * Update debian/copyright, refer to Apache 2.0 license in common-licenses
   * Bump Standards-Version to 3.8.0
@@ -11,7 +19,7 @@
     README.Debian
   * Added Swedish translation of debconf messages (closes: #483416).
 
- -- Jan-Pascal van Best <janpascal at vanbest.org>  Tue, 19 Aug 2008 17:53:18 +0200
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Wed, 20 Aug 2008 20:25:03 +0200
 
 solr (1.2.0+ds1-3) unstable; urgency=low
 

Modified: trunk/solr/debian/control
===================================================================
--- trunk/solr/debian/control	2008-09-08 08:27:12 UTC (rev 6978)
+++ trunk/solr/debian/control	2008-09-08 13:24:08 UTC (rev 6979)
@@ -52,14 +52,14 @@
  .
  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
-#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.14-1)
+Conflicts: solr-tomcat5.5
+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/rules
===================================================================
--- trunk/solr/debian/rules	2008-09-08 08:27:12 UTC (rev 6978)
+++ trunk/solr/debian/rules	2008-09-08 13:24:08 UTC (rev 6979)
@@ -72,9 +72,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
@@ -100,6 +100,7 @@
 	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
 	  #dpkg --contents ../solr-jetty_$(DEB_VERSION)_all.deb ; \
 


