[DRE-commits] [redmine] 01/08: trying to fix upgrades from wheezy

[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 423785d3afa07edec201f4dcd667ccb3ddc697f1
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Sep 14 16:05:58 2014 -0300

    trying to fix upgrades from wheezy
---
 debian/changelog | 11 ++++++++---
 debian/control   |  4 ++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 90c6256..6058129 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,13 +4,18 @@ redmine (3.0~20140825-1) UNRELEASED; urgency=medium
     .
     New dependencies:
       + bundler
+      + ruby-actionpack-action-caching
+      + ruby-jquery-rails,
       + ruby-mime-types
-      + ruby-request-store
       + ruby-protected-attributes
-      + ruby-actionpack-action-caching
       + ruby-redcarpet
+      + ruby-request-store
       + ruby-rmagick
-  * Changes dependency from ruby-railties-3.2 to ruby-railties
+    Changed dependencies:
+      + ruby-railties-3.2 → ruby-rails (>= 2:4)
+    Add Conflicts:
+      + ruby-activesupport-2.3, ruby-activesupport-3.2 to ease apt into
+        upgrading from wheezy
   * Drop debian/patches/2019_unplug_bundler.patch: bundler is too much
     intricated into Rails nowadays for us to be able to run without it.
   * debian/rules: stop messing with the Gemfile
diff --git a/debian/control b/debian/control
index d269540..e6b2dfc 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Depends: ruby | ruby-interpreter,
  ruby-rails-observers,
  dbconfig-common,
  redmine-sqlite | redmine-mysql | redmine-pgsql,
- ruby-rack (>= 1.4.5~) | ruby-rack1.4,
+ ruby-rack (>= 1.4.5~),
  ruby-coderay (>= 1.0.6),
  ruby-mime-types (>= 1.25),
  ruby-net-ldap (>= 0.3.1),
@@ -39,7 +39,7 @@ Depends: ruby | ruby-interpreter,
  ${misc:Depends}
 Breaks: redmine-plugin-botsfilter (<=1.02-2),
  redmine-plugin-recaptcha (<=0.1.0+git20121018)
-Conflicts: ruby-passenger (<< 3)
+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