[DRE-commits] [rubocop] 01/05: Refresh patches

[Miguel Landaeta]

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

nomadium pushed a commit to branch master
in repository rubocop.

commit 8b040a8a6beadf45b6ed82d09be30486afa24b51
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Mon Oct 30 19:41:25 2017 +0000

    Refresh patches
---
 debian/changelog                                         |  9 +++++++++
 debian/patches/01-relax-dependency-version.diff          | 16 +++++++++-------
 .../02-disable-tests-relying-on-rubygems-features.diff   |  6 +++---
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8425dd0..0ea31ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+rubocop (0.51.0+dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Refresh patches:
+    - d/p/01-relax-dependency-version.diff
+    - d/p/02-disable-tests-relying-on-rubygems-features.diff
+
+ -- Miguel Landaeta <nomadium at debian.org>  Mon, 30 Oct 2017 19:40:41 +0000
+
 rubocop (0.49.1+dfsg-1) unstable; urgency=medium
 
   * New upstream version 0.49.1+dfsg
diff --git a/debian/patches/01-relax-dependency-version.diff b/debian/patches/01-relax-dependency-version.diff
index 0740b8f..c45817a 100644
--- a/debian/patches/01-relax-dependency-version.diff
+++ b/debian/patches/01-relax-dependency-version.diff
@@ -1,18 +1,20 @@
 Description: Allow use of ruby-progressbar version available in archive
 Author: Miguel Landaeta <nomadium at debian.org>
-Last-Update: 2017-09-21
+Last-Update: 2017-30-10
 
 --- a/rubocop.gemspec
 +++ b/rubocop.gemspec
-@@ -28,9 +28,9 @@ Gem::Specification.new do |s|
-   s.add_runtime_dependency('rainbow', '>= 1.99.1', '< 3.0')
+@@ -36,11 +36,11 @@ Gem::Specification.new do |s|
+     }
+   end
+ 
+-  s.add_runtime_dependency('parallel', '~> 1.10')
++  s.add_runtime_dependency('parallel', '>= 1.10', '< 2.0')
    s.add_runtime_dependency('parser', '>= 2.3.3.1', '< 3.0')
    s.add_runtime_dependency('powerpack', '~> 0.1')
+   s.add_runtime_dependency('rainbow', '>= 2.2.2', '< 3.0')
 -  s.add_runtime_dependency('ruby-progressbar', '~> 1.7')
 +  s.add_runtime_dependency('ruby-progressbar', '>= 1.4', '< 2.0')
    s.add_runtime_dependency('unicode-display_width', '~> 1.0', '>= 1.0.1')
--  s.add_runtime_dependency('parallel', '~> 1.10')
-+  s.add_runtime_dependency('parallel', '>= 1.10', '< 2.0')
-
+ 
    s.add_development_dependency('bundler', '~> 1.3')
- end
diff --git a/debian/patches/02-disable-tests-relying-on-rubygems-features.diff b/debian/patches/02-disable-tests-relying-on-rubygems-features.diff
index 0e39334..c8a4d17 100644
--- a/debian/patches/02-disable-tests-relying-on-rubygems-features.diff
+++ b/debian/patches/02-disable-tests-relying-on-rubygems-features.diff
@@ -2,12 +2,12 @@ Description: rubygems usage is disabled for packaging purposes
  I need to research more to determine if there is a better way
  to handle this test failure.
 Author: Miguel Landaeta <nomadium at debian.org>
-Last-Update: 2016-12-29
+Last-Update: 2017-10-30
 
 --- a/spec/rubocop/config_loader_spec.rb
 +++ b/spec/rubocop/config_loader_spec.rb
-@@ -391,9 +391,10 @@ describe RuboCop::ConfigLoader do
-         END
+@@ -409,9 +409,10 @@ describe RuboCop::ConfigLoader do
+         YAML
        end
  
 -      it 'fails to load' do

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