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

[Jérémy Lal]

The following commit has been merged in the master branch:
commit b1559dd498df4d1c9f86a581ab190aedd6d7ccea
Author: Jérémy Lal <kapouer at melix.org>
Date:   Mon May 14 11:20:10 2012 +0200

    Refresh patches. Some are unneeded because upstream use ./Gemfile.

diff --git a/debian/patches/2002_FHS_through_env_vars.patch b/debian/patches/2002_FHS_through_env_vars.patch
index e31f05d..8aad9a4 100644
--- a/debian/patches/2002_FHS_through_env_vars.patch
+++ b/debian/patches/2002_FHS_through_env_vars.patch
@@ -30,9 +30,9 @@ Last-Update: 2012-01-19
 +ENV['RAILS_VAR'] ||= "/var/lib/redmine/#{ENV['X_DEBIAN_SITEID']}"
 +ENV['RAILS_CACHE'] ||= "/var/cache/redmine/#{ENV['X_DEBIAN_SITEID']}"
  
- # Specifies gem version of Rails to use when vendor/rails is not present
- RAILS_GEM_VERSION = '2.3.14' unless defined? RAILS_GEM_VERSION
-@@ -34,10 +42,18 @@
+ # Bootstrap the Rails environment, frameworks, and default configuration
+ require File.join(File.dirname(__FILE__), 'boot')
+@@ -31,10 +39,18 @@
    # (by default production uses :info, the others :debug)
    # config.log_level = :debug
  
@@ -53,7 +53,7 @@ Last-Update: 2012-01-19
    config.active_record.observers = :message_observer, :issue_observer, :journal_observer, :news_observer, :document_observer, :wiki_content_observer, :comment_observer
 --- a/config/initializers/10-patches.rb
 +++ b/config/initializers/10-patches.rb
-@@ -112,3 +112,6 @@
+@@ -86,3 +86,6 @@
      end
    end
  end
diff --git a/debian/patches/2003_externalize_session_config.patch b/debian/patches/2003_externalize_session_config.patch
index 92f725f..e402a58 100644
--- a/debian/patches/2003_externalize_session_config.patch
+++ b/debian/patches/2003_externalize_session_config.patch
@@ -4,9 +4,9 @@ Author: Jérémy Lal <kapouer at melix.org>
 Last-Update: 2010-01-10
 --- a/config/environment.rb
 +++ b/config/environment.rb
-@@ -22,6 +22,20 @@
- # Bootstrap the Rails environment, frameworks, and default configuration
- require File.join(File.dirname(__FILE__), 'boot')
+@@ -19,6 +19,20 @@
+   Encoding.default_external = 'UTF-8'
+ end
  
 +# loads cookie based session session and secret keys
 +# this is needed here because initializers are loaded after plugins,
diff --git a/debian/patches/2004_FHS_plugins_assets.patch b/debian/patches/2004_FHS_plugins_assets.patch
index 74ca55d..e09011a 100644
--- a/debian/patches/2004_FHS_plugins_assets.patch
+++ b/debian/patches/2004_FHS_plugins_assets.patch
@@ -7,7 +7,7 @@ Bug-Debian: http://bugs.debian.org/570308
 Last-Update: 2010-02-18
 --- a/config/environment.rb
 +++ b/config/environment.rb
-@@ -39,6 +39,7 @@
+@@ -36,6 +36,7 @@
  # Load Engine plugin if available
  begin
    require File.join(File.dirname(__FILE__), '../vendor/plugins/engines/boot')
diff --git a/debian/patches/2005_FHS_schema_dump.patch b/debian/patches/2005_FHS_schema_dump.patch
index 146248b..4beed15 100644
--- a/debian/patches/2005_FHS_schema_dump.patch
+++ b/debian/patches/2005_FHS_schema_dump.patch
@@ -12,5 +12,5 @@ Last-Update: 2010-05-25
  ENV['RAILS_CACHE'] ||= "/var/cache/redmine/#{ENV['X_DEBIAN_SITEID']}"
 +ENV['SCHEMA'] ||= "#{ENV['RAILS_CACHE']}/schema.db"
  
- # Specifies gem version of Rails to use when vendor/rails is not present
- RAILS_GEM_VERSION = '2.3.14' unless defined? RAILS_GEM_VERSION
+ # Bootstrap the Rails environment, frameworks, and default configuration
+ require File.join(File.dirname(__FILE__), 'boot')
diff --git a/debian/patches/2008_force_table_encoding_mysql.patch b/debian/patches/2008_force_table_encoding_mysql.patch
index 385fbf4..ce00fe2 100644
--- a/debian/patches/2008_force_table_encoding_mysql.patch
+++ b/debian/patches/2008_force_table_encoding_mysql.patch
@@ -9,7 +9,7 @@ Bug-Rails: http://rails.lighthouseapp.com/projects/8994/tickets/5830
 Last-Update: 2010-10-17
 --- a/config/initializers/10-patches.rb
 +++ b/config/initializers/10-patches.rb
-@@ -1,6 +1,22 @@
+@@ -5,6 +5,22 @@
  
  require 'active_record'
  
diff --git a/debian/patches/series b/debian/patches/series
index 3bc8532..fa84acf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,7 @@
-2001_fix_shebang_interpreter.patch
 2002_FHS_through_env_vars.patch
 2003_externalize_session_config.patch
 2004_FHS_plugins_assets.patch
 2005_FHS_schema_dump.patch
 2008_force_table_encoding_mysql.patch
 2009_FHS_thin_config.patch
-2014_relax_RAILS_GEM_VERSION.patch
-2015_use_system_coderay.patch
 2016_fix_openid_login_7857_and_8473.patch

-- 
redmine.git