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

[Ondřej Surý]

The following commit has been merged in the master-experimental branch:
commit 8e2bcded0ccebb52577819f8bc778d970b3e3ad6
Author: Ondřej Surý <ondrej at sury.org>
Date:   Thu Jan 3 12:46:31 2013 +0100

    Refresh patches for 2.2.0 release

diff --git a/debian/patches/2002_FHS_through_env_vars.patch b/debian/patches/2002_FHS_through_env_vars.patch
index b238be8..795de4f 100644
--- a/debian/patches/2002_FHS_through_env_vars.patch
+++ b/debian/patches/2002_FHS_through_env_vars.patch
@@ -42,7 +42,7 @@ Last-Update: 2012-01-19
 @@ -35,7 +35,7 @@ module Redmine
          attr_accessor :footer_date
  
-         def initialize(lang)
+         def initialize(lang, orientation='P')
 -          @@k_path_cache = Rails.root.join('tmp', 'pdf')
 +          @@k_path_cache = ENV['RAILS_CACHE'] ? File.join(ENV['RAILS_CACHE'], 'pdf') : Rails.root.join('tmp', 'pdf')
            FileUtils.mkdir_p @@k_path_cache unless File::exist?(@@k_path_cache)
@@ -68,7 +68,7 @@ Last-Update: 2012-01-19
  if defined?(Bundler)
    # If you precompile assets before deploying to production, use this line
    Bundler.require(*Rails.groups(:assets => %w(development test)))
-@@ -52,6 +63,17 @@ module RedmineApp
+@@ -55,6 +66,17 @@ module RedmineApp
  
      config.session_store :cookie_store, :key => '_redmine_session'
  
diff --git a/debian/patches/2003_externalize_session_config.patch b/debian/patches/2003_externalize_session_config.patch
index f213291..518de7c 100644
--- a/debian/patches/2003_externalize_session_config.patch
+++ b/debian/patches/2003_externalize_session_config.patch
@@ -50,9 +50,9 @@ Last-Update: 2010-01-10
 -task :generate_secret_token => ['config/initializers/secret_token.rb']
 --- a/config/application.rb
 +++ b/config/application.rb
-@@ -61,7 +61,20 @@ module RedmineApp
- 
-     config.action_mailer.perform_deliveries = false
+@@ -64,7 +64,20 @@ module RedmineApp
+     # Do not include all helpers
+     config.action_controller.include_all_helpers = false
  
 -    config.session_store :cookie_store, :key => '_redmine_session'
 +    # loads cookie based session session and secret keys
diff --git a/debian/patches/2017_Gemfile_debian.patch b/debian/patches/2017_Gemfile_debian.patch
index d555664..5974b3f 100644
--- a/debian/patches/2017_Gemfile_debian.patch
+++ b/debian/patches/2017_Gemfile_debian.patch
@@ -4,16 +4,16 @@ Author: Jérémy Lal <kapouer at melix.org>
 Last-Update: 2012-05-14
 --- a/Gemfile
 +++ b/Gemfile
-@@ -1,83 +1,83 @@
+@@ -1,86 +1,86 @@
  source 'http://rubygems.org'
  
--gem 'rails', '3.2.8'
+-gem 'rails', '3.2.9'
 -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"
-+#gem 'rails', '3.2.8'
++#gem 'rails', '3.2.9'
 +#gem "jquery-rails", "~> 2.0.2"
 +#gem "i18n", "~> 0.6.0"
 +#gem "coderay", "~> 1.0.6"
@@ -102,8 +102,11 @@ Last-Update: 2012-05-14
 -
 -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]
+-  # Shoulda does not work nice on Ruby 1.9.3 and JRuby 1.7.
+-  # It seems to need test-unit explicitely.
+-  platforms = [:mri_19]
+-  platforms << :jruby if defined?(JRUBY_VERSION) && JRUBY_VERSION >= "1.7"
+-  gem "test-unit", :platforms => platforms
 -  gem "mocha", "0.12.3"
 -end
 +#platforms :mri, :mingw do
@@ -151,8 +154,11 @@ Last-Update: 2012-05-14
 +
 +#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]
++#  # Shoulda does not work nice on Ruby 1.9.3 and JRuby 1.7.
++#  # It seems to need test-unit explicitely.
++#  platforms = [:mri_19]
++#  platforms << :jruby if defined?(JRUBY_VERSION) && JRUBY_VERSION >= "1.7"
++#  gem "test-unit", :platforms => platforms
 +#  gem "mocha", "0.12.3"
 +#end
  

-- 
redmine.git