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

[James Page]

The following commit has been merged in the master branch:
commit 513c3fda50957d180758a671161a4103a4d56258
Author: James Page <james.page at ubuntu.com>
Date:   Thu May 24 12:24:39 2012 +0100

    Use default-jre-headless as primary runtime dependency for solr-common.

diff --git a/debian/changelog b/debian/changelog
index 3f2e4c4..b78535d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,6 @@ solr (1.4.1+dfsg1-3) UNRELEASED; urgency=low
   * Bumped Standards-Version to 3.9.3:
     - d/copyright: Referenced released version of DEP-5 and tidied up 
       obsolete field names.
-  * Added commons-logging.jar to WEB-INF/lib (Closes: #587512).
-  * Added http[client,core,mime].jar to WEB-INF/lib (Closes: #587510).
   * Install utility scripts to correct location under ${solr.home}
     (Closes: #538229), create symlink for backwards compatibility.
   * Link /var/log/solr to ${solr.home}/logs.
@@ -20,8 +18,9 @@ solr (1.4.1+dfsg1-3) UNRELEASED; urgency=low
   * Drop dependency on glassfish-mail, no longer required (Closes: #575208).
   * Pickup maintenance of this package until solr3/lucene3 supercedes it.
     (Closes: #652729).
+  * Use default-jre-headless as primary runtime dependency for solr-common.
 
- -- James Page <james.page at ubuntu.com>  Wed, 23 May 2012 16:52:15 +0100
+ -- James Page <james.page at ubuntu.com>  Thu, 24 May 2012 12:24:08 +0100
 
 solr (1.4.1+dfsg1-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 34d0d91..110b892 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,6 @@ Build-Depends:
  libcommons-fileupload-java (>= 1.2.1),
  libcommons-httpclient-java (>= 3.1),
  libcommons-io-java (>= 1.4),
- libcommons-logging-java,
  libjaxp1.3-java (>= 1.3.04),
  libjetty-java (>= 6.1.21),
  libjmock-java,
@@ -39,16 +38,13 @@ Depends:
  libcommons-fileupload-java (>= 1.2.1),
  libcommons-httpclient-java (>= 3.1),
  libcommons-io-java (>= 1.4),
- libcommons-logging-java,
- libhttpclient-java,
- libhttpmime-java,
  libjaxp1.3-java (>= 1.3.05-1),
  libjetty-java (>= 6.1.21),
  liblucene2-java (>= 2.9.1),
  libservlet2.5-java (>= 6.0.20),
  libslf4j-java (>= 1.5.10),
  libxml-commons-external-java (>= 1.3.04),
- openjdk-6-jre-headless | java5-runtime-headless | java6-runtime-headless,
+ default-jre-headless | java5-runtime-headless | java6-runtime-headless,
  ${misc:Depends}
 Recommends:
  solr-tomcat (>= ${binary:Version}) | solr-jetty (>= ${binary:Version})

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