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

[Jérémy Lal]

Author: kapouer-guest
Date: 2011-03-22 00:14:50 +0000 (Tue, 22 Mar 2011)
New Revision: 6110

Added:
   trunk/redmine/debian/patches/2011_rubygems_need_thread.patch
   trunk/redmine/debian/patches/2012_rubygems_version_requirement.patch
Modified:
   trunk/redmine/debian/patches/series
Log:
Compatibility with rubygems 1.6.2-1

Added: trunk/redmine/debian/patches/2011_rubygems_need_thread.patch
===================================================================
--- trunk/redmine/debian/patches/2011_rubygems_need_thread.patch	                        (rev 0)
+++ trunk/redmine/debian/patches/2011_rubygems_need_thread.patch	2011-03-22 00:14:50 UTC (rev 6110)
@@ -0,0 +1,10 @@
+Description: Work around "uninitialized constant ActiveSupport::Dependencies::Mutex"
+Bug-Debian: http://bugs.debian.org/587767
+Author: Jérémy Lal <kapouer at melix.org>
+Last-Update: 2011-03-22
+--- /dev/null
++++ b/config/preinitializer.rb
+@@ -0,0 +1,3 @@
++# work around http://bugs.debian.org/587767
++require 'thread'
++

Added: trunk/redmine/debian/patches/2012_rubygems_version_requirement.patch
===================================================================
--- trunk/redmine/debian/patches/2012_rubygems_version_requirement.patch	                        (rev 0)
+++ trunk/redmine/debian/patches/2012_rubygems_version_requirement.patch	2011-03-22 00:14:50 UTC (rev 6110)
@@ -0,0 +1,26 @@
+Description: Work around removal of version_requirement method.
+ This has been deprecated for a while, unfortunately redmine 1.1.2
+ and rails 2.3.5 have not fixed their code yet.
+Forwarded: not-needed
+Author: Jérémy Lal <kapouer at melix.org>
+Last-Update: 2011-03-22
+--- a/config/environment.rb
++++ b/config/environment.rb
+@@ -20,6 +20,17 @@
+ # Bootstrap the Rails environment, frameworks, and default configuration
+ require File.join(File.dirname(__FILE__), 'boot')
+ 
++# Add support for version_requirement method when rubygems >= 1.5.0
++if Gem::VERSION >= "1.5.0"
++    module Rails
++        class GemDependency
++            def requirement
++                r = super
++                (r == Gem::Requirement.default) ? nil : r
++            end
++        end
++    end
++end
+ # Disable deprecation warnings
+ if Gem::Dependency.respond_to?('warned_version_requirement')
+   Gem::Dependency.warned_version_requirement = true

Modified: trunk/redmine/debian/patches/series
===================================================================
--- trunk/redmine/debian/patches/series	2011-03-22 00:13:53 UTC (rev 6109)
+++ trunk/redmine/debian/patches/series	2011-03-22 00:14:50 UTC (rev 6110)
@@ -7,4 +7,6 @@
 2007_disable_deprecation_warnings.patch
 2008_force_table_encoding_mysql.patch
 2009_FHS_thin_config.patch
-2010_use_i18n_0.4.1.patch
\ No newline at end of file
+2010_use_i18n_0.4.1.patch
+2011_rubygems_need_thread.patch
+2012_rubygems_version_requirement.patch