[DRE-commits] [SCM] redmine.git branch, master, updated. debian/1.4.4+dfsg1-2-13-g617989a

[Jérémy Lal]

The following commit has been merged in the master branch:
commit 617989a44af836f47b9765f0cb562985ec7a76a7
Merge: 6b2deda4e25d4208154f4fd4932ff824d5d40c76 a7fbfc86eb2d0de91bd2d079c36c358a72e4c9c9
Author: Jérémy Lal <kapouer at melix.org>
Date:   Sat May 11 16:29:38 2013 +0200

    Merge branch 'master-stable'
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 79df1b1,3683030..4d01def
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,16 +1,26 @@@
++redmine (1.4.4+dfsg1-4) UNRELEASED; urgency=low
++
++  * debian/control:
++    + Recommends: libfcgi-ruby1.9.1 | libfcgi-ruby,
++      it is needed when using fastcgi with ruby1.9.
++    + Recommends: ruby-passenger.
++    + Depends on ruby-{pg,mysql,sqlite3} instead of libxxx-ruby packages.
++
++ -- Jérémy Lal <kapouer at melix.org>  Tue, 26 Jun 2012 00:39:43 +0200
++
+ redmine (1.4.4+dfsg1-3) unstable; urgency=low
+ 
+   [ Jérémy Lal ]
+   * This release is a candidate for proposed-updates.
+     Changes have been kept to the minimum.
+ 
+   [ Ondřej Surý ]
+   * Pull upstream fixes for Ruby 1.9 as default interpreter:
+     + Replace missing ParseDate with DateTime (Closes: #700754)
+     + Fix broken REST API (Closes: #700009)
+ 
+  -- Jérémy Lal <kapouer at melix.org>  Sat, 11 May 2013 16:26:27 +0200
+ 
  redmine (1.4.4+dfsg1-2) unstable; urgency=low
  
    * Manage and set dbuser default value like dbname. (Closes: #695774)
diff --combined debian/control
index 9c7f0b8,ce309b6..3814097
--- a/debian/control
+++ b/debian/control
@@@ -26,7 -26,6 +26,7 @@@ Depends: ruby | ruby-interpreter
   bundler,
   ${misc:Depends}
  Breaks: redmine-plugin-botsfilter (<=1.02-1)
- Recommends: ruby-passenger, libfcgi-ruby1.9.1 | libfcgi-ruby
++Recommends: libfcgi-ruby1.9.1 | libfcgi-ruby
  Suggests: ruby-rmagick,
   ruby-openid,
   bzr,
@@@ -61,7 -60,7 +61,7 @@@ Description: flexible project managemen
  
  Package: redmine-mysql
  Architecture: all
 -Depends: libmysql-ruby, mysql-client | virtual-mysql-client, ${misc:Depends}
 +Depends: ruby-mysql, mysql-client | virtual-mysql-client, ${misc:Depends}
  Suggests: mysql-server
  Description: metapackage providing MySQL dependencies for Redmine
   This package only provides MySQL dependencies for Redmine, a
@@@ -72,7 -71,7 +72,7 @@@
  
  Package: redmine-pgsql
  Architecture: all
 -Depends: libpgsql-ruby, postgresql-client, ${misc:Depends}
 +Depends: ruby-pg, postgresql-client, ${misc:Depends}
  Suggests: postgresql
  Description: metapackage providing PostgreSQL dependencies for Redmine
   This package provides PostgreSQL dependencies for Redmine, a
@@@ -83,7 -82,7 +83,7 @@@
  
  Package: redmine-sqlite
  Architecture: all
 -Depends: libsqlite3-ruby, sqlite3, ${misc:Depends}
 +Depends: ruby-sqlite3, sqlite3, ${misc:Depends}
  Description: metapackage providing sqlite dependencies for Redmine
   This package provides sqlite dependencies for Redmine, a
   flexible project management web application. Install this

-- 
redmine.git