[DRE-commits] [SCM] redmine.git branch, master-experimental, updated. debian/1.4.4+dfsg1-1-5-g7f1f228

Jérémy Lal kapouer at melix.org
Thu Oct 11 10:25:40 UTC 2012


The following commit has been merged in the master-experimental branch:
commit 3357338acd0a502254877886560f7b25ca12c6c0
Author: Jérémy Lal <kapouer at melix.org>
Date:   Mon May 14 14:43:00 2012 +0200

    Delete unapplied patches.

diff --git a/debian/patches/2001_fix_shebang_interpreter.patch b/debian/patches/2001_fix_shebang_interpreter.patch
deleted file mode 100644
index 86b1fe9..0000000
--- a/debian/patches/2001_fix_shebang_interpreter.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Description: Fix shebang interpreter
-Forwarded: not-needed
-Author: Jérémy Lal <kapouer at melix.org>
-Last-Update: 2010-01-09
---- a/lib/faster_csv.rb
-+++ b/lib/faster_csv.rb
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ruby -w
-+#!/usr/bin/ruby1.8 -w
- 
- # = faster_csv.rb -- Faster CSV Reading and Writing
- #
diff --git a/debian/patches/2014_relax_RAILS_GEM_VERSION.patch b/debian/patches/2014_relax_RAILS_GEM_VERSION.patch
deleted file mode 100644
index cb2e497..0000000
--- a/debian/patches/2014_relax_RAILS_GEM_VERSION.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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.14' unless defined? RAILS_GEM_VERSION
-+# RAILS_GEM_VERSION = '2.3.14' unless defined? RAILS_GEM_VERSION
- 
- if RUBY_VERSION >= '1.9'
-   Encoding.default_external = 'UTF-8'
diff --git a/debian/patches/2015_use_system_coderay.patch b/debian/patches/2015_use_system_coderay.patch
deleted file mode 100644
index 4004b44..0000000
--- a/debian/patches/2015_use_system_coderay.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
-@@ -88,7 +88,7 @@
-   config.action_mailer.perform_deliveries = false
- 
-   config.gem 'rubytree', :lib => 'tree'
--  config.gem 'coderay', :version => '~>1.0.0'
-+  # config.gem 'coderay', :version => '~>1.0.0'
- 
-   # Load any local configuration that is kept out of source control
-   # (e.g. gems, patches).

-- 
redmine.git



More information about the Pkg-ruby-extras-commits mailing list