[DRE-commits] [redmine] 04/26: Refresh patches:
Antonio Terceiro
terceiro at moszumanska.debian.org
Sun Sep 14 17:54:45 UTC 2014
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master
in repository redmine.
commit 48b6d07f491ba6b76c9287623819067bd8f61e00
Author: Antonio Terceiro <terceiro at debian.org>
Date: Mon Aug 25 21:22:32 2014 -0300
Refresh patches:
- 2002_FHS_through_env_vars.patch
- 2003_externalize_session_config.patch
- 2019_unplug_bundler.patch
Git-Dch: Full
---
debian/patches/2002_FHS_through_env_vars.patch | 42 ++++++++---------
.../patches/2003_externalize_session_config.patch | 10 ++--
debian/patches/2019_unplug_bundler.patch | 54 +++++-----------------
3 files changed, 38 insertions(+), 68 deletions(-)
diff --git a/debian/patches/2002_FHS_through_env_vars.patch b/debian/patches/2002_FHS_through_env_vars.patch
index a9385f6..d2aeb7f 100644
--- a/debian/patches/2002_FHS_through_env_vars.patch
+++ b/debian/patches/2002_FHS_through_env_vars.patch
@@ -2,10 +2,10 @@ Description: FHS through env vars
Forwarded: not-needed
Author: Jérémy Lal <kapouer at melix.org>
Last-Update: 2013-09-28
---- 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"}
+--- a/app/models/attachment.rb
++++ b/app/models/attachment.rb
+@@ -47,10 +47,10 @@ class Attachment < ActiveRecord::Base
+ "LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id")
cattr_accessor :storage_path
- @@storage_path = Redmine::Configuration['attachments_storage_path'] || File.join(Rails.root, "files")
@@ -17,8 +17,8 @@ Last-Update: 2013-09-28
before_save :files_to_final_location
after_destroy :delete_from_disk
---- redmine.orig/lib/redmine/configuration.rb
-+++ redmine/lib/redmine/configuration.rb
+--- a/lib/redmine/configuration.rb
++++ b/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)
@@ -28,7 +28,7 @@ Last-Update: 2013-09-28
env = options[:env] || Rails.env
@config = @defaults.dup
-@@ -103,7 +103,7 @@ module Redmine
+@@ -106,7 +106,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)})
---- redmine.orig/lib/redmine/export/pdf.rb
-+++ redmine/lib/redmine/export/pdf.rb
-@@ -38,7 +38,7 @@ module Redmine
+--- a/lib/redmine/export/pdf.rb
++++ b/lib/redmine/export/pdf.rb
+@@ -34,7 +34,7 @@ module Redmine
attr_accessor :footer_date
def initialize(lang, orientation='P')
@@ -48,8 +48,8 @@ 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
---- redmine.orig/config/application.rb
-+++ redmine/config/application.rb
+--- a/config/application.rb
++++ b/config/application.rb
@@ -2,6 +2,17 @@ require File.expand_path('../boot', __FI
require 'rails/all'
@@ -65,10 +65,10 @@ Last-Update: 2013-09-28
+ENV['RAILS_VAR'] ||= "/var/lib/redmine/#{ENV['X_DEBIAN_SITEID']}"
+ENV['RAILS_TMP'] ||= "/var/cache/redmine/#{ENV['X_DEBIAN_SITEID']}"
+
- if defined?(Bundler)
- # If you precompile assets before deploying to production, use this line
- Bundler.require(*Rails.groups(:assets => %w(development test)))
-@@ -52,8 +63,19 @@ module RedmineApp
+ Bundler.require(*Rails.groups)
+
+ module RedmineApp
+@@ -47,8 +58,19 @@ module RedmineApp
# Do not include all helpers
config.action_controller.include_all_helpers = false
@@ -88,8 +88,8 @@ 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
---- redmine.orig/lib/plugins/rfpdf/lib/tcpdf.rb
-+++ redmine/lib/plugins/rfpdf/lib/tcpdf.rb
+--- a/lib/plugins/rfpdf/lib/tcpdf.rb
++++ b/lib/plugins/rfpdf/lib/tcpdf.rb
@@ -89,10 +89,10 @@ class TCPDF
@@k_small_ratio = 2/3.0
@@ -103,9 +103,9 @@ Last-Update: 2013-09-28
attr_accessor :barcode
---- redmine.orig/lib/redmine/scm/adapters/abstract_adapter.rb
-+++ redmine/lib/redmine/scm/adapters/abstract_adapter.rb
-@@ -222,7 +222,7 @@ module Redmine
+--- a/lib/redmine/scm/adapters/abstract_adapter.rb
++++ b/lib/redmine/scm/adapters/abstract_adapter.rb
+@@ -218,7 +218,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 20bc678..8046947 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
---- redmine.orig/lib/tasks/initializers.rake
-+++ redmine/lib/tasks/initializers.rake
+--- a/lib/tasks/initializers.rake
++++ b/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']
---- redmine.orig/config/application.rb
-+++ redmine/config/application.rb
-@@ -66,7 +66,20 @@ module RedmineApp
+--- a/config/application.rb
++++ b/config/application.rb
+@@ -61,7 +61,20 @@ module RedmineApp
# move tmp directory to RAILS_TMP
config.paths['tmp'] = ENV['RAILS_TMP']
diff --git a/debian/patches/2019_unplug_bundler.patch b/debian/patches/2019_unplug_bundler.patch
index ca18fe8..0739028 100644
--- a/debian/patches/2019_unplug_bundler.patch
+++ b/debian/patches/2019_unplug_bundler.patch
@@ -3,9 +3,9 @@ Description: redmine package shouldn't need bundler to run
Forwarded: not-needed, i'm not ruby expert enough to convince upstream about changing that
Author: Jérémy Lal <kapouer at melix.org>
Last-Update: 2013-09-28
---- redmine.orig/config/boot.rb
-+++ redmine/config/boot.rb
-@@ -3,4 +3,6 @@ require 'rubygems'
+--- a/config/boot.rb
++++ b/config/boot.rb
+@@ -1,4 +1,6 @@
# Set up gems listed in the Gemfile.
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
@@ -13,44 +13,14 @@ Last-Update: 2013-09-28
+# disable bundler setup
+# require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+
---- redmine.orig/config/preinitializer.rb
-+++ redmine/config/preinitializer.rb
-@@ -1,20 +1,20 @@
--begin
-- require "rubygems"
-- require "bundler"
--rescue LoadError
-- $stderr.puts "Redmine requires Bundler. Please install it with `gem install bundler`."
-- exit 1
--end
-+#begin
-+# require "rubygems"
-+# require "bundler"
-+#rescue LoadError
-+# $stderr.puts "Redmine requires Bundler. Please install it with `gem install bundler`."
-+# exit 1
-+#end
+--- a/config/application.rb
++++ b/config/application.rb
+@@ -14,7 +14,7 @@ ENV['RAILS_LOG'] ||= "/var/log/redmine/#
+ ENV['RAILS_VAR'] ||= "/var/lib/redmine/#{ENV['X_DEBIAN_SITEID']}"
+ ENV['RAILS_TMP'] ||= "/var/cache/redmine/#{ENV['X_DEBIAN_SITEID']}"
--if Gem::Version.new(Bundler::VERSION) < Gem::Version.new("1.0.21")
-- $stderr.puts "Redmine requires Bundler 1.0.21 (you're using #{Bundler::VERSION}).\nPlease install a newer version with `gem install bundler`."
-- exit 1
--end
-+#if Gem::Version.new(Bundler::VERSION) < Gem::Version.new("1.0.21")
-+# $stderr.puts "Redmine requires Bundler 1.0.21 (you're using #{Bundler::VERSION}).\nPlease install a newer version with `gem install bundler`."
-+# exit 1
-+#end
+-Bundler.require(*Rails.groups)
++# Bundler.require(*Rails.groups)
--begin
-- ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
-- Bundler.setup
--rescue Bundler::GemNotFound
-- $stderr.puts "Some gems may need to be installed or updated.\nPlease run `bundle install --without development test`."
-- exit 1
--end
-+#begin
-+# ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
-+# Bundler.setup
-+#rescue Bundler::GemNotFound
-+# $stderr.puts "Some gems may need to be installed or updated.\nPlease run `bundle install --without development test`."
-+# exit 1
-+#end
+ module RedmineApp
+ class Application < Rails::Application
--
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