[DRE-commits] [ruby-serverspec] 04/07: debian/patches/old-rspec: dropped, we want the new rspec now

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-serverspec.

commit 44914cf8b0c583c1b33320bd3fbc954fb29ef5ee
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Jun 13 17:28:01 2015 -0300

    debian/patches/old-rspec: dropped, we want the new rspec now
---
 debian/changelog         |  1 +
 debian/patches/old-rspec | 12 ------------
 debian/patches/series    |  1 -
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7056899..7ca6bf7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ruby-serverspec (2.18.0-1) UNRELEASED; urgency=medium
 
   * Team upload
   * New upstream release
+  * debian/patches/old-rspec: dropped, we want the new rspec now
 
  -- Antonio Terceiro <terceiro at debian.org>  Sat, 13 Jun 2015 17:25:51 -0300
 
diff --git a/debian/patches/old-rspec b/debian/patches/old-rspec
deleted file mode 100644
index 8922e36..0000000
--- a/debian/patches/old-rspec
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: serverspec/lib/serverspec.rb
-===================================================================
---- serverspec.orig/lib/serverspec.rb
-+++ serverspec/lib/serverspec.rb
-@@ -1,6 +1,6 @@
- require 'rubygems'
- require 'rspec'
--require 'rspec/its'
-+#require 'rspec/its'
- require 'specinfra'
- require 'serverspec/version'
- require 'serverspec/matchers'
diff --git a/debian/patches/series b/debian/patches/series
index f91b641..5fd7cc3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-old-rspec
 fix-sample

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