CVS lucene/debian

[Barry Hawkins]

Update of /cvsroot/pkg-java/lucene/debian
In directory haydn:/tmp/cvs-serv23606/debian

Modified Files:
	README.Debian changelog control 
Log Message:
Resolved conflicts with RELEASE_1_4_3-5 merge

--- /cvsroot/pkg-java/lucene/debian/README.Debian	2005/03/23 18:55:55	1.3
+++ /cvsroot/pkg-java/lucene/debian/README.Debian	2005/05/28 16:55:22	1.4
@@ -1,15 +1,50 @@
 Lucene for Debian
 -----------------
 
-The Javadoc(TM) for Lucene can be found at /usr/share/doc/liblucene-java-doc/docs/index.html.
+The Javadoc(TM) for Lucene can be found at
 
-The Lucene demo applications are included in the liblucene-java package.  It includes the following files:
+ /usr/share/doc/liblucene-java-doc/docs/index.html
 
-	/var/lib/tomcat4/webapps/luceneweb.war
-	/usr/share/java/lucene-demos-x.x.jar
+The Lucene demo applications are included in the liblucene-java
+package.  It includes the following files:
 
-The demonstration applications require additional configuration to be used.  To configure the demonstration command-line applications for Lucene, see the documentation at /usr/share/doc/liblucene-java-doc/docs/demo.html.  A walkthrough of the source code for the demo is also provided at /usr/share/doc/liblucene-java-doc/docs/demo2.html.
+ /var/lib/tomcat4/webapps/luceneweb.war
+ /usr/share/java/lucene-demos-x.x.jar
 
-See /usr/share/doc/liblucene-java-doc/docs/demo3.html for information on configuring the Lucene web application to be run in a Java(TM) web container such as Tomcat.  A source code walkthrough for this application can be found at /usr/share/doc/liblucene-java-doc/docs/demo4.html
+The demonstration applications require additional configuration to be
+used. To configure and run the demonstration command-line applications
+for Lucene, see the following documentation and source code walkthrough:
 
- -- Barry Hawkins <barry@alltc.com>, Tue, 22 Mar 2005 14:20:38 -0500
+ /usr/share/doc/liblucene-java-doc/docs/demo.html
+ /usr/share/doc/liblucene-java-doc/docs/demo2.html
+
+For information on configuring the Lucene web application to be run in
+a Java(TM) web container such as Tomcat, see the following
+documentation and source code walkthrough:
+
+ /usr/share/doc/liblucene-java-doc/docs/demo3.html
+ /usr/share/doc/liblucene-java-doc/docs/demo4.html
+
+Several modifications are required if you wish to run the Lucene web
+application on a stock Debian tomcat4 configuration. Note that Debian's
+default Tomcat configuration may have changed since these instructions
+were written.
+
+1) The Lucene web application looks for Lucene index data in
+   /opt/lucene/index, although we may change this location in a 
+   future version of the Debian package. 
+
+2) You will need to add the following permissions to the
+   grant {...} section of /etc/tomcat4/policy.d/04webapps.policy.
+   Debian's default tomcat configuration
+
+// Allows luceneweb demo to work
+permission java.util.PropertyPermission "disableLuceneLocks", "read";
+permission java.util.PropertyPermission "java.io.tmpdir", "read";
+permission java.util.PropertyPermission "org.apache.lucene.*", "read";
+permission java.io.FilePermission "/opt/lucene/index", "read";
+permission java.io.FilePermission "/opt/lucene/index/*", "read";
+permission java.io.FilePermission "/var/lib/tomcat4/temp", "read,write,delete";
+permission java.io.FilePermission "/var/lib/tomcat4/temp/*", "read,write,delete";
+
+ -- Barry Hawkins <barryh@bytemason.org>, Sat May 28 12:52:51 2005
--- /cvsroot/pkg-java/lucene/debian/changelog	2005/03/23 18:55:55	1.4
+++ /cvsroot/pkg-java/lucene/debian/changelog	2005/05/28 16:55:22	1.5
@@ -1,3 +1,9 @@
+lucene (1.4.3-5) unstable; urgency=low
+
+  * update documentation
+
+ -- Jeff Breidenbach <jab@debian.org>  Wed, 20 Apr 2005 17:28:39 -0700
+
 lucene (1.4.3-4) unstable; urgency=low
 
   * Resolved error with file unpacking by implementing Replaces 
--- /cvsroot/pkg-java/lucene/debian/control	2005/03/23 18:55:55	1.4
+++ /cvsroot/pkg-java/lucene/debian/control	2005/05/28 16:55:22	1.5
@@ -10,7 +10,7 @@
 Architecture: all
 Depends: sun-j2sdk1.4 | blackdown-j2sdk1.4 | ibm-j2sdk1.4 | sun-j2re1.4 | blackdown-j2re1.4 | ibm-j2re1.4 | j2sdk1.3 | j2sdk1.4 | j2re1.3 | j2re1.4 | java2-runtime | java1-runtime
 Replaces: liblucene-java-doc (<= 1.4.3-2)
-Suggests: liblucene-java-doc (>= ${Source-Version})
+Suggests: liblucene-java-doc (>= ${Source-Version}), tomcat4
 Description: full-text search engine library for Java(TM) and demonstration programs
  Lucene is a full-text search engine for the Java(TM) programming language.  
  Lucene is not a complete application, but rather a code library and API