[DRE-commits] [SCM] redmine.git branch, master-experimental, updated. debian/1.4.4+dfsg1-1-93-gbf76368
Ondřej Surý
ondrej at sury.org
Thu Mar 21 14:37:24 UTC 2013
The following commit has been merged in the master-experimental branch:
commit 87ea7809101d51b0c5ee2add0b2b712fbef717fe
Author: Ondřej Surý <ondrej at sury.org>
Date: Wed Mar 20 12:36:45 2013 +0100
Update patches for 2.3.0 release
diff --git a/debian/patches/2002_FHS_through_env_vars.patch b/debian/patches/2002_FHS_through_env_vars.patch
index 795de4f..7f7f6a9 100644
--- a/debian/patches/2002_FHS_through_env_vars.patch
+++ b/debian/patches/2002_FHS_through_env_vars.patch
@@ -4,7 +4,7 @@ Author: Jérémy Lal <kapouer at melix.org>
Last-Update: 2012-01-19
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
-@@ -45,10 +45,10 @@ class Attachment < ActiveRecord::Base
+@@ -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
@@ -19,7 +19,7 @@ Last-Update: 2012-01-19
after_destroy :delete_from_disk
--- a/lib/redmine/configuration.rb
+++ b/lib/redmine/configuration.rb
-@@ -31,7 +31,7 @@ module Redmine
+@@ -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: 2012-01-19
env = options[:env] || Rails.env
@config = @defaults.dup
-@@ -102,7 +102,7 @@ module Redmine
+@@ -103,7 +103,7 @@ module Redmine
end
def load_deprecated_email_configuration(env)
@@ -39,7 +39,7 @@ Last-Update: 2012-01-19
@config.merge!({'email_delivery' => load_from_yaml(deprecated_email_conf, env)})
--- a/lib/redmine/export/pdf.rb
+++ b/lib/redmine/export/pdf.rb
-@@ -35,7 +35,7 @@ module Redmine
+@@ -38,7 +38,7 @@ module Redmine
attr_accessor :footer_date
def initialize(lang, orientation='P')
@@ -99,5 +99,5 @@ Last-Update: 2012-01-19
- @@k_path_url_cache = Rails.root.join('tmp')
+ @@k_path_url_cache = ENV['RAILS_CACHE'] ? ENV['RAILS_CACHE'] : Rails.root.join('tmp')
- cattr_accessor :decoder
-
+ attr_accessor :barcode
+
diff --git a/debian/patches/2017_Gemfile_debian.patch b/debian/patches/2017_Gemfile_debian.patch
index 8b809bc..ccc71d3 100644
--- a/debian/patches/2017_Gemfile_debian.patch
+++ b/debian/patches/2017_Gemfile_debian.patch
@@ -4,41 +4,28 @@ Author: Jérémy Lal <kapouer at melix.org>
Last-Update: 2012-05-14
--- a/Gemfile
+++ b/Gemfile
-@@ -1,86 +1,86 @@
- source 'http://rubygems.org'
+@@ -1,87 +1,5 @@
+ source 'https://rubygems.org'
--gem 'rails', '3.2.12'
+-gem "rails", "3.2.13"
-gem "jquery-rails", "~> 2.0.2"
-gem "i18n", "~> 0.6.0"
-gem "coderay", "~> 1.0.6"
-gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
-gem "builder", "3.0.0"
-+#gem 'rails', '3.2.12'
-+#gem "jquery-rails", "~> 2.0.2"
-+#gem "i18n", "~> 0.6.0"
-+#gem "coderay", "~> 1.0.6"
-+#gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
-+#gem "builder", "3.0.0"
-
- # Optional gem for LDAP authentication
+-
+-# Optional gem for LDAP authentication
-group :ldap do
- gem "net-ldap", "~> 0.3.1"
-end
-+#group :ldap do
-+# gem "net-ldap", "~> 0.3.1"
-+#end
-
- # Optional gem for OpenID authentication
+-
+-# Optional gem for OpenID authentication
-group :openid do
- gem "ruby-openid", "~> 2.1.4", :require => "openid"
- gem "rack-openid"
-end
-+#group :openid do
-+# gem "ruby-openid", "~> 2.1.4", :require => "openid"
-+# gem "rack-openid"
-+#end
-
- # Optional gem for exporting the gantt to a PNG file, not supported with jruby
+-
+-# Optional gem for exporting the gantt to a PNG file, not supported with jruby
-platforms :mri, :mingw do
- group :rmagick do
- # RMagick 2 supports ruby 1.9
@@ -47,52 +34,48 @@ Last-Update: 2012-05-14
- gem "rmagick", ">= 2.0.0"
- end
-end
-+#platforms :mri, :mingw do
-+# group :rmagick do
-+# # RMagick 2 supports ruby 1.9
-+# # RMagick 1 would be fine for ruby 1.8 but Bundler does not support
-+# # different requirements for the same gem on different platforms
-+# gem "rmagick", ">= 2.0.0"
-+# end
-+#end
-
- # Database gems
--platforms :mri, :mingw do
-- group :postgresql do
-- gem "pg", ">= 0.11.0"
-- end
--
-- group :sqlite do
-- gem "sqlite3"
-- end
--end
--
--platforms :mri_18, :mingw_18 do
-- group :mysql do
-- gem "mysql", "~> 2.8.1"
-- end
--end
--
--platforms :mri_19, :mingw_19 do
-- group :mysql do
-- gem "mysql2", "~> 0.3.11"
-- end
--end
-
-platforms :jruby do
-- gem "jruby-openssl"
--
-- group :mysql do
-- gem "activerecord-jdbcmysql-adapter"
-- end
--
-- group :postgresql do
-- gem "activerecord-jdbcpostgresql-adapter"
-- end
+- # jruby-openssl is bundled with JRuby 1.7.0
+- gem "jruby-openssl" if Object.const_defined?(:JRUBY_VERSION) && JRUBY_VERSION < '1.7.0'
+- gem "activerecord-jdbc-adapter", "1.2.5"
+-end
-
-- group :sqlite do
-- gem "activerecord-jdbcsqlite3-adapter"
+-# Include database gems for the adapters found in the database
+-# configuration file
+-require 'erb'
+-require 'yaml'
+-database_file = File.join(File.dirname(__FILE__), "config/database.yml")
+-if File.exist?(database_file)
+- database_config = YAML::load(ERB.new(IO.read(database_file)).result)
+- adapters = database_config.values.map {|c| c['adapter']}.compact.uniq
+- if adapters.any?
+- adapters.each do |adapter|
+- case adapter
+- when 'mysql2'
+- gem "mysql2", "~> 0.3.11", :platforms => [:mri, :mingw]
+- gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
+- when 'mysql'
+- gem "mysql", "~> 2.8.1", :platforms => [:mri, :mingw]
+- gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
+- when /postgresql/
+- gem "pg", ">= 0.11.0", :platforms => [:mri, :mingw]
+- gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby
+- when /sqlite3/
+- gem "sqlite3", :platforms => [:mri, :mingw]
+- gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+- when /sqlserver/
+- gem "tiny_tds", "~> 0.5.1", :platforms => [:mri, :mingw]
+- gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw]
+- else
+- warn("Unknown database adapter `#{adapter}` found in config/database.yml, use Gemfile.local to load your own database gems")
+- end
+- end
+- else
+- warn("No adapter found in config/database.yml, please configure it first")
- end
+-else
+- warn("Please configure your config/database.yml first")
-end
-
-group :development do
@@ -101,66 +84,11 @@ Last-Update: 2012-05-14
-end
-
-group :test do
-- gem "shoulda", "~> 2.11"
-- # Shoulda does not work nice on Ruby 1.9.3 and JRuby 1.7.
-- # It seems to need test-unit explicitely.
-- platforms = [:mri_19]
-- platforms << :jruby if defined?(JRUBY_VERSION) && JRUBY_VERSION >= "1.7"
-- gem "test-unit", :platforms => platforms
-- gem "mocha", "0.12.3"
+- gem "shoulda", "~> 3.3.2"
+- gem "mocha", "~> 0.13.3"
+- gem 'capybara', '~> 2.0.0'
-end
-+#platforms :mri, :mingw do
-+# group :postgresql do
-+# gem "pg", ">= 0.11.0"
-+# end
-+#
-+# group :sqlite do
-+# gem "sqlite3"
-+# end
-+#end
-+
-+#platforms :mri_18, :mingw_18 do
-+# group :mysql do
-+# gem "mysql", "~> 2.8.1"
-+# end
-+#end
-+
-+#platforms :mri_19, :mingw_19 do
-+# group :mysql do
-+# gem "mysql2", "~> 0.3.11"
-+# end
-+#end
-+
-+#platforms :jruby do
-+# gem "jruby-openssl"
-+#
-+# group :mysql do
-+# gem "activerecord-jdbcmysql-adapter"
-+# end
-+#
-+# group :postgresql do
-+# gem "activerecord-jdbcpostgresql-adapter"
-+# end
-+#
-+# group :sqlite do
-+# gem "activerecord-jdbcsqlite3-adapter"
-+# end
-+#end
-+
-+#group :development do
-+# gem "rdoc", ">= 2.4.2"
-+# gem "yard"
-+#end
-+
-+#group :test do
-+# gem "shoulda", "~> 2.11"
-+# # Shoulda does not work nice on Ruby 1.9.3 and JRuby 1.7.
-+# # It seems to need test-unit explicitely.
-+# platforms = [:mri_19]
-+# platforms << :jruby if defined?(JRUBY_VERSION) && JRUBY_VERSION >= "1.7"
-+# gem "test-unit", :platforms => platforms
-+# gem "mocha", "0.12.3"
-+#end
-
+-
local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
if File.exists?(local_gemfile)
+ puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v`
diff --git a/debian/patches/2018_get_rid_of_rdoctask.patch b/debian/patches/2018_get_rid_of_rdoctask.patch
index 187a935..7cc42f5 100644
--- a/debian/patches/2018_get_rid_of_rdoctask.patch
+++ b/debian/patches/2018_get_rid_of_rdoctask.patch
@@ -19,16 +19,6 @@
require 'rake/packagetask'
require 'rake/gempackagetask'
require 'rake/testtask'
---- a/lib/plugins/classic_pagination/Rakefile
-+++ b/lib/plugins/classic_pagination/Rakefile
-@@ -1,6 +1,6 @@
- require 'rake'
- require 'rake/testtask'
--require 'rake/rdoctask'
-+require 'rdoc/task'
-
- desc 'Default: run unit tests.'
- task :default => :test
--- a/lib/plugins/gravatar/Rakefile
+++ b/lib/plugins/gravatar/Rakefile
@@ -1,5 +1,5 @@
--
redmine.git
More information about the Pkg-ruby-extras-commits
mailing list