[DRE-commits] [redmine] 03/04: Merge tag 'debian/2.3.3-3.1' into master-wheezy-backports

[Antonio Terceiro]

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

terceiro pushed a commit to branch master-wheezy-backports
in repository redmine.

commit 33f18f59cdd5dcff762dce7da5556521244a8971
Merge: 6c4cc3d 92ffe86
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Feb 4 17:54:23 2014 -0300

    Merge tag 'debian/2.3.3-3.1' into master-wheezy-backports
    
    Conflicts:
    	debian/changelog

 debian/changelog | 11 ++++++++++-
 debian/control   |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 66b973d,d697c2a..44b6fef
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,12 +1,23 @@@
- redmine (2.3.3-3~bpo70+1) wheezy-backports; urgency=low
++redmine (2.3.3-3.1~bpo70+1) wheezy-backports; urgency=low
 +
 +  * Rebuild for wheezy-backports.
 +  * Drop strict dependency on ruby-railties-3.2 (>= 3.2.13-2~). The
 +    `rake tmp:cache:clear` command will not work.
 +  * debian/install: do not install Gemfile as passenger will try to load it,
 +    and will fail because this Gemfile is stricter than what we can provide in
 +    wheezy (e.g. it requires rails >= 3.2.12).
 +
 + -- Antonio Terceiro <terceiro at debian.org>  Sat, 05 Oct 2013 13:51:23 -0300
 +
+ redmine (2.3.3-3.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Tighten redmine-mysql dependencies to ruby-mysql, as ruby-mysql2
+     exposes another interface and does not work OOTB with the current
+     postinst. (Closes: #728243)
+ 
+  -- Christian Hofstaedtler <zeha at debian.org>  Tue, 31 Dec 2013 00:05:41 +0100
+ 
  redmine (2.3.3-3) unstable; urgency=low
  
    * Drop unused rubygems build-dependency.

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