[DRE-commits] [redmine] 17/26: depend on rails and jquery, drop development packages from Gemfile

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository redmine.

commit e565493d13cd4f73c26d1cec8c92a0fb43e6464c
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Sep 13 23:29:01 2014 -0300

    depend on rails and jquery, drop development packages from Gemfile
---
 debian/control                           | 3 ++-
 debian/patches/gemfile-adjustments.patch | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index d16fb05..e75fb23 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,8 @@ Package: redmine
 Architecture: all
 Pre-Depends: debconf
 Depends: ruby | ruby-interpreter,
- ruby-railties (>= 2:4),
+ ruby-rails (>= 2:4),
+ ruby-jquery-rails,
  bundler,
  ruby-rails-observers,
  dbconfig-common,
diff --git a/debian/patches/gemfile-adjustments.patch b/debian/patches/gemfile-adjustments.patch
index 79e527a..2d14466 100644
--- a/debian/patches/gemfile-adjustments.patch
+++ b/debian/patches/gemfile-adjustments.patch
@@ -40,10 +40,15 @@
  if File.exist?(database_file)
    database_config = YAML::load(ERB.new(IO.read(database_file)).result)
    adapters = database_config.values.map {|c| c['adapter']}.compact.uniq
-@@ -83,16 +86,6 @@ group :development do
-   gem "yard"
+@@ -78,21 +81,6 @@ else
+   warn("Please configure your config/database.yml first")
  end
  
+-group :development do
+-  gem "rdoc", ">= 2.4.2"
+-  gem "yard"
+-end
+-
 -group :test do
 -  gem "minitest"
 -  gem "shoulda"

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