[DRE-commits] [redmine] 02/03: Update patches for 2.4.2 release
Ondrej Sury
ondrej at moszumanska.debian.org
Tue Jan 28 11:08:46 UTC 2014
This is an automated email from the git hooks/post-receive script.
ondrej pushed a commit to branch master
in repository redmine.
commit d53022880da174434cff8f4eac4180db0056a83c
Author: Ondřej Surý <ondrej at sury.org>
Date: Tue Jan 28 11:24:57 2014 +0100
Update patches for 2.4.2 release
---
debian/patches/1001_Parsedate.parsedate.patch | 16 ++-------
debian/patches/1002_REST_API_ruby1.9.3.patch | 14 --------
debian/patches/2002_FHS_through_env_vars.patch | 40 +++++++++++-----------
.../patches/2003_externalize_session_config.patch | 10 +++---
debian/patches/2004_FHS_plugins_assets.patch | 4 +--
.../patches/2008_force_table_encoding_mysql.patch | 4 +--
debian/patches/2009_FHS_thin_config.patch | 4 +--
debian/patches/2017_Gemfile_debian.patch | 2 +-
debian/patches/2018_get_rid_of_rdoctask.patch | 16 ++++-----
debian/patches/series | 1 -
10 files changed, 42 insertions(+), 69 deletions(-)
diff --git a/debian/patches/1001_Parsedate.parsedate.patch b/debian/patches/1001_Parsedate.parsedate.patch
index e42e01f..8ad6832 100644
--- a/debian/patches/1001_Parsedate.parsedate.patch
+++ b/debian/patches/1001_Parsedate.parsedate.patch
@@ -2,8 +2,8 @@ Description: Replace missing ParseDate with DateTime (Closes: #700754)
Origin: upstream, http://www.redmine.org/projects/redmine/repository/revisions/10439
Origin: upstream, http://www.redmine.org/projects/redmine/repository/revisions/11091
Last-Update: 2013-02-26
---- a/lib/SVG/Graph/Schedule.rb
-+++ b/lib/SVG/Graph/Schedule.rb
+--- redmine.orig/lib/SVG/Graph/Schedule.rb
++++ redmine/lib/SVG/Graph/Schedule.rb
@@ -159,8 +159,7 @@ module SVG
if im3 == 0
y << data[:data][i]
@@ -14,15 +14,3 @@ Last-Update: 2013-02-26
(im3 == 1 ? x_start : x_end) << t.to_i
end
}
---- a/lib/SVG/Graph/TimeSeries.rb
-+++ b/lib/SVG/Graph/TimeSeries.rb
-@@ -157,8 +157,7 @@ module SVG
- y = []
- data[:data].each_index {|i|
- if i%2 == 0
-- arr = ParseDate.parsedate( data[:data][i] )
-- t = Time.local( *arr[0,6].compact )
-+ t = DateTime.parse( data[:data][i] ).to_time
- x << t.to_i
- else
- y << data[:data][i]
diff --git a/debian/patches/1002_REST_API_ruby1.9.3.patch b/debian/patches/1002_REST_API_ruby1.9.3.patch
deleted file mode 100644
index 8d66f8f..0000000
--- a/debian/patches/1002_REST_API_ruby1.9.3.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Fix broken REST API (Closes: #700009)
-Origin: upstream, http://www.redmine.org/projects/redmine/repository/revisions/10299
-Last-Update: 2013-02-26
---- a/lib/redmine/views/builders/xml.rb
-+++ b/lib/redmine/views/builders/xml.rb
-@@ -29,7 +29,7 @@ module Redmine
- end
-
- def method_missing(sym, *args, &block)
-- if args.size == 1 && args.first.is_a?(Time)
-+ if args.size == 1 && args.first.is_a?(::Time)
- __send__ sym, args.first.xmlschema, &block
- else
- super
diff --git a/debian/patches/2002_FHS_through_env_vars.patch b/debian/patches/2002_FHS_through_env_vars.patch
index 28a84c6..1280ec0 100644
--- a/debian/patches/2002_FHS_through_env_vars.patch
+++ b/debian/patches/2002_FHS_through_env_vars.patch
@@ -2,9 +2,9 @@ Description: FHS through env vars
Forwarded: not-needed
Author: Jérémy Lal <kapouer at melix.org>
Last-Update: 2013-09-28
---- a/app/models/attachment.rb
-+++ b/app/models/attachment.rb
-@@ -46,10 +46,10 @@
+--- redmine.orig/app/models/attachment.rb
++++ redmine/app/models/attachment.rb
+@@ -46,10 +46,10 @@ class Attachment < ActiveRecord::Base
"LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id"}
cattr_accessor :storage_path
@@ -17,9 +17,9 @@ Last-Update: 2013-09-28
before_save :files_to_final_location
after_destroy :delete_from_disk
---- a/lib/redmine/configuration.rb
-+++ b/lib/redmine/configuration.rb
-@@ -32,7 +32,7 @@
+--- redmine.orig/lib/redmine/configuration.rb
++++ redmine/lib/redmine/configuration.rb
+@@ -32,7 +32,7 @@ module Redmine
# * <tt>:file</tt>: the configuration file to load (default: config/configuration.yml)
# * <tt>:env</tt>: the environment to load the configuration for (default: Rails.env)
def load(options={})
@@ -28,7 +28,7 @@ Last-Update: 2013-09-28
env = options[:env] || Rails.env
@config = @defaults.dup
-@@ -103,7 +103,7 @@
+@@ -103,7 +103,7 @@ module Redmine
end
def load_deprecated_email_configuration(env)
@@ -37,9 +37,9 @@ Last-Update: 2013-09-28
if File.file?(deprecated_email_conf)
warn "Storing outgoing emails configuration in config/email.yml is deprecated. You should now store it in config/configuration.yml using the email_delivery setting."
@config.merge!({'email_delivery' => load_from_yaml(deprecated_email_conf, env)})
---- a/lib/redmine/export/pdf.rb
-+++ b/lib/redmine/export/pdf.rb
-@@ -38,7 +38,7 @@
+--- redmine.orig/lib/redmine/export/pdf.rb
++++ redmine/lib/redmine/export/pdf.rb
+@@ -38,7 +38,7 @@ module Redmine
attr_accessor :footer_date
def initialize(lang, orientation='P')
@@ -48,9 +48,9 @@ Last-Update: 2013-09-28
FileUtils.mkdir_p @@k_path_cache unless File::exist?(@@k_path_cache)
set_language_if_valid lang
pdf_encoding = l(:general_pdf_encoding).upcase
---- a/config/application.rb
-+++ b/config/application.rb
-@@ -2,6 +2,17 @@
+--- redmine.orig/config/application.rb
++++ redmine/config/application.rb
+@@ -2,6 +2,17 @@ require File.expand_path('../boot', __FI
require 'rails/all'
@@ -68,7 +68,7 @@ Last-Update: 2013-09-28
if defined?(Bundler)
# If you precompile assets before deploying to production, use this line
Bundler.require(*Rails.groups(:assets => %w(development test)))
-@@ -53,8 +64,19 @@
+@@ -52,8 +63,19 @@ module RedmineApp
# Do not include all helpers
config.action_controller.include_all_helpers = false
@@ -88,9 +88,9 @@ Last-Update: 2013-09-28
if File.exists?(File.join(File.dirname(__FILE__), 'additional_environment.rb'))
instance_eval File.read(File.join(File.dirname(__FILE__), 'additional_environment.rb'))
end
---- a/lib/plugins/rfpdf/lib/tcpdf.rb
-+++ b/lib/plugins/rfpdf/lib/tcpdf.rb
-@@ -89,10 +89,10 @@
+--- redmine.orig/lib/plugins/rfpdf/lib/tcpdf.rb
++++ redmine/lib/plugins/rfpdf/lib/tcpdf.rb
+@@ -89,10 +89,10 @@ class TCPDF
@@k_small_ratio = 2/3.0
cattr_accessor :k_path_cache
@@ -103,9 +103,9 @@ Last-Update: 2013-09-28
attr_accessor :barcode
---- a/lib/redmine/scm/adapters/abstract_adapter.rb
-+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
-@@ -224,7 +224,7 @@
+--- redmine.orig/lib/redmine/scm/adapters/abstract_adapter.rb
++++ redmine/lib/redmine/scm/adapters/abstract_adapter.rb
+@@ -221,7 +221,7 @@ module Redmine
if @stderr_log_file.nil?
writable = false
path = Redmine::Configuration['scm_stderr_log_file'].presence
diff --git a/debian/patches/2003_externalize_session_config.patch b/debian/patches/2003_externalize_session_config.patch
index 10c148d..20bc678 100644
--- a/debian/patches/2003_externalize_session_config.patch
+++ b/debian/patches/2003_externalize_session_config.patch
@@ -2,8 +2,8 @@ Description: Externalize session config to yml in /etc
Forwarded: not-needed
Author: Jérémy Lal <kapouer at melix.org>
Last-Update: 2010-01-10
---- a/lib/tasks/initializers.rake
-+++ b/lib/tasks/initializers.rake
+--- redmine.orig/lib/tasks/initializers.rake
++++ redmine/lib/tasks/initializers.rake
@@ -1,11 +1,14 @@
desc 'Generates a secret token for the application.'
+task :generate_secret_token do
@@ -48,9 +48,9 @@ Last-Update: 2010-01-10
-
-desc 'Generates a secret token for the application.'
-task :generate_secret_token => ['config/initializers/secret_token.rb']
---- a/config/application.rb
-+++ b/config/application.rb
-@@ -67,7 +67,20 @@ module RedmineApp
+--- redmine.orig/config/application.rb
++++ redmine/config/application.rb
+@@ -66,7 +66,20 @@ module RedmineApp
# move tmp directory to RAILS_TMP
config.paths['tmp'] = ENV['RAILS_TMP']
diff --git a/debian/patches/2004_FHS_plugins_assets.patch b/debian/patches/2004_FHS_plugins_assets.patch
index 275ee5c..d9a6844 100644
--- a/debian/patches/2004_FHS_plugins_assets.patch
+++ b/debian/patches/2004_FHS_plugins_assets.patch
@@ -1,5 +1,5 @@
---- a/lib/redmine/plugin.rb
-+++ b/lib/redmine/plugin.rb
+--- redmine.orig/lib/redmine/plugin.rb
++++ redmine/lib/redmine/plugin.rb
@@ -47,7 +47,7 @@ module Redmine #:nodoc:
self.directory = File.join(Rails.root, 'plugins')
diff --git a/debian/patches/2008_force_table_encoding_mysql.patch b/debian/patches/2008_force_table_encoding_mysql.patch
index add3c4c..74265d3 100644
--- a/debian/patches/2008_force_table_encoding_mysql.patch
+++ b/debian/patches/2008_force_table_encoding_mysql.patch
@@ -7,8 +7,8 @@ Author: Jérémy Lal <kapouer at melix.org>
Bug-Debian: http://bugs.debian.org/599374
Bug-Rails: http://rails.lighthouseapp.com/projects/8994/tickets/5830
Last-Update: 2010-10-17
---- a/config/initializers/10-patches.rb
-+++ b/config/initializers/10-patches.rb
+--- redmine.orig/config/initializers/10-patches.rb
++++ redmine/config/initializers/10-patches.rb
@@ -1,4 +1,19 @@
require 'active_record'
+require 'active_record/connection_adapters/abstract_mysql_adapter'
diff --git a/debian/patches/2009_FHS_thin_config.patch b/debian/patches/2009_FHS_thin_config.patch
index f66f974..1ad1d70 100644
--- a/debian/patches/2009_FHS_thin_config.patch
+++ b/debian/patches/2009_FHS_thin_config.patch
@@ -3,8 +3,8 @@ Description: FHS support for thin config
Forwarded: not-needed
Author: Jérémy Lal <kapouer at melix.org>
Last-Update: 2010-11-01
---- a/config/application.rb
-+++ b/config/application.rb
+--- redmine.orig/config/application.rb
++++ redmine/config/application.rb
@@ -7,6 +7,7 @@ Rails.env ||= ActiveSupport::StringInqui
# for debian package : setup proper environment variables and paths
diff --git a/debian/patches/2017_Gemfile_debian.patch b/debian/patches/2017_Gemfile_debian.patch
index 51555a6..0bc8377 100644
--- a/debian/patches/2017_Gemfile_debian.patch
+++ b/debian/patches/2017_Gemfile_debian.patch
@@ -3,7 +3,7 @@
@@ -1,90 +1,5 @@
source 'https://rubygems.org'
--gem "rails", "3.2.15"
+-gem "rails", "3.2.16"
-gem "jquery-rails", "~> 2.0.2"
-gem "coderay", "~> 1.1.0"
-gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
diff --git a/debian/patches/2018_get_rid_of_rdoctask.patch b/debian/patches/2018_get_rid_of_rdoctask.patch
index 7cc42f5..31072f0 100644
--- a/debian/patches/2018_get_rid_of_rdoctask.patch
+++ b/debian/patches/2018_get_rid_of_rdoctask.patch
@@ -1,5 +1,5 @@
---- a/lib/plugins/acts_as_tree/Rakefile
-+++ b/lib/plugins/acts_as_tree/Rakefile
+--- redmine.orig/lib/plugins/acts_as_tree/Rakefile
++++ redmine/lib/plugins/acts_as_tree/Rakefile
@@ -1,6 +1,6 @@
require 'rake'
require 'rake/testtask'
@@ -8,8 +8,8 @@
desc 'Default: run unit tests.'
task :default => :test
---- a/lib/plugins/acts_as_versioned/Rakefile
-+++ b/lib/plugins/acts_as_versioned/Rakefile
+--- redmine.orig/lib/plugins/acts_as_versioned/Rakefile
++++ redmine/lib/plugins/acts_as_versioned/Rakefile
@@ -2,7 +2,7 @@ require 'rubygems'
Gem::manage_gems
@@ -19,8 +19,8 @@
require 'rake/packagetask'
require 'rake/gempackagetask'
require 'rake/testtask'
---- a/lib/plugins/gravatar/Rakefile
-+++ b/lib/plugins/gravatar/Rakefile
+--- redmine.orig/lib/plugins/gravatar/Rakefile
++++ redmine/lib/plugins/gravatar/Rakefile
@@ -1,5 +1,5 @@
require 'spec/rake/spectask'
-require 'rake/rdoctask'
@@ -28,8 +28,8 @@
desc 'Default: run all specs'
task :default => :spec
---- a/lib/plugins/open_id_authentication/Rakefile
-+++ b/lib/plugins/open_id_authentication/Rakefile
+--- redmine.orig/lib/plugins/open_id_authentication/Rakefile
++++ redmine/lib/plugins/open_id_authentication/Rakefile
@@ -1,6 +1,6 @@
require 'rake'
require 'rake/testtask'
diff --git a/debian/patches/series b/debian/patches/series
index f90e540..90657b3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,3 @@
2019_unplug_bundler.patch
2017_Gemfile_debian.patch
1001_Parsedate.parsedate.patch
-1002_REST_API_ruby1.9.3.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/redmine.git
More information about the Pkg-ruby-extras-commits
mailing list