[DRE-commits] r4383 - trunk/redmine/debian/patches

[Jérémy Lal]

Author: kapouer-guest
Date: 2009-11-23 19:53:27 +0000 (Mon, 23 Nov 2009)
New Revision: 4383

Modified:
   trunk/redmine/debian/patches/01_paths.patch
Log:
Refresh patch.

Modified: trunk/redmine/debian/patches/01_paths.patch
===================================================================
--- trunk/redmine/debian/patches/01_paths.patch	2009-11-23 00:21:39 UTC (rev 4382)
+++ trunk/redmine/debian/patches/01_paths.patch	2009-11-23 19:53:27 UTC (rev 4383)
@@ -1,7 +1,6 @@
-To support multiple instances, rails paths must be configurable through X_DEBIAN_SITEID environment variable.
-diff -Nur redmine-0.9.0~svn2886/app/models/attachment.rb redmine-0.9.0~svn2886.new/app/models/attachment.rb
---- redmine-0.9.0~svn2886/app/models/attachment.rb	2009-09-19 13:43:38.878242839 +0200
-+++ redmine-0.9.0~svn2886.new/app/models/attachment.rb	2009-09-19 13:44:46.990243705 +0200
+diff -Nur redmine-0.9.0~svn3084/app/models/attachment.rb redmine-0.9.0~svn3084.new/app/models/attachment.rb
+--- redmine-0.9.0~svn3084/app/models/attachment.rb	2009-04-25 11:31:36.000000000 +0200
++++ redmine-0.9.0~svn3084.new/app/models/attachment.rb	2009-11-23 20:50:40.130710460 +0100
 @@ -43,7 +43,7 @@
                                                          "LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id"}
  
@@ -11,9 +10,9 @@
    
    def validate
      if self.filesize > Setting.attachment_max_size.to_i.kilobytes
-diff -Nur redmine-0.9.0~svn2886/config/environment.rb redmine-0.9.0~svn2886.new/config/environment.rb
---- redmine-0.9.0~svn2886/config/environment.rb	2009-09-19 13:43:38.926218973 +0200
-+++ redmine-0.9.0~svn2886.new/config/environment.rb	2009-09-19 13:57:45.417218964 +0200
+diff -Nur redmine-0.9.0~svn3084/config/environment.rb redmine-0.9.0~svn3084.new/config/environment.rb
+--- redmine-0.9.0~svn3084/config/environment.rb	2009-11-23 20:51:10.490601461 +0100
++++ redmine-0.9.0~svn3084.new/config/environment.rb	2009-11-23 20:50:40.134570533 +0100
 @@ -2,7 +2,14 @@
  
  # Uncomment below to force Rails into production mode when 
@@ -29,7 +28,7 @@
 +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.2.2' unless defined? RAILS_GEM_VERSION
+ RAILS_GEM_VERSION = '2.2.3' unless defined? RAILS_GEM_VERSION
 @@ -30,9 +37,18 @@
    # (by default production uses :info, the others :debug)
    # config.log_level = :debug
@@ -49,9 +48,9 @@
    
    # Activate observers that should always be running
    # config.active_record.observers = :cacher, :garbage_collector
-diff -Nur redmine-0.9.0~svn2886/config/initializers/10-patches.rb redmine-0.9.0~svn2886.new/config/initializers/10-patches.rb
---- redmine-0.9.0~svn2886/config/initializers/10-patches.rb	2009-09-19 13:43:38.986234942 +0200
-+++ redmine-0.9.0~svn2886.new/config/initializers/10-patches.rb	2009-09-19 13:44:46.990243705 +0200
+diff -Nur redmine-0.9.0~svn3084/config/initializers/10-patches.rb redmine-0.9.0~svn3084.new/config/initializers/10-patches.rb
+--- redmine-0.9.0~svn3084/config/initializers/10-patches.rb	2009-11-07 10:50:16.000000000 +0100
++++ redmine-0.9.0~svn3084.new/config/initializers/10-patches.rb	2009-11-23 20:50:40.134570533 +0100
 @@ -78,3 +78,6 @@
  end
  
@@ -59,9 +58,9 @@
 +
 +# the session store
 +ActionController::Base.session_options[:tmpdir] = File.join(ENV['RAILS_VAR'], 'sessions') unless !ENV['RAILS_VAR']
-diff -Nur redmine-0.9.0~svn2886/config/initializers/40-email.rb redmine-0.9.0~svn2886.new/config/initializers/40-email.rb
---- redmine-0.9.0~svn2886/config/initializers/40-email.rb	2009-09-19 13:43:38.954242586 +0200
-+++ redmine-0.9.0~svn2886.new/config/initializers/40-email.rb	2009-09-19 13:44:46.990243705 +0200
+diff -Nur redmine-0.9.0~svn3084/config/initializers/40-email.rb redmine-0.9.0~svn3084.new/config/initializers/40-email.rb
+--- redmine-0.9.0~svn3084/config/initializers/40-email.rb	2008-07-04 20:55:45.000000000 +0200
++++ redmine-0.9.0~svn3084.new/config/initializers/40-email.rb	2009-11-23 20:50:40.134570533 +0100
 @@ -1,7 +1,7 @@
  # Loads action_mailer settings from email.yml
  # and turns deliveries on if configuration file is found
@@ -71,9 +70,9 @@
  if File.file?(filename)
    mailconfig = YAML::load_file(filename)
  
-diff -Nur redmine-0.9.0~svn2886/public/dispatch.fcgi.example redmine-0.9.0~svn2886.new/public/dispatch.fcgi.example
---- redmine-0.9.0~svn2886/public/dispatch.fcgi.example	2009-09-19 13:43:38.906218680 +0200
-+++ redmine-0.9.0~svn2886.new/public/dispatch.fcgi.example	2009-09-19 13:44:46.990243705 +0200
+diff -Nur redmine-0.9.0~svn3084/public/dispatch.fcgi.example redmine-0.9.0~svn3084.new/public/dispatch.fcgi.example
+--- redmine-0.9.0~svn3084/public/dispatch.fcgi.example	2008-11-11 14:54:10.000000000 +0100
++++ redmine-0.9.0~svn3084.new/public/dispatch.fcgi.example	2009-11-23 20:50:40.134570533 +0100
 @@ -20,5 +20,8 @@
  #
  require File.dirname(__FILE__) + "/../config/environment"