[DRE-commits] r4924 - in trunk/redmine/debian: . patches

[Jérémy Lal]

Author: kapouer-guest
Date: 2010-03-12 14:56:40 +0000 (Fri, 12 Mar 2010)
New Revision: 4924

Added:
   trunk/redmine/debian/patches/0020-application-rb-for-rails2.2.patch
Modified:
   trunk/redmine/debian/links
   trunk/redmine/debian/patches/0014-Move-session-configuration-to-YML-file-next-to-datab.patch
   trunk/redmine/debian/patches/0019-no-batch_size-in-rails2.2.patch
   trunk/redmine/debian/patches/series
Log:
A better fix for application to application_controller renaming, also refresh patches and fix some rails 2.2 incompatibility.

Modified: trunk/redmine/debian/links
===================================================================
--- trunk/redmine/debian/links	2010-03-12 14:56:28 UTC (rev 4923)
+++ trunk/redmine/debian/links	2010-03-12 14:56:40 UTC (rev 4924)
@@ -5,8 +5,7 @@
 usr/share/javascript/scriptaculous/dragdrop.js usr/share/redmine/public/javascripts/dragdrop.js
 usr/share/javascript/scriptaculous/effects.js usr/share/redmine/public/javascripts/effects.js
 
-# Redmine is now rails 2.3 compatible, so these three links,
+# Redmine is now rails 2.3 compatible, so these two links,
 # along with the debian/patches/revert_rails_2.3.patch, are here to get back rails 2.2.
-usr/share/redmine/app/controllers/application_controller.rb usr/share/redmine/app/controllers/application.rb
 usr/share/redmine/app/views/layouts/mailer.text.html.erb usr/share/redmine/app/views/mailer/layout.text.html.rhtml
 usr/share/redmine/app/views/layouts/mailer.text.plain.erb usr/share/redmine/app/views/mailer/layout.text.plain.rhtml

Modified: trunk/redmine/debian/patches/0014-Move-session-configuration-to-YML-file-next-to-datab.patch
===================================================================
--- trunk/redmine/debian/patches/0014-Move-session-configuration-to-YML-file-next-to-datab.patch	2010-03-12 14:56:28 UTC (rev 4923)
+++ trunk/redmine/debian/patches/0014-Move-session-configuration-to-YML-file-next-to-datab.patch	2010-03-12 14:56:40 UTC (rev 4924)
@@ -4,9 +4,9 @@
 
 ---
 
---- redmine-0.9.2.orig/config/environment.rb
-+++ redmine-0.9.2/config/environment.rb
-@@ -19,6 +19,19 @@ RAILS_GEM_VERSION = '2.2.3' unless defin
+--- a/config/environment.rb
++++ b/config/environment.rb
+@@ -18,6 +18,19 @@
  # Bootstrap the Rails environment, frameworks, and default configuration
  require File.join(File.dirname(__FILE__), 'boot')
  
@@ -26,8 +26,6 @@
  # Load Engine plugin if available
  begin
    require File.join(File.dirname(__FILE__), '../vendor/plugins/engines/boot')
-diff --git a/lib/tasks/initializers.rake b/lib/tasks/initializers.rake
-index ce87475..a108204 100644
 --- a/lib/tasks/initializers.rake
 +++ b/lib/tasks/initializers.rake
 @@ -1,11 +1,14 @@
@@ -51,7 +49,7 @@
  # and should not be made visible to public.
  # If you have a load-balancing Redmine cluster, you will need to use the
  # same version of this file on each machine. And be sure to restart your
-@@ -15,13 +18,18 @@ file 'config/initializers/session_store.rb' do
+@@ -15,13 +18,18 @@
  # change this key, all old sessions will become invalid! Make sure the
  # secret is at least 30 characters and all random, no regular words or
  # you'll be exposed to dictionary attacks.
@@ -78,4 +76,3 @@
 -desc 'Generates a configuration file for cookie store sessions.'
 -task :generate_session_store => ['config/initializers/session_store.rb']
 +end
--- 

Modified: trunk/redmine/debian/patches/0019-no-batch_size-in-rails2.2.patch
===================================================================
--- trunk/redmine/debian/patches/0019-no-batch_size-in-rails2.2.patch	2010-03-12 14:56:28 UTC (rev 4923)
+++ trunk/redmine/debian/patches/0019-no-batch_size-in-rails2.2.patch	2010-03-12 14:56:40 UTC (rev 4924)
@@ -1,3 +1,5 @@
+Because rails 2.2 does not support this batch_size query.
+
 --- a/lib/tasks/migrate_from_mantis.rake
 +++ b/lib/tasks/migrate_from_mantis.rake
 @@ -314,7 +314,7 @@

Added: trunk/redmine/debian/patches/0020-application-rb-for-rails2.2.patch
===================================================================
--- trunk/redmine/debian/patches/0020-application-rb-for-rails2.2.patch	                        (rev 0)
+++ trunk/redmine/debian/patches/0020-application-rb-for-rails2.2.patch	2010-03-12 14:56:40 UTC (rev 4924)
@@ -0,0 +1,9 @@
+Instead of linking application.rb to application_controller.rb,
+which could lead to multiple loading of ApplicationController class,
+just require application_controller in application.rb
+
+--- /dev/null
++++ b/app/controllers/application.rb
+@@ -0,0 +1,2 @@
++require_dependency 'application_controller'
++

Modified: trunk/redmine/debian/patches/series
===================================================================
--- trunk/redmine/debian/patches/series	2010-03-12 14:56:28 UTC (rev 4923)
+++ trunk/redmine/debian/patches/series	2010-03-12 14:56:40 UTC (rev 4924)
@@ -17,3 +17,4 @@
 0017-dump_schema_to_cache_dir.patch
 0018-engines-rails2.2.patch
 0019-no-batch_size-in-rails2.2.patch
+0020-application-rb-for-rails2.2.patch