[DRE-commits] [SCM] redmine.git branch, master-experimental, updated. debian/1.1.3-1-58-g9d859cc

[Jérémy Lal]

The following commit has been merged in the master-experimental branch:
commit bd33fab8b3e904174c1a7db1c105542d80591efa
Author: Jérémy Lal <kapouer at melix.org>
Date:   Tue Aug 23 15:51:52 2011 +0200

    Add a patch to disable rails version checking, already handled by package dependencies.

diff --git a/debian/patches/2014_relax_RAILS_GEM_VERSION.patch b/debian/patches/2014_relax_RAILS_GEM_VERSION.patch
new file mode 100644
index 0000000..f0c6efc
--- /dev/null
+++ b/debian/patches/2014_relax_RAILS_GEM_VERSION.patch
@@ -0,0 +1,15 @@
+Description: Relax RAILS_GEM_VERSION, the correct version is set in debian/control.
+Forwarded: not-needed
+Author: Jérémy Lal <kapouer at melix.org>
+Last-Update: 2011-08-23
+--- a/config/environment.rb
++++ b/config/environment.rb
+@@ -15,7 +15,7 @@
+ 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.11' unless defined? RAILS_GEM_VERSION
++# RAILS_GEM_VERSION = '2.3.11' 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/series b/debian/patches/series
index 6468810..5a6f612 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
 2009_FHS_thin_config.patch
 2010_use_i18n_0.4.1.patch
 1013_indent_subject_exported_pdf.patch
+2014_relax_RAILS_GEM_VERSION.patch

-- 
redmine.git