[SCM] lucene-solr packaging branch, master, updated. upstream/3.6.0-25-ga342d32

[James Page]

The following commit has been merged in the master branch:
commit 0f98cf7f33d8a3b7343045f43a829d2fd2551a6a
Author: James Page <james.page at ubuntu.com>
Date:   Mon May 28 17:49:52 2012 +0100

    Added scripts->bin compat link and fixed up svnversion to tell us a bit more about the package

diff --git a/debian/ant.properties b/debian/ant.properties
index 131af00..2d86fc8 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -1,3 +1,4 @@
 failonjavadocwarning=false
 javacc.home=/usr/share/java
 ivy.available=true
+svnversion=debian
diff --git a/debian/control b/debian/control
index 05a6157..d62d96a 100644
--- a/debian/control
+++ b/debian/control
@@ -135,6 +135,7 @@ Description: Enterprise search server based on Lucene - Java libraries
 Package: solr-common
 Architecture: all
 Depends:
+ curl,
  debconf (>= 1.5),
  default-jre-headless | java5-runtime-headless | java6-runtime-headless,
  libsolr-java (= ${binary:Version}),
diff --git a/debian/patches/set-data-dir.patch b/debian/patches/set-data-dir.patch
index db4ac11..bba76a8 100644
--- a/debian/patches/set-data-dir.patch
+++ b/debian/patches/set-data-dir.patch
@@ -5,8 +5,8 @@ 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
+--- lucene-solr.orig/solr/example/solr/conf/solrconfig.xml	2012-05-28 15:12:31.000000000 +0100
++++ lucene-solr/solr/example/solr/conf/solrconfig.xml	2012-05-28 16:14:42.511797524 +0100
 @@ -111,7 +111,7 @@
         replication is in use, this should match the replication
         configuration.
@@ -16,3 +16,19 @@ Index: lucene-solr/solr/example/solr/conf/solrconfig.xml
  
  
    <!-- The DirectoryFactory to use for indexes.
+Index: lucene-solr/solr/example/solr/conf/scripts.conf
+===================================================================
+--- lucene-solr.orig/solr/example/solr/conf/scripts.conf	2012-05-23 09:39:26.201829183 +0100
++++ lucene-solr/solr/example/solr/conf/scripts.conf	2012-05-28 16:15:09.332018446 +0100
+@@ -15,9 +15,9 @@
+ 
+ user=
+ solr_hostname=localhost
+-solr_port=8983
++solr_port=8080
+ rsyncd_port=18983
+-data_dir=
++data_dir=/var/lib/solr/data
+ webapp_name=solr
+ master_host=
+ master_data_dir=
diff --git a/debian/solr-common.links b/debian/solr-common.links
index b1a733c..e110329 100644
--- a/debian/solr-common.links
+++ b/debian/solr-common.links
@@ -2,6 +2,7 @@
 /etc/solr/conf                              /usr/share/solr/conf
 /var/lib/solr/data                          /usr/share/solr/data
 /var/log/solr                               /usr/share/solr/logs
+/usr/share/solr/bin                         /usr/share/solr/scripts
 /usr/share/java/solr-core.jar               /usr/share/solr/WEB-INF/lib/solr-core.jar
 /usr/share/java/solr-solrj.jar              /usr/share/solr/WEB-INF/lib/solr-solrj.jar
 /usr/share/java/solr-dataimporthandler.jar  /usr/share/solr/WEB-INF/lib/solr-dataimporthandler.jar

-- 
lucene-solr packaging