[DRE-commits] [redmine] 01/01: Merge branch 'master' into debian/jessie

[Antonio Terceiro]

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

terceiro pushed a commit to branch debian/jessie
in repository redmine.

commit 879a2be2995d531e4d258260d6586ade56f332b7
Merge: 2fbe6dd 49fe4cb
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Thu Aug 13 13:29:20 2015 -0300

    Merge branch 'master' into debian/jessie

 debian/changelog        | 9 ++++++++-
 debian/control          | 2 +-
 debian/redmine.triggers | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index e79cbe7,bf7ea3d..fcd92d6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
- redmine (3.0~20140825-7~deb8u1) jessie; urgency=medium
++redmine (3.0~20140825-8~deb8u1) jessie; urgency=medium
 +
 +  * Backport as a stable update for Jessie.
 +
 + -- Antonio Terceiro <terceiro at debian.org>  Sun, 10 May 2015 19:26:43 -0300
 +
+ redmine (3.0~20140825-8) unstable; urgency=medium
+ 
+   * Replace "interest" triggers with "interest-nowait" ones to avoid trigger
+     loops (Closes: #786763)
+ 
+  -- Antonio Terceiro <terceiro at debian.org>  Fri, 10 Jul 2015 20:07:20 -0300
+ 
  redmine (3.0~20140825-7) unstable; urgency=medium
  
    * debian/postinst: always remove and recreate Gemfile.lock to handle the

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