[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 185dbdcdd891e39baa182f314cc6680d125ac1e8
Author: Ondřej Surý <ondrej at sury.org>
Date:   Sun Oct 14 20:45:40 2012 +0200

    Refresh rest of the patches to Redmine 2.1

diff --git a/debian/patches/2005_FHS_schema_dump.patch b/debian/patches/2005_FHS_schema_dump.patch
index 4beed15..c4670d4 100644
--- a/debian/patches/2005_FHS_schema_dump.patch
+++ b/debian/patches/2005_FHS_schema_dump.patch
@@ -6,11 +6,11 @@ Author: Jérémy Lal <kapouer at melix.org>
 Last-Update: 2010-05-25
 --- a/config/environment.rb
 +++ b/config/environment.rb
-@@ -11,6 +11,7 @@
+@@ -10,6 +10,7 @@ ENV['RAILS_ETC'] ||= "/etc/redmine/#{ENV
  ENV['RAILS_LOG'] ||= "/var/log/redmine/#{ENV['X_DEBIAN_SITEID']}"
  ENV['RAILS_VAR'] ||= "/var/lib/redmine/#{ENV['X_DEBIAN_SITEID']}"
  ENV['RAILS_CACHE'] ||= "/var/cache/redmine/#{ENV['X_DEBIAN_SITEID']}"
 +ENV['SCHEMA'] ||= "#{ENV['RAILS_CACHE']}/schema.db"
  
- # Bootstrap the Rails environment, frameworks, and default configuration
- require File.join(File.dirname(__FILE__), 'boot')
+ # log path
+ config.log_path = File.join(ENV['RAILS_LOG'], "#{ENV['RAILS_ENV']}.log") unless !ENV['RAILS_LOG']
diff --git a/debian/patches/2009_FHS_thin_config.patch b/debian/patches/2009_FHS_thin_config.patch
index 06bb9b8..ed5ef1c 100644
--- a/debian/patches/2009_FHS_thin_config.patch
+++ b/debian/patches/2009_FHS_thin_config.patch
@@ -5,7 +5,7 @@ Author: Jérémy Lal <kapouer at melix.org>
 Last-Update: 2010-11-01
 --- a/config/environment.rb
 +++ b/config/environment.rb
-@@ -6,6 +6,7 @@ ENV['RAILS_ENV'] ||= 'production'
+@@ -5,6 +5,7 @@ ENV['RAILS_ENV'] ||= 'production'
  
  # for debian package : setup proper environment variables and paths
  # To run redmine as unprivileged user, see /usr/share/doc/redmine/README.Debian

-- 
redmine.git