[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 b677cdb9bd259936aaf5e69e96b5c44cb3207d29
Author: Jérémy Lal <kapouer at melix.org>
Date:   Tue Aug 23 15:54:50 2011 +0200

    Use system coderay, not gem.

diff --git a/debian/patches/2015_use_system_coderay.patch b/debian/patches/2015_use_system_coderay.patch
new file mode 100644
index 0000000..db76efc
--- /dev/null
+++ b/debian/patches/2015_use_system_coderay.patch
@@ -0,0 +1,15 @@
+Description: Use coderay from debian package.
+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
+@@ -85,7 +85,7 @@
+   config.action_mailer.perform_deliveries = false
+ 
+   config.gem 'rubytree', :lib => 'tree'
+-  config.gem 'coderay', :version => '~>0.9.7'
++  # config.gem 'coderay', :version => '~>0.9.7'
+   
+   # Load any local configuration that is kept out of source control
+   # (e.g. gems, patches).
diff --git a/debian/patches/series b/debian/patches/series
index 5a6f612..d9a35a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
 2010_use_i18n_0.4.1.patch
 1013_indent_subject_exported_pdf.patch
 2014_relax_RAILS_GEM_VERSION.patch
+2015_use_system_coderay.patch

-- 
redmine.git