[lucene-solr] 01/01: solr-tomcat: allow tomcat7-user as depends (Closes: #606138)

[Victor Seva Lopez]

This is an automated email from the git hooks/post-receive script.

maniac-guest pushed a commit to branch master
in repository lucene-solr.

commit 4fda9e7ea57e2862e814a96e9e15918c175ff0de
Author: Victor Seva <vseva at sipwise.com>
Date:   Mon Feb 16 16:54:55 2015 +0100

    solr-tomcat: allow tomcat7-user as depends (Closes: #606138)
---
 debian/changelog | 4 ++++
 debian/control   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 15d5941..8f2431f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 lucene-solr (3.6.2+dfsg-6) UNRELEASED; urgency=medium
 
+  [ Emmanuel Bourg ]
   * Team upload.
   * Use XZ compression for the upstream tarball
   * debian/watch: No longer use the defunct githubredir.debian.net redirector
 
+  [ Victor Seva ]
+  * solr-tomcat: allow tomcat7-user as depends (Closes: #606138)
+
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 13 Nov 2014 11:52:20 +0100
 
 lucene-solr (3.6.2+dfsg-5) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 3e6f35d..53c0d15 100644
--- a/debian/control
+++ b/debian/control
@@ -162,7 +162,7 @@ Description: Enterprise search server based on Lucene3 - common files
 
 Package: solr-tomcat
 Architecture: all
-Depends: solr-common (= ${binary:Version}), tomcat7, ${misc:Depends}
+Depends: solr-common (= ${binary:Version}), tomcat7 | tomcat7-user, ${misc:Depends}
 Conflicts: solr-jetty, solr-tomcat6
 Description: Enterprise search server based on Lucene3 - Tomcat integration
  Solr is an open source enterprise search server based on the Lucene

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lucene-solr.git