[DRE-commits] r6108 - in trunk/redmine/debian: . patches

[Jérémy Lal]

Author: kapouer-guest
Date: 2011-03-22 00:12:56 +0000 (Tue, 22 Mar 2011)
New Revision: 6108

Removed:
   trunk/redmine/debian/patches/2011_no_config_gem_coderay.patch
Modified:
   trunk/redmine/debian/control
   trunk/redmine/debian/install
   trunk/redmine/debian/patches/2006_fix_shebang_interpreter.patch
   trunk/redmine/debian/patches/series
Log:
Revert "Depend on coderay 0.9.7"

This reverts commit 53c1b85d692beca5b6dfa6e4639913c3f26cf8b3.

Modified: trunk/redmine/debian/control
===================================================================
--- trunk/redmine/debian/control	2011-03-15 12:02:42 UTC (rev 6107)
+++ trunk/redmine/debian/control	2011-03-22 00:12:56 UTC (rev 6108)
@@ -14,7 +14,7 @@
 Package: redmine
 Architecture: all
 Pre-Depends: debconf
-Depends: ruby, ruby1.8 (>= 1.8.7), rails (>= 2.3.5), libactivesupport-ruby (>= 2.3.5), libactiveresource-ruby (>= 2.3.5), libactionpack-ruby (>= 2.3.5), libactionmailer-ruby (>= 2.3.5), libjs-scriptaculous (>= 1.8.2), libcoderay-ruby (>= 0.9.7), dbconfig-common, redmine-sqlite | redmine-mysql | redmine-pgsql, ${misc:Depends}
+Depends: ruby, ruby1.8 (>= 1.8.7), rails (>= 2.3.5), libactivesupport-ruby (>= 2.3.5), libactiveresource-ruby (>= 2.3.5), libactionpack-ruby (>= 2.3.5), libactionmailer-ruby (>= 2.3.5), libjs-scriptaculous (>= 1.8.2), dbconfig-common, redmine-sqlite | redmine-mysql | redmine-pgsql, ${misc:Depends}
 Breaks: redmine-plugin-botsfilter (<=1.02-1)
 Suggests: libsvn-ruby (>= 1.3), librmagick-ruby, libopenid-ruby
 Description: flexible project management web application

Modified: trunk/redmine/debian/install
===================================================================
--- trunk/redmine/debian/install	2011-03-15 12:02:42 UTC (rev 6107)
+++ trunk/redmine/debian/install	2011-03-22 00:12:56 UTC (rev 6108)
@@ -9,5 +9,5 @@
 script usr/share/redmine
 test usr/share/redmine
 vendor/plugins usr/share/redmine/vendor
-vendor/gems/rubytree-0.5.2 usr/share/redmine/vendor/gems
+vendor/gems usr/share/redmine/vendor
 debian/conf/*.template usr/share/redmine/templates

Modified: trunk/redmine/debian/patches/2006_fix_shebang_interpreter.patch
===================================================================
--- trunk/redmine/debian/patches/2006_fix_shebang_interpreter.patch	2011-03-15 12:02:42 UTC (rev 6107)
+++ trunk/redmine/debian/patches/2006_fix_shebang_interpreter.patch	2011-03-22 00:12:56 UTC (rev 6108)
@@ -1,9 +1,9 @@
 Description: Fix shebang interpreter
 Forwarded: not-needed
 Author: Jérémy Lal <kapouer at melix.org>
-Last-Update: 2011-01-30
---- redmine-1.0.0.orig/vendor/gems/coderay-0.9.7/lib/coderay/helpers/file_type.rb
-+++ redmine-1.0.0/vendor/gems/coderay-0.9.7/lib/coderay/helpers/file_type.rb
+Last-Update: 2010-02-28
+--- redmine-1.0.0.orig/vendor/plugins/coderay-0.9.2/lib/coderay/helpers/file_type.rb
++++ redmine-1.0.0/vendor/plugins/coderay-0.9.2/lib/coderay/helpers/file_type.rb
 @@ -1,4 +1,3 @@
 -#!/usr/bin/env ruby
  module CodeRay

Deleted: trunk/redmine/debian/patches/2011_no_config_gem_coderay.patch
===================================================================
--- trunk/redmine/debian/patches/2011_no_config_gem_coderay.patch	2011-03-15 12:02:42 UTC (rev 6107)
+++ trunk/redmine/debian/patches/2011_no_config_gem_coderay.patch	2011-03-22 00:12:56 UTC (rev 6108)
@@ -1,15 +0,0 @@
-Description: Work around config.gem too dumb #405789
- coderay package is required, but rubygems does not see it's there.
-Forwarded: not-needed
-Author: Jérémy Lal <kapouer at melix.org>
-Last-Update: 2011-02-20
---- a/config/environment.rb
-+++ b/config/environment.rb
-@@ -90,7 +90,6 @@
-   config.action_mailer.perform_deliveries = false
- 
-   config.gem 'rubytree', :lib => 'tree'
--  config.gem 'coderay', :version => '~>0.9.7'
-   
-   # Load any local configuration that is kept out of source control
-   # (e.g. gems, patches).

Modified: trunk/redmine/debian/patches/series
===================================================================
--- trunk/redmine/debian/patches/series	2011-03-15 12:02:42 UTC (rev 6107)
+++ trunk/redmine/debian/patches/series	2011-03-22 00:12:56 UTC (rev 6108)
@@ -7,5 +7,4 @@
 2007_disable_deprecation_warnings.patch
 2008_force_table_encoding_mysql.patch
 2009_FHS_thin_config.patch
-2010_use_i18n_0.4.1.patch
-2011_no_config_gem_coderay.patch
+2010_use_i18n_0.4.1.patch
\ No newline at end of file