[DRE-commits] [SCM] redmine.git branch, master-experimental, updated. debian/1.4.4+dfsg1-1-35-g042f641

[Ondřej Surý]

The following commit has been merged in the master-experimental branch:
commit fe758adcb9812647a14628c9e0debc9c7236aa6b
Author: Ondřej Surý <ondrej at sury.org>
Date:   Sun Oct 14 20:45:07 2012 +0200

    Update Gemfile patch to Redmine 2.1

diff --git a/debian/patches/2017_Gemfile_debian.patch b/debian/patches/2017_Gemfile_debian.patch
index af2110a..aa8bd60 100644
--- a/debian/patches/2017_Gemfile_debian.patch
+++ b/debian/patches/2017_Gemfile_debian.patch
@@ -4,50 +4,54 @@ Author: Jérémy Lal <kapouer at melix.org>
 Last-Update: 2012-05-14
 --- a/Gemfile
 +++ b/Gemfile
-@@ -1,79 +1,79 @@
- source :rubygems
+@@ -1,83 +1,83 @@
+ source 'http://rubygems.org'
  
--gem "rails", "2.3.14"
--gem "i18n", "~> 0.4.2"
+-gem 'rails', '3.2.8'
+-gem "jquery-rails", "~> 2.0.2"
+-gem "i18n", "~> 0.6.0"
 -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"
+-gem "builder", "3.0.0"
++#gem 'rails', '3.2.8'
++#gem "jquery-rails", "~> 2.0.2"
++#gem "i18n", "~> 0.6.0"
++#gem "coderay", "~> 1.0.6"
++#gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
++#gem "builder", "3.0.0"
  
  # 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
++#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"
+-  gem "rack-openid"
 -end
-+# group :openid do
-+#   gem "ruby-openid", "~> 2.1.4", :require => "openid"
-+# end
++#group :openid do
++#  gem "ruby-openid", "~> 2.1.4", :require => "openid"
++#  gem "rack-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
++#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
++#    gem "rmagick", ">= 2.0.0"
++#  end
++#end
  
  # Database gems
 -platforms :mri, :mingw do
@@ -68,7 +72,7 @@ Last-Update: 2012-05-14
 -
 -platforms :mri_19, :mingw_19 do
 -  group :mysql do
--    gem "mysql2", "~> 0.2.7"
+-    gem "mysql2", "~> 0.3.11"
 -  end
 -end
 -
@@ -90,60 +94,62 @@ Last-Update: 2012-05-14
 -
 -group :development do
 -  gem "rdoc", ">= 2.4.2"
+-  gem "yard"
 -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, :mingw do
++#  group :postgresql do
++#    gem "pg", ">= 0.11.0"
++#  end
++#
++#  group :sqlite do
++#    gem "sqlite3"
++#  end
++#end
 +
-+# platforms :mri_19, :mingw_19 do
-+#   group :mysql do
-+#     gem "mysql2", "~> 0.2.7"
-+#   end
-+# end
++#platforms :mri_18, :mingw_18 do
++#  group :mysql do
++#    gem "mysql"
++#  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
++#platforms :mri_19, :mingw_19 do
++#  group :mysql do
++#    gem "mysql2", "~> 0.3.11"
++#  end
++#end
 +
-+# group :development do
-+#   gem "rdoc", ">= 2.4.2"
-+# 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 :test do
-+#   gem "shoulda", "~> 2.10.3"
-+#   gem "edavis10-object_daddy", :require => "object_daddy"
-+#   gem "mocha"
-+# end
++#group :development do
++#  gem "rdoc", ">= 2.4.2"
++#  gem "yard"
++#end
+ 
+-group :test do
+-  gem "shoulda", "~> 2.11"
++#group :test do
++#  gem "shoulda", "~> 2.11"
+   # Shoulda does not work nice on Ruby 1.9.3 and seems to need test-unit explicitely.
+-  gem "test-unit", :platforms => [:mri_19]
+-  gem "mocha", "0.12.3"
+-end
++#  gem "test-unit", :platforms => [:mri_19]
++#  gem "mocha", "0.12.3"
++#end
  
  local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
  if File.exists?(local_gemfile)

-- 
redmine.git