[DRE-commits] [redmine] 03/05: Refresh patches
Antonio Terceiro
terceiro at moszumanska.debian.org
Sat Mar 19 22:39:32 UTC 2016
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master
in repository redmine.
commit 3f33f0271ee88a5175d5fd73f0525b1e096b26c2
Author: Antonio Terceiro <terceiro at debian.org>
Date: Sat Mar 19 19:07:19 2016 -0300
Refresh patches
---
debian/changelog | 1 +
debian/patches/0001-Gemfile-relax-some-dependencies.patch | 12 ++++++------
debian/patches/0004-Add-multi-tenancy-support.patch | 12 ++++++------
debian/patches/0005-Assume-default-instance.patch | 4 ++--
4 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ab38469..3aa1af1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
redmine (3.2.1-1) UNRELEASED; urgency=medium
* New upstream release
+ * Refresh patches
-- Antonio Terceiro <terceiro at debian.org> Sat, 19 Mar 2016 19:00:01 -0300
diff --git a/debian/patches/0001-Gemfile-relax-some-dependencies.patch b/debian/patches/0001-Gemfile-relax-some-dependencies.patch
index 6ab1d7d..04d7738 100644
--- a/debian/patches/0001-Gemfile-relax-some-dependencies.patch
+++ b/debian/patches/0001-Gemfile-relax-some-dependencies.patch
@@ -7,14 +7,14 @@ Subject: Gemfile: relax some dependencies
1 file changed, 7 insertions(+), 22 deletions(-)
diff --git a/Gemfile b/Gemfile
-index 3ad9b1e..cb0b631 100644
+index 7092e2c..bb92e97 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,11 +4,11 @@ if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.5.0')
abort "Redmine requires Bundler 1.5.0 or higher (you're using #{Bundler::VERSION}).\nPlease update with 'gem update bundler'."
end
--gem "rails", "4.2.5"
+-gem "rails", "4.2.5.2"
-gem "jquery-rails", "~> 3.1.4"
+gem "rails", "~> 4.2.5"
+gem "jquery-rails", "~> 4.0"
@@ -25,7 +25,7 @@ index 3ad9b1e..cb0b631 100644
gem "mime-types"
gem "protected_attributes"
gem "actionpack-action_caching"
-@@ -21,12 +21,12 @@ gem "rbpdf", "~> 1.19.0"
+@@ -27,12 +27,12 @@ gem "rbpdf", "~> 1.19.0"
# Optional gem for LDAP authentication
group :ldap do
@@ -40,7 +40,7 @@ index 3ad9b1e..cb0b631 100644
gem "rack-openid"
end
-@@ -38,7 +38,7 @@ platforms :mri, :mingw, :x64_mingw do
+@@ -44,7 +44,7 @@ platforms :mri, :mingw, :x64_mingw do
# Optional Markdown support, not for JRuby
group :markdown do
@@ -49,7 +49,7 @@ index 3ad9b1e..cb0b631 100644
end
end
-@@ -60,7 +60,7 @@ if File.exist?(database_file)
+@@ -66,7 +66,7 @@ if File.exist?(database_file)
adapters.each do |adapter|
case adapter
when 'mysql2'
@@ -58,7 +58,7 @@ index 3ad9b1e..cb0b631 100644
gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
when 'mysql'
gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
-@@ -85,21 +85,6 @@ else
+@@ -91,21 +91,6 @@ else
warn("Please configure your config/database.yml first")
end
diff --git a/debian/patches/0004-Add-multi-tenancy-support.patch b/debian/patches/0004-Add-multi-tenancy-support.patch
index fdb2f47..fa15fc3 100644
--- a/debian/patches/0004-Add-multi-tenancy-support.patch
+++ b/debian/patches/0004-Add-multi-tenancy-support.patch
@@ -46,10 +46,10 @@ index 173b030..d9e39ef 100644
/lib/redmine/scm/adapters/mercurial/redminehelper.pyo
/log/*.log*
diff --git a/Gemfile b/Gemfile
-index cb0b631..4a46396 100644
+index bb92e97..a4a3039 100644
--- a/Gemfile
+++ b/Gemfile
-@@ -52,7 +52,14 @@ end
+@@ -58,7 +58,14 @@ end
# configuration file
require 'erb'
require 'yaml'
@@ -66,7 +66,7 @@ index cb0b631..4a46396 100644
database_config = YAML::load(ERB.new(IO.read(database_file)).result)
adapters = database_config.values.map {|c| c['adapter']}.compact.uniq
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
-index 0064555..c75fd25 100644
+index 3d16f57..25fd394 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -47,10 +47,10 @@ class Attachment < ActiveRecord::Base
@@ -442,7 +442,7 @@ index 48be8dd..1bcbbe4 100644
require 'memcache'
require 'openid/store/memcache'
diff --git a/lib/redmine/configuration.rb b/lib/redmine/configuration.rb
-index 9109a00..3d93ff7 100644
+index 9ab008e..132a911 100644
--- a/lib/redmine/configuration.rb
+++ b/lib/redmine/configuration.rb
@@ -32,7 +32,7 @@ module Redmine
@@ -464,7 +464,7 @@ index 9109a00..3d93ff7 100644
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)})
diff --git a/lib/redmine/export/pdf.rb b/lib/redmine/export/pdf.rb
-index d14bbd8..309b83a 100644
+index fd79c37..1bbd44c 100644
--- a/lib/redmine/export/pdf.rb
+++ b/lib/redmine/export/pdf.rb
@@ -27,7 +27,7 @@ module Redmine
@@ -526,7 +526,7 @@ index 0000000..0d100f7
+
+end
diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
-index 98683b0..f525bb7 100644
+index 9ed8b25..5b745cd 100644
--- a/lib/redmine/scm/adapters/abstract_adapter.rb
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
@@ -218,7 +218,7 @@ module Redmine
diff --git a/debian/patches/0005-Assume-default-instance.patch b/debian/patches/0005-Assume-default-instance.patch
index c95cd01..e4bead7 100644
--- a/debian/patches/0005-Assume-default-instance.patch
+++ b/debian/patches/0005-Assume-default-instance.patch
@@ -8,10 +8,10 @@ Subject: Assume default instance
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Gemfile b/Gemfile
-index 4a46396..8839669 100644
+index a4a3039..f254ff0 100644
--- a/Gemfile
+++ b/Gemfile
-@@ -56,7 +56,7 @@ require 'yaml'
+@@ -62,7 +62,7 @@ require 'yaml'
# XXX this duplicates logic in lib/redmine/multi_tenancy.rb, but we can't load
# XXX that at this point. X_DEBIAN_SITEID is kept for compatibility with
# existing XXX Debian installations.
--
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