[SCM] Solr - web service for full-text indexing and searching - Debian packaging branch, master, updated. debian/1.4.0+ds1-2-16-g26a4a21

[James Page]

The following commit has been merged in the master branch:
commit 26a4a217061b1ad641a1c8ac5995fec66723d9f3
Author: James Page <james.page at ubuntu.com>
Date:   Wed May 23 16:53:44 2012 +0100

    Re-instate stuff for dataimporthandler - it is built

diff --git a/debian/changelog b/debian/changelog
index 6576515..3f2e4c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,12 +18,10 @@ solr (1.4.1+dfsg1-3) UNRELEASED; urgency=low
   * Sync changes from Ubuntu and fix FTBFS with current versions of lucene
     (Closes: #593027).
   * Drop dependency on glassfish-mail, no longer required (Closes: #575208).
-  * Dropped Suggests: libmysql-java for solr-common and updated description
-    as this package does not ship dataimporthandler.
   * Pickup maintenance of this package until solr3/lucene3 supercedes it.
     (Closes: #652729).
 
- -- James Page <james.page at ubuntu.com>  Wed, 23 May 2012 16:45:04 +0100
+ -- James Page <james.page at ubuntu.com>  Wed, 23 May 2012 16:52:15 +0100
 
 solr (1.4.1+dfsg1-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index f647df8..34d0d91 100644
--- a/debian/control
+++ b/debian/control
@@ -52,6 +52,7 @@ Depends:
  ${misc:Depends}
 Recommends:
  solr-tomcat (>= ${binary:Version}) | solr-jetty (>= ${binary:Version})
+Suggests: libmysql-java
 Description: enterprise search server based on Lucene - 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,
@@ -60,6 +61,12 @@ Description: enterprise search server based on Lucene - 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

-- 
Solr - web service for full-text indexing and searching - Debian packaging