[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 264d1b3c1e70cd09c8eedbee9137e7a5fd3a609c
Author: James Page <james.page at ubuntu.com>
Date:   Mon May 28 15:02:42 2012 +0100

    Enabled dataimporthandler contrib for solr

diff --git a/debian/TODO.Debian b/debian/TODO.Debian
index 4f29c52..e36d7dc 100644
--- a/debian/TODO.Debian
+++ b/debian/TODO.Debian
@@ -6,3 +6,4 @@ TODO
 * Use JavaCC to regenerating Java files included in upstream tarball
 * Use JFlex to generate Java files included in upstream tarball (needs 1.5 - not
   yet released)
+* Javadoc package for solr.
diff --git a/debian/control b/debian/control
index 7664a9d..69bfd88 100644
--- a/debian/control
+++ b/debian/control
@@ -122,7 +122,8 @@ Suggests:
  libeasymock-java,
  libjetty-extras-java,
  libjetty-java,
- libsolr-java-doc
+ libsolr-java-doc,
+ libmysql-java
 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,
diff --git a/debian/liblucene3-java.poms.in b/debian/liblucene3-java.poms.in
index 1caf051..8bee2d7 100644
--- a/debian/liblucene3-java.poms.in
+++ b/debian/liblucene3-java.poms.in
@@ -28,7 +28,7 @@ solr/contrib/pom.xml --ignore
 solr/contrib/clustering/pom.xml --ignore
 solr/contrib/analysis-extras/pom.xml --ignore
 solr/contrib/langid/pom.xml --ignore
-solr/contrib/dataimporthandler/pom.xml --ignore
+solr/contrib/dataimporthandler/pom.xml --artifact=solr/build/contrib/solr-dataimporthandler/apache-solr-dataimporthandler-__VERSION__.jar --package=libsolr-java --java-lib --usj-name=solr-dataimporthandler
 solr/contrib/extraction/pom.xml --ignore
 solr/contrib/dataimporthandler-extras/pom.xml --ignore
 solr/contrib/velocity/pom.xml --ignore
diff --git a/debian/rules b/debian/rules
index bf491ff..d364166 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,6 +43,8 @@ override_dh_auto_build:
 	ant -buildfile build.xml -Dversion=$(DEB_UPSTREAM_VERSION) get-maven-poms
 	ant -buildfile lucene/build.xml -propertyfile debian/ant.properties \
 		-Dversion=$(DEB_UPSTREAM_VERSION) jar-core docs javadocs build-contrib
+	ant -buildfile solr/contrib/dataimporthandler/build.xml \
+		-propertyfile debian/ant.properties -Dversion=$(DEB_UPSTREAM_VERSION) dist
 	ant -buildfile solr/build.xml -propertyfile debian/ant.properties \
 		-Dversion=$(DEB_UPSTREAM_VERSION) dist-war
 
diff --git a/debian/solr-common.links b/debian/solr-common.links
index 4277271..b1a733c 100644
--- a/debian/solr-common.links
+++ b/debian/solr-common.links
@@ -4,6 +4,7 @@
 /var/log/solr                               /usr/share/solr/logs
 /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
 /usr/share/java/commons-codec.jar           /usr/share/solr/WEB-INF/lib/commons-codec.jar
 /usr/share/java/commons-fileupload.jar      /usr/share/solr/WEB-INF/lib/commons-fileupload.jar
 /usr/share/java/commons-httpclient.jar      /usr/share/solr/WEB-INF/lib/commons-httpclient.jar

-- 
lucene-solr packaging