[DRE-commits] [redmine] 10/11: 0001-Gemfile-relax-some-dependencies.patch: adapt Gemfile

[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 1707f351b359029de8c5c2912d21297aba036248
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Aug 25 20:46:00 2015 -0300

    0001-Gemfile-relax-some-dependencies.patch: adapt Gemfile
---
 debian/changelog                                   |  2 +
 .../0001-Gemfile-relax-some-dependencies.patch     | 71 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 74 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7927b30..857e1a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ redmine (3.1.0-1) UNRELEASED; urgency=medium
   * Move from cdbs to dh
   * Stop builing fonts, upstream redmine doesn't rely on them anymore
   * Drop all patches, let's start from scratch
+  * New patches:
+    - 0001-Gemfile-relax-some-dependencies.patch: adapt Gemfile
 
  -- Antonio Terceiro <terceiro at debian.org>  Tue, 25 Aug 2015 17:33:17 -0300
 
diff --git a/debian/patches/0001-Gemfile-relax-some-dependencies.patch b/debian/patches/0001-Gemfile-relax-some-dependencies.patch
new file mode 100644
index 0000000..ce6b4a4
--- /dev/null
+++ b/debian/patches/0001-Gemfile-relax-some-dependencies.patch
@@ -0,0 +1,71 @@
+From: Antonio Terceiro <terceiro at debian.org>
+Date: Tue, 25 Aug 2015 18:15:22 -0300
+Subject: Gemfile: relax some dependencies
+
+---
+ Gemfile | 25 +++++--------------------
+ 1 file changed, 5 insertions(+), 20 deletions(-)
+
+diff --git a/Gemfile b/Gemfile
+index db1abbb..3e45286 100644
+--- a/Gemfile
++++ b/Gemfile
+@@ -5,10 +5,10 @@ if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.5.0')
+ end
+ 
+ gem "rails", "4.2.3"
+-gem "jquery-rails", "~> 3.1.3"
++gem "jquery-rails", "~> 4.0"
+ gem "coderay", "~> 1.1.0"
+ gem "builder", ">= 3.0.4"
+-gem "request_store", "1.0.5"
++gem "request_store", "~> 1.1"
+ gem "mime-types"
+ gem "protected_attributes"
+ gem "actionpack-action_caching"
+@@ -21,12 +21,12 @@ gem "rbpdf", "~> 1.18.6"
+ 
+ # Optional gem for LDAP authentication
+ group :ldap do
+-  gem "net-ldap", "~> 0.3.1"
++  gem "net-ldap", "~> 0.3"
+ end
+ 
+ # Optional gem for OpenID authentication
+ group :openid do
+-  gem "ruby-openid", "~> 2.3.0", :require => "openid"
++  gem "ruby-openid", "~> 2.3", :require => "openid"
+   gem "rack-openid"
+ end
+ 
+@@ -38,7 +38,7 @@ platforms :mri, :mingw, :x64_mingw do
+ 
+   # Optional Markdown support, not for JRuby
+   group :markdown do
+-    gem "redcarpet", "~> 3.1.2"
++    gem "redcarpet", "~> 3.1"
+   end
+ end
+ 
+@@ -85,21 +85,6 @@ else
+   warn("Please configure your config/database.yml first")
+ end
+ 
+-group :development do
+-  gem "rdoc", ">= 2.4.2"
+-  gem "yard"
+-end
+-
+-group :test do
+-  gem "minitest"
+-  gem "rails-dom-testing"
+-  gem "mocha"
+-  gem "simplecov", "~> 0.9.1", :require => false
+-  # For running UI tests
+-  gem "capybara"
+-  gem "selenium-webdriver"
+-end
+-
+ local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
+ if File.exists?(local_gemfile)
+   eval_gemfile local_gemfile
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5e3a3e6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Gemfile-relax-some-dependencies.patch

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