[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 066d150ed618a51b3c800ef0c80dc31d77ac1c15
Author: Ondřej Surý <ondrej at sury.org>
Date:   Mon Oct 15 05:29:01 2012 +0200

    Do some mangling of the patches to get it back to original functionality

diff --git a/debian/patches/2002_FHS_through_env_vars.patch b/debian/patches/2002_FHS_through_env_vars.patch
index 1b5ab7d..213a0dd 100644
--- a/debian/patches/2002_FHS_through_env_vars.patch
+++ b/debian/patches/2002_FHS_through_env_vars.patch
@@ -55,7 +55,20 @@ Last-Update: 2012-01-19
            pdf_encoding = l(:general_pdf_encoding).upcase
 --- /dev/null
 +++ b/config/additional_environment.rb
-@@ -0,0 +1,17 @@
+@@ -0,0 +1,7 @@
++# log path
++config.paths['log'] = File.join(ENV['RAILS_LOG'], "#{ENV['RAILS_ENV']}.log") unless !ENV['RAILS_LOG']
++
++config.cache_store = :file_store, ENV['RAILS_CACHE']
++
++# Set Active Record's database.yml path
++config.paths['config/database'] = File.join(ENV['RAILS_ETC'], 'database.yml') unless !ENV['RAILS_ETC']
+--- a/config/environment.rb
++++ b/config/environment.rb
+@@ -10,5 +10,15 @@ if Dir.glob(File.join(vendor_plugins_dir
+   exit 1
+ end
+ 
 +ENV['RAILS_ENV'] ||= 'production'
 +
 +# for debian package : setup proper environment variables and paths
@@ -66,10 +79,5 @@ 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']}"
 +
-+# log path
-+config.paths['log'] = File.join(ENV['RAILS_LOG'], "#{ENV['RAILS_ENV']}.log") unless !ENV['RAILS_LOG']
-+
-+config.cache_store = :file_store, ENV['RAILS_CACHE']
-+
-+# Set Active Record's database.yml path
-+config.paths['config/database'] = File.join(ENV['RAILS_ETC'], 'database.yml') unless !ENV['RAILS_ETC']
+ # Initialize the rails application
+ RedmineApp::Application.initialize!
diff --git a/debian/patches/2003_externalize_session_config.patch b/debian/patches/2003_externalize_session_config.patch
index e5db532..065a7e8 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/environment.rb
 +++ b/config/environment.rb
-@@ -28,5 +28,19 @@ if Dir.glob(File.join(vendor_plugins_dir
-   exit 1
- end
+@@ -20,5 +20,19 @@ ENV['RAILS_LOG'] ||= "/var/log/redmine/#
+ ENV['RAILS_VAR'] ||= "/var/lib/redmine/#{ENV['X_DEBIAN_SITEID']}"
+ ENV['RAILS_CACHE'] ||= "/var/cache/redmine/#{ENV['X_DEBIAN_SITEID']}"
  
 +# loads cookie based session session and secret keys
 +# this is needed here because initializers are loaded after plugins,
diff --git a/debian/patches/2005_FHS_schema_dump.patch b/debian/patches/2005_FHS_schema_dump.patch
index c4670d4..58b3401 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
-@@ -10,6 +10,7 @@ ENV['RAILS_ETC'] ||= "/etc/redmine/#{ENV
+@@ -19,6 +19,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"
  
- # log path
- config.log_path = File.join(ENV['RAILS_LOG'], "#{ENV['RAILS_ENV']}.log") unless !ENV['RAILS_LOG']
+ # loads cookie based session session and secret keys
+ # this is needed here because initializers are loaded after plugins,
diff --git a/debian/patches/2009_FHS_thin_config.patch b/debian/patches/2009_FHS_thin_config.patch
index ed5ef1c..ce5e48c 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
-@@ -5,6 +5,7 @@ ENV['RAILS_ENV'] ||= 'production'
+@@ -14,6 +14,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