[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 6b2deda4e25d4208154f4fd4932ff824d5d40c76
Merge: b57617fd1701f3e7950c245cfcb8efcb40c848e2 16604a97b4ff9515e89668de9e9fb1335d16b867
Author: Jérémy Lal <kapouer at melix.org>
Date:   Sat May 11 15:50:21 2013 +0200

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

diff --combined debian/control
index ce309b6,75d4e1b..9c7f0b8
--- a/debian/control
+++ b/debian/control
@@@ -16,7 -16,6 +16,7 @@@ Architecture: al
  Pre-Depends: debconf
  Depends: ruby | ruby-interpreter,
   ruby-rails-2.3 (>=2.3.14) | rails (>=2.3.14),
 + rubygems | ruby (>= 4.9),
   dbconfig-common,
   redmine-sqlite | redmine-mysql | redmine-pgsql,
   ruby-rack (>= 1.4.0),
@@@ -26,6 -25,7 +26,7 @@@
   bundler,
   ${misc:Depends}
  Breaks: redmine-plugin-botsfilter (<=1.02-1)
+ Recommends: ruby-passenger, libfcgi-ruby1.9.1 | libfcgi-ruby
  Suggests: ruby-rmagick,
   ruby-openid,
   bzr,
@@@ -60,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
@@@ -71,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
@@@ -82,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