[DRE-commits] [rubocop] 04/08: d/patches: Refresh patches according new upstream

Mon Aug 21 15:30:37 UTC 2017

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

sbadia pushed a commit to branch master
in repository rubocop.

commit 01e21751fdef084e213b3b150bcebe9412a638e6
Author: Sebastien Badia <seb at sebian.fr>
Date:   Mon Aug 21 17:16:17 2017 +0200

    d/patches: Refresh patches according new upstream
---
 ...ndency-version.diff => 01-relax-dependency-version.diff} | 13 ++++++++-----
 .../02-disable-tests-relying-on-rubygems-features.diff      |  8 ++++----
 ...just-tests-due-to-rubocop-logo-removal-from-package.diff |  8 ++++----
 debian/patches/series                                       |  2 +-
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/debian/patches/01-relax-ruby-progressbar-dependency-version.diff b/debian/patches/01-relax-dependency-version.diff
similarity index 70%
rename from debian/patches/01-relax-ruby-progressbar-dependency-version.diff
rename to debian/patches/01-relax-dependency-version.diff
index 995b344..0740b8f 100644
--- a/debian/patches/01-relax-ruby-progressbar-dependency-version.diff
+++ b/debian/patches/01-relax-dependency-version.diff
@@ -1,15 +1,18 @@
 Description: Allow use of ruby-progressbar version available in archive
 Author: Miguel Landaeta <nomadium at debian.org>
-Last-Update: 2016-12-29
+Last-Update: 2017-09-21
 
---- rubocop-0.46.0.orig/rubocop.gemspec
-+++ rubocop-0.46.0/rubocop.gemspec
-@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
+--- 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')
    s.add_runtime_dependency('parser', '>= 2.3.3.1', '< 3.0')
    s.add_runtime_dependency('powerpack', '~> 0.1')
 -  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 27b402f..0e39334 100644
--- a/debian/patches/02-disable-tests-relying-on-rubygems-features.diff
+++ b/debian/patches/02-disable-tests-relying-on-rubygems-features.diff
@@ -4,10 +4,10 @@ Description: rubygems usage is disabled for packaging purposes
 Author: Miguel Landaeta <nomadium at debian.org>
 Last-Update: 2016-12-29
 
---- rubocop-0.46.0.orig/spec/rubocop/config_loader_spec.rb
-+++ rubocop-0.46.0/spec/rubocop/config_loader_spec.rb
-@@ -329,9 +329,10 @@ describe RuboCop::ConfigLoader do
-                      '  not_a_real_gem: config/rubocop.yml'])
+--- a/spec/rubocop/config_loader_spec.rb
++++ b/spec/rubocop/config_loader_spec.rb
+@@ -391,9 +391,10 @@ describe RuboCop::ConfigLoader do
+         END
        end
  
 -      it 'fails to load' do
diff --git a/debian/patches/04-adjust-tests-due-to-rubocop-logo-removal-from-package.diff b/debian/patches/04-adjust-tests-due-to-rubocop-logo-removal-from-package.diff
index 070203f..35ef49e 100644
--- a/debian/patches/04-adjust-tests-due-to-rubocop-logo-removal-from-package.diff
+++ b/debian/patches/04-adjust-tests-due-to-rubocop-logo-removal-from-package.diff
@@ -3,8 +3,8 @@ Author: Miguel Landaeta <nomadium at debian.org>
 Forwarded: no
 Last-Update: 2017-02-13
 
---- rubocop-0.47.1+dfsg.orig/assets/output.html.erb
-+++ rubocop-0.47.1+dfsg/assets/output.html.erb
+--- a/assets/output.html.erb
++++ b/assets/output.html.erb
 @@ -208,7 +208,9 @@
    </head>
    <body>
@@ -16,8 +16,8 @@ Last-Update: 2017-02-13
        <h1 class="title">RuboCop Inspection Report</h1>
      </div>
      <div class="information">
---- rubocop-0.47.1+dfsg.orig/spec/fixtures/html_formatter/expected.html
-+++ rubocop-0.47.1+dfsg/spec/fixtures/html_formatter/expected.html
+--- a/spec/fixtures/html_formatter/expected.html
++++ b/spec/fixtures/html_formatter/expected.html
 @@ -240,127 +240,9 @@
    </head>
    <body>
diff --git a/debian/patches/series b/debian/patches/series
index 4d78337..55e90dd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-01-relax-ruby-progressbar-dependency-version.diff
+01-relax-dependency-version.diff
 02-disable-tests-relying-on-rubygems-features.diff
 04-adjust-tests-due-to-rubocop-logo-removal-from-package.diff

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

