[DRE-commits] [redmine] 11/39: debian/control: remove Conflicts: against packages that don't exist in jessie.

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository redmine.

commit 391a9ff0dbb162db8aa457b2c419dbea4894b3c4
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Sep 21 19:31:12 2015 -0300

    debian/control: remove Conflicts: against packages that don't exist in jessie.
---
 debian/changelog | 2 ++
 debian/control   | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9d6eadb..d3501f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ redmine (3.1.0-1) UNRELEASED; urgency=medium
     - 0003-Use-production-environment-by-default.patch
     - 0004-Add-multi-tenancy-support.patch
   * debian/copyright: updated wrt recent changes in the upstream tree
+  * debian/control: remove Conflicts: against packages that don't exist in
+    jessie.
 
  -- Antonio Terceiro <terceiro at debian.org>  Tue, 25 Aug 2015 17:33:17 -0300
 
diff --git a/debian/control b/debian/control
index 04cc7bb..8a46236 100644
--- a/debian/control
+++ b/debian/control
@@ -39,7 +39,6 @@ Depends: ruby | ruby-interpreter,
  ${misc:Depends}
 Breaks: redmine-plugin-botsfilter (<=1.02-2),
  redmine-plugin-recaptcha (<=0.1.0+git20121018)
-Conflicts: ruby-passenger (<< 3), ruby-activesupport-2.3, ruby-activesupport-3.2
 Recommends: ruby-passenger, libfcgi-ruby1.9.1 | libfcgi-ruby
 Suggests:
  bzr,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/redmine.git