[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 b095abe8bbb786bf9580bc0b0e00b2b92327b3a6
Author: James Page <james.page at ubuntu.com>
Date:   Wed Nov 21 09:31:18 2012 +0000

    Resync with Ubuntu

diff --git a/debian/changelog b/debian/changelog
index 4b04d27..2c428da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,11 @@
-lucene-solr (3.6.1+dfsg-0ubuntu2) quantal; urgency=low
+lucene-solr (3.6.1+dfsg-1) experimental; 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>  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
+ -- James Page <james.page at ubuntu.com>  Wed, 21 Nov 2012 09:31:05 +0000
 
 lucene-solr (3.6.0+dfsg-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 5fec703..756b85c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,7 @@
 Source: lucene-solr
 Section: java
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+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

-- 
lucene-solr packaging