[DRE-commits] [SCM] redmine.git branch, master-experimental, updated. debian/1.2.1+dfsg2-1-7-g1f71aba

[Jérémy Lal]

The following commit has been merged in the master-experimental branch:
commit 1f71aba0e254586667d6f68b95643a26e4916070
Merge: 4289696c8082a2ead658d24f209dcb58793fa138 a50e09dd3a7075ae91e16c32adaa79a4d8935300
Author: Jérémy Lal <kapouer at melix.org>
Date:   Thu Sep 22 11:02:24 2011 +0200

    Merge branch 'master-experimental' of ssh://git.debian.org/git/pkg-ruby-extras/redmine into master-experimental
    
    Conflicts:
    	debian/changelog
    	debian/control

diff --combined debian/changelog
index e0522e9,68b608e..cc0ddc3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,10 +1,14 @@@
- redmine (1.2.1+dfsg2-2) unstable; urgency=low
 -redmine (1.2.1+dfsg2-2) experimental; urgency=low
++redmine (1.2.1+dfsg2-2) UNRELEASED; urgency=low
  
-   * Require rails >= 2.3.11. (Closes: #642382) 
++  [ Jérémy Lal ]
++  * Require rails >= 2.3.11. (Closes: #642382)
++
++  [ Ondřej Surý ]
+   * Fix NoMethodError and OpenID authentication errors.
+     + http://www.redmine.org/issues/7857
+     + http://www.redmine.org/issues/8473
  
 - -- Ondřej Surý <ondrej at debian.org>  Fri, 02 Sep 2011 10:29:15 +0200
 + -- Jérémy Lal <kapouer at melix.org>  Thu, 22 Sep 2011 10:01:07 +0200
  
  redmine (1.2.1+dfsg2-1) experimental; urgency=low
  
diff --combined debian/control
index 2b8ae10,3897cd1..8d3bde8
--- a/debian/control
+++ b/debian/control
@@@ -14,7 -14,14 +14,13 @@@ Homepage: http://www.redmine.or
  Package: redmine
  Architecture: all
  Pre-Depends: debconf
- Depends: ruby1.8, ruby-rails-2.3 (>=2.3.11) | rails (>=2.3.11), dbconfig-common, redmine-sqlite | redmine-mysql | redmine-pgsql, ruby-coderay, ruby-net-ldap, ${misc:Depends}
+ Depends: ruby1.8,
 -	 ruby-rails-2.3 | rails,
++	 ruby-rails-2.3 (>=2.3.11) | rails (>=2.3.11),
+ 	 dbconfig-common,
+ 	 redmine-sqlite | redmine-mysql | redmine-pgsql,
+ 	 ruby-coderay,
+ 	 ruby-net-ldap,
 -	 libjs-scriptaculous,
+ 	 ${misc:Depends}
  Breaks: redmine-plugin-botsfilter (<=1.02-1)
  Suggests: libsvn-ruby (>= 1.3), ruby-rmagick, libopenid-ruby
  Description: flexible project management web application

-- 
redmine.git