[DRE-commits] [chef-zero] 05/05: checkpoint

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository chef-zero.

commit fd79b3b2b93cda70a329da1c85efaec5078a1f08
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Jun 13 16:18:30 2015 -0300

    checkpoint
---
 debian/changelog                                   |  2 +
 ...-Remove-requires-of-rubygems-and-bundler.patch} | 44 +++++++++++++++-------
 .../0002-Add-missing-require-statement.patch       | 19 ++++++++++
 debian/patches/series                              |  3 +-
 4 files changed, 53 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8bb117f..a6d8122 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ chef-zero (4.2.2-1) UNRELEASED; urgency=medium
   * Update packaging with a new dh-make-ruby run
   * Refresh patches
   * debian/tests: remove, use standard autopkgtest mechanism for Ruby packages
+  * 0002-Add-missing-require-statement.patch: add missing require statement in
+    test file
 
  -- Antonio Terceiro <terceiro at debian.org>  Sat, 13 Jun 2015 15:55:41 -0300
 
diff --git a/debian/patches/no-rubygems b/debian/patches/0001-Remove-requires-of-rubygems-and-bundler.patch
similarity index 56%
rename from debian/patches/no-rubygems
rename to debian/patches/0001-Remove-requires-of-rubygems-and-bundler.patch
index 65d913c..fdcb178 100644
--- a/debian/patches/no-rubygems
+++ b/debian/patches/0001-Remove-requires-of-rubygems-and-bundler.patch
@@ -1,9 +1,28 @@
-Description: Remove requires of rubygems and bundler
- In Debian, gems are available system-wide
-Author: Stefano Rivera <stefanor at debian.org>
-Forwarded: not-needed
-Last-Updated: 2014-01-09
+From: Stefano Rivera <stefanor at debian.org>
+Date: Thu, 9 Jan 2014 12:00:00 +0100
+Subject: Remove requires of rubygems and bundler
 
+---
+ Rakefile                | 3 ---
+ bin/chef-zero           | 1 -
+ lib/chef_zero/server.rb | 1 -
+ spec/run_oc_pedant.rb   | 3 ---
+ spec/run_pedant.rb      | 3 ---
+ 5 files changed, 11 deletions(-)
+
+diff --git a/Rakefile b/Rakefile
+index 209b5df..47ae07b 100644
+--- a/Rakefile
++++ b/Rakefile
+@@ -1,6 +1,3 @@
+-require 'bundler'
+-require 'bundler/gem_tasks'
+-
+ require 'chef_zero/version'
+ 
+ task :default => :pedant
+diff --git a/bin/chef-zero b/bin/chef-zero
+index 54739bc..7355a04 100755
 --- a/bin/chef-zero
 +++ b/bin/chef-zero
 @@ -3,7 +3,6 @@
@@ -14,6 +33,8 @@ Last-Updated: 2014-01-09
  $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
  
  require 'chef_zero/log'
+diff --git a/lib/chef_zero/server.rb b/lib/chef_zero/server.rb
+index 9cf7b39..d38847e 100644
 --- a/lib/chef_zero/server.rb
 +++ b/lib/chef_zero/server.rb
 @@ -18,7 +18,6 @@
@@ -24,15 +45,8 @@ Last-Updated: 2014-01-09
  require 'timeout'
  require 'stringio'
  
---- a/Rakefile
-+++ b/Rakefile
-@@ -1,6 +1,3 @@
--require 'bundler'
--require 'bundler/gem_tasks'
--
- require 'chef_zero/version'
- 
- task :default => :pedant
+diff --git a/spec/run_oc_pedant.rb b/spec/run_oc_pedant.rb
+index 79d92e7..c433c12 100644
 --- a/spec/run_oc_pedant.rb
 +++ b/spec/run_oc_pedant.rb
 @@ -1,7 +1,4 @@
@@ -43,6 +57,8 @@ Last-Updated: 2014-01-09
  require 'chef_zero/server'
  require 'rspec/core'
  
+diff --git a/spec/run_pedant.rb b/spec/run_pedant.rb
+index 30ffa2d..777daa0 100644
 --- a/spec/run_pedant.rb
 +++ b/spec/run_pedant.rb
 @@ -1,7 +1,4 @@
diff --git a/debian/patches/0002-Add-missing-require-statement.patch b/debian/patches/0002-Add-missing-require-statement.patch
new file mode 100644
index 0000000..ed5514e
--- /dev/null
+++ b/debian/patches/0002-Add-missing-require-statement.patch
@@ -0,0 +1,19 @@
+From: Antonio Terceiro <terceiro at debian.org>
+Date: Sat, 13 Jun 2015 16:16:11 -0300
+Subject: Add missing require statement
+
+---
+ spec/server_spec.rb | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/spec/server_spec.rb b/spec/server_spec.rb
+index 558ef35..0045c21 100644
+--- a/spec/server_spec.rb
++++ b/spec/server_spec.rb
+@@ -1,5 +1,6 @@
+ require 'chef_zero/server'
+ require 'uri'
++require 'net/http'
+ 
+ describe ChefZero::Server do
+   context 'with a server bound to port 8889' do
diff --git a/debian/patches/series b/debian/patches/series
index f68c424..135ed0d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-no-rubygems
+0001-Remove-requires-of-rubygems-and-bundler.patch
+0002-Add-missing-require-statement.patch

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