[SCM] lucene-solr packaging branch, master, updated. upstream/3.6.0-16-ge08b4b5

[James Page]

The following commit has been merged in the master branch:
commit e08b4b5ff8c065bb423bf6c4a975edcd2d99f2cb
Author: James Page <james.page at ubuntu.com>
Date:   Mon May 28 15:13:35 2012 +0100

    Tweaks to dataimporthandler configuration

diff --git a/debian/control b/debian/control
index 69bfd88..05a6157 100644
--- a/debian/control
+++ b/debian/control
@@ -122,8 +122,7 @@ Suggests:
  libeasymock-java,
  libjetty-extras-java,
  libjetty-java,
- libsolr-java-doc,
- libmysql-java
+ libsolr-java-doc
 Description: Enterprise search server based on Lucene - Java libraries
  Solr is an open source enterprise search server based on the Lucene
  Java search library, with XML/HTTP and JSON APIs, hit highlighting,
@@ -142,6 +141,7 @@ Depends:
  procps,
  ${misc:Depends}
 Recommends: solr-tomcat (= ${binary:Version}) | solr-jetty (= ${binary:Version})
+Suggests: libmysql-java
 Description: Enterprise search server based on Lucene3 - common files
  Solr is an open source enterprise search server based on the Lucene
  Java search library, with XML/HTTP and JSON APIs, hit highlighting,
@@ -150,6 +150,12 @@ Description: Enterprise search server based on Lucene3 - common files
  .
  This package provides the common files for Solr. Install
  solr-tomcat or solr-jetty to use Solr under Tomcat or Jetty.
+ .
+ This package also contains the dataimporthandler contrib while omiting
+ dataimporthandler-extras, clustering, extraction and velocity due to missing
+ dependencies.
+ .
+ libmysql-java is necessary to connect the dataimporthandler to MySQL.
 
 Package: solr-tomcat
 Architecture: all
diff --git a/debian/patches/series b/debian/patches/series
index b7da83c..2df28c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ fix-jar-matches.patch
 disable-ivy.patch
 icu4.4-compat.patch
 regex-test-failure.patch
+set-data-dir.patch
diff --git a/debian/patches/set-data-dir.patch b/debian/patches/set-data-dir.patch
new file mode 100644
index 0000000..db4ac11
--- /dev/null
+++ b/debian/patches/set-data-dir.patch
@@ -0,0 +1,18 @@
+Description: In the example configuration that is distributed
+ as part of this package fix the data.dir to /var/lib/solr/data
+Author: James Page <james.page at ubuntu.com>
+Forwarded: not-needed
+
+Index: lucene-solr/solr/example/solr/conf/solrconfig.xml
+===================================================================
+--- lucene-solr.orig/solr/example/solr/conf/solrconfig.xml	2012-05-23 09:39:26.201829183 +0100
++++ lucene-solr/solr/example/solr/conf/solrconfig.xml	2012-05-28 15:11:10.884645851 +0100
+@@ -111,7 +111,7 @@
+        replication is in use, this should match the replication
+        configuration.
+     -->
+-  <dataDir>${solr.data.dir:}</dataDir>
++  <dataDir>/var/lib/solr/data</dataDir>
+ 
+ 
+   <!-- The DirectoryFactory to use for indexes.
diff --git a/debian/solr-common.links b/debian/solr-common.links
index b1a733c..f3e665c 100644
--- a/debian/solr-common.links
+++ b/debian/solr-common.links
@@ -33,3 +33,4 @@
 /usr/share/java/slf4j-jdk14.jar             /usr/share/solr/WEB-INF/lib/slf4j-jdk14.jar
 /usr/share/java/wstx-lgpl.jar               /usr/share/solr/WEB-INF/lib/wstx-lgpl.jar
 /usr/share/java/stax2-api.jar               /usr/share/solr/WEB-INF/lib/stax2-api.jar
+/usr/share/java/mysql.jar                   /usr/share/solr/WEB-INF/lib/mysql.jar

-- 
lucene-solr packaging