[DRE-commits] [redmine] 07/10: New upstream release + refresh patches

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository redmine.

commit 31cd3a80da378e3b5692ec99c53a8e2f99001fb9
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Jun 5 14:12:40 2016 -0300

    New upstream release + refresh patches
---
 debian/changelog                                     |  4 +++-
 .../0001-Gemfile-relax-some-dependencies.patch       | 20 +++++++++++---------
 debian/patches/0004-Add-multi-tenancy-support.patch  |  8 ++++----
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9b5c440..037412e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-redmine (3.2.1-3) UNRELEASED; urgency=medium
+redmine (3.2.3-3) UNRELEASED; urgency=medium
 
+  * New upstream release
+    - refresh patches
   * 0004-Add-multi-tenancy-support.patch: include support for plugin assets
     (Closes: #820875)
   * debian/postinst: always run plugin migrations
diff --git a/debian/patches/0001-Gemfile-relax-some-dependencies.patch b/debian/patches/0001-Gemfile-relax-some-dependencies.patch
index 04d7738..04adb33 100644
--- a/debian/patches/0001-Gemfile-relax-some-dependencies.patch
+++ b/debian/patches/0001-Gemfile-relax-some-dependencies.patch
@@ -3,14 +3,14 @@ Date: Tue, 25 Aug 2015 18:15:22 -0300
 Subject: Gemfile: relax some dependencies
 
 ---
- Gemfile | 29 +++++++----------------------
- 1 file changed, 7 insertions(+), 22 deletions(-)
+ Gemfile | 31 ++++++++-----------------------
+ 1 file changed, 8 insertions(+), 23 deletions(-)
 
 diff --git a/Gemfile b/Gemfile
-index 7092e2c..bb92e97 100644
+index a632dbd..828ce70 100644
 --- a/Gemfile
 +++ b/Gemfile
-@@ -4,11 +4,11 @@ if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.5.0')
+@@ -4,12 +4,12 @@ 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
  
@@ -21,11 +21,13 @@ index 7092e2c..bb92e97 100644
  gem "coderay", "~> 1.1.0"
  gem "builder", ">= 3.0.4"
 -gem "request_store", "1.0.5"
+-gem "mime-types", (RUBY_VERSION >= "2.0" ? "~> 3.0" : "~> 2.99")
 +gem "request_store", "~> 1.1"
- gem "mime-types"
++gem "mime-types"
  gem "protected_attributes"
  gem "actionpack-action_caching"
-@@ -27,12 +27,12 @@ gem "rbpdf", "~> 1.19.0"
+ gem "actionpack-xml_parser"
+@@ -28,12 +28,12 @@ gem "rbpdf", "~> 1.19.0"
  
  # Optional gem for LDAP authentication
  group :ldap do
@@ -40,7 +42,7 @@ index 7092e2c..bb92e97 100644
    gem "rack-openid"
  end
  
-@@ -44,7 +44,7 @@ platforms :mri, :mingw, :x64_mingw do
+@@ -45,7 +45,7 @@ platforms :mri, :mingw, :x64_mingw do
  
    # Optional Markdown support, not for JRuby
    group :markdown do
@@ -49,7 +51,7 @@ index 7092e2c..bb92e97 100644
    end
  end
  
-@@ -66,7 +66,7 @@ if File.exist?(database_file)
+@@ -67,7 +67,7 @@ if File.exist?(database_file)
      adapters.each do |adapter|
        case adapter
        when 'mysql2'
@@ -58,7 +60,7 @@ index 7092e2c..bb92e97 100644
          gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
        when 'mysql'
          gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
-@@ -91,21 +91,6 @@ else
+@@ -92,21 +92,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 37982b6..dffa51d 100644
--- a/debian/patches/0004-Add-multi-tenancy-support.patch
+++ b/debian/patches/0004-Add-multi-tenancy-support.patch
@@ -47,10 +47,10 @@ index 173b030..d9e39ef 100644
  /lib/redmine/scm/adapters/mercurial/redminehelper.pyo
  /log/*.log*
 diff --git a/Gemfile b/Gemfile
-index bb92e97..2d12450 100644
+index 828ce70..382431a 100644
 --- a/Gemfile
 +++ b/Gemfile
-@@ -58,12 +58,17 @@ end
+@@ -59,12 +59,17 @@ end
  # configuration file
  require 'erb'
  require 'yaml'
@@ -70,7 +70,7 @@ index bb92e97..2d12450 100644
        case adapter
        when 'mysql2'
          gem "mysql2", "~> 0.4.0", :platforms => [:mri, :mingw, :x64_mingw]
-@@ -87,8 +92,6 @@ if File.exist?(database_file)
+@@ -88,8 +93,6 @@ if File.exist?(database_file)
    else
      warn("No adapter found in config/database.yml, please configure it first")
    end
@@ -98,7 +98,7 @@ index 3d16f57..25fd394 100644
    after_commit :delete_from_disk, :on => :destroy
 diff --git a/bin/redmine-instances b/bin/redmine-instances
 new file mode 100755
-index 0000000..fd43b0e
+index 0000000..ab04b47
 --- /dev/null
 +++ b/bin/redmine-instances
 @@ -0,0 +1,289 @@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/redmine.git