[DRE-commits] [redmine] 01/04: Merge tag 'debian/2.3.3-3' 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 6c4cc3d802f4471a6ea09ea7c7ada7939b6f1b92
Merge: e5e1a12 b6fdbaa
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Feb 4 17:49:35 2014 -0300

    Merge tag 'debian/2.3.3-3' into master-wheezy-backports
    
    redmine Debian release 2.3.3-3
    
    Conflicts:
    	debian/changelog

 debian/changelog                         | 18 +++++++++++++++-
 debian/control                           |  5 ++---
 debian/patches/2017_Gemfile_debian.patch | 15 ++++++--------
 debian/patches/2019_unplug_bundler.patch | 35 +++++++++++++++++++++++++++-----
 debian/patches/series                    |  1 +
 5 files changed, 56 insertions(+), 18 deletions(-)

diff --cc debian/changelog
index ecab256,baca6a4..66b973d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,19 +1,30 @@@
- redmine (2.3.3-1~bpo70+1) wheezy-backports; urgency=low
++redmine (2.3.3-3~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) unstable; urgency=low
+ 
+   * Drop unused rubygems build-dependency.
+   * Add ruby-rack1.4 as alternative. Closes: #731177.
+   * Remove dependency on ruby-fastercsv, this is part of the ruby1.8
+     removal.
+ 
+  -- Jérémy Lal <kapouer at melix.org>  Mon, 02 Dec 2013 23:47:41 +0100
+ 
+ redmine (2.3.3-2) unstable; urgency=low
+ 
+   * Add Gemfile patch back to allow backporting redmine
+   * Unplug bundler in the plugins as well
+ 
+  -- Ondřej Surý <ondrej at debian.org>  Thu, 24 Oct 2013 08:55:43 +0200
+ 
  redmine (2.3.3-1) unstable; urgency=low
  
    * Imported Upstream version 2.3.3

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