[DRE-commits] [SCM] redmine.git branch, master, updated. debian/1.3.3+dfsg1-2-42-gede3bc9

[Jérémy Lal]

The following commit has been merged in the master branch:
commit d8e38c8a5ac3d03cdaca56207a673eb8bc42a3f7
Author: Jérémy Lal <kapouer at melix.org>
Date:   Tue May 15 00:42:29 2012 +0200

    Patch to disable all gems in Gemfile

diff --git a/debian/patches/2017_Gemfile_debian.patch b/debian/patches/2017_Gemfile_debian.patch
new file mode 100644
index 0000000..af2110a
--- /dev/null
+++ b/debian/patches/2017_Gemfile_debian.patch
@@ -0,0 +1,149 @@
+Description: Let redmine use bundler - but do not actually let it install gems.
+Forwarded: not-needed
+Author: Jérémy Lal <kapouer at melix.org>
+Last-Update: 2012-05-14
+--- a/Gemfile
++++ b/Gemfile
+@@ -1,79 +1,79 @@
+ source :rubygems
+ 
+-gem "rails", "2.3.14"
+-gem "i18n", "~> 0.4.2"
+-gem "coderay", "~> 1.0.6"
+-gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
+-gem "tzinfo", "~> 0.3.31"
++# gem "rails", "2.3.14"
++# gem "i18n", "~> 0.4.2"
++# gem "coderay", "~> 1.0.6"
++# gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
++# gem "tzinfo", "~> 0.3.31"
+ 
+ # Optional gem for LDAP authentication
+-group :ldap do
+-  gem "net-ldap", "~> 0.3.1"
+-end
++# group :ldap do
++#   gem "net-ldap", "~> 0.3.1"
++# end
+ 
+ # Optional gem for OpenID authentication
+-group :openid do
+-  gem "ruby-openid", "~> 2.1.4", :require => "openid"
+-end
++# group :openid do
++#   gem "ruby-openid", "~> 2.1.4", :require => "openid"
++# end
+ 
+ # Optional gem for exporting the gantt to a PNG file, not supported with jruby
+-platforms :mri, :mingw do
+-  group :rmagick do
++# platforms :mri, :mingw do
++#   group :rmagick do
+     # RMagick 2 supports ruby 1.9
+     # RMagick 1 would be fine for ruby 1.8 but Bundler does not support
+     # different requirements for the same gem on different platforms
+-    gem "rmagick", ">= 2.0.0"
+-  end
+-end
++#     gem "rmagick", ">= 2.0.0"
++# end
++# end
+ 
+ # Database gems
+-platforms :mri, :mingw do
+-  group :postgresql do
+-    gem "pg", ">= 0.11.0"
+-  end
+-
+-  group :sqlite do
+-    gem "sqlite3"
+-  end
+-end
+-
+-platforms :mri_18, :mingw_18 do
+-  group :mysql do
+-    gem "mysql"
+-  end
+-end
+-
+-platforms :mri_19, :mingw_19 do
+-  group :mysql do
+-    gem "mysql2", "~> 0.2.7"
+-  end
+-end
+-
+-platforms :jruby do
+-  gem "jruby-openssl"
+-
+-  group :mysql do
+-    gem "activerecord-jdbcmysql-adapter"
+-  end
+-
+-  group :postgresql do
+-    gem "activerecord-jdbcpostgresql-adapter"
+-  end
+-
+-  group :sqlite do
+-    gem "activerecord-jdbcsqlite3-adapter"
+-  end
+-end
+-
+-group :development do
+-  gem "rdoc", ">= 2.4.2"
+-end
+-
+-group :test do
+-  gem "shoulda", "~> 2.10.3"
+-  gem "edavis10-object_daddy", :require => "object_daddy"
+-  gem "mocha"
+-end
++# platforms :mri, :mingw do
++#   group :postgresql do
++#     gem "pg", ">= 0.11.0"
++#   end
++# 
++#   group :sqlite do
++#     gem "sqlite3"
++#   end
++# end
++
++# platforms :mri_18, :mingw_18 do
++#   group :mysql do
++#     gem "mysql"
++#   end
++# end
++
++# platforms :mri_19, :mingw_19 do
++#   group :mysql do
++#     gem "mysql2", "~> 0.2.7"
++#   end
++# end
++
++# platforms :jruby do
++#   gem "jruby-openssl"
++# 
++#   group :mysql do
++#     gem "activerecord-jdbcmysql-adapter"
++#   end
++# 
++#   group :postgresql do
++#     gem "activerecord-jdbcpostgresql-adapter"
++#   end
++# 
++#   group :sqlite do
++#     gem "activerecord-jdbcsqlite3-adapter"
++#   end
++# end
++
++# group :development do
++#   gem "rdoc", ">= 2.4.2"
++# end
++
++# group :test do
++#   gem "shoulda", "~> 2.10.3"
++#   gem "edavis10-object_daddy", :require => "object_daddy"
++#   gem "mocha"
++# end
+ 
+ local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
+ if File.exists?(local_gemfile)

-- 
redmine.git