[SCM] lucene-solr packaging branch, master, updated. debian/3.6.0+dfsg-1-5-gb095abe

[James Page]

The following commit has been merged in the master branch:
commit c0511f2f743a535e6ef72ebb1a7a7bb710217c59
Author: James Page <james.page at ubuntu.com>
Date:   Thu Sep 6 11:07:52 2012 +0100

    Imported Debian patch 3.6.1+dfsg-0ubuntu2

diff --git a/debian/changelog b/debian/changelog
index 47c0297..4b04d27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,16 @@
-lucene-solr (3.6.1+dfsg-1) UNRELEASED; urgency=low
+lucene-solr (3.6.1+dfsg-0ubuntu2) quantal; urgency=low
 
-  * New upstream release 
+  * Add dependency on JDK for solr-jetty (LP: #1046732):
+    - d/control: Add extra Depends on default-jdk | java5-jdk as jetty
+      requires a full JDK to support use of JSP's which solr uses. 
 
- -- James Page <james.page at ubuntu.com>  Tue, 24 Jul 2012 11:42:18 +0100
+ -- James Page <james.page at ubuntu.com>  Thu, 06 Sep 2012 11:07:52 +0100
+
+lucene-solr (3.6.1+dfsg-0ubuntu1) quantal; urgency=low
+
+  * New upstream release.
+
+ -- James Page <james.page at ubuntu.com>  Mon, 23 Jul 2012 16:37:53 +0100
 
 lucene-solr (3.6.0+dfsg-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 95a59a6..5fec703 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: lucene-solr
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Mat Scales <mat at wibbly.org.uk>, James Page <james.page at ubuntu.com>
 Homepage: http://lucene.apache.org
 Standards-Version: 3.9.3
@@ -178,6 +179,7 @@ Depends:
  jetty (>= 6.1.22),
  libjetty-extra-java (>= 6.1.22),
  solr-common (= ${binary:Version}),
+ default-jdk | java5-sdk,
  ${misc:Depends}
 Conflicts: solr-tomcat, solr-tomcat6
 Description: Enterprise search server based on Lucene3 - Jetty integration

-- 
lucene-solr packaging