[DRE-commits] [ruby-serverspec] 06/07: remove fix-sample patch, not needed anymore

[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 66659a764b4359032b8b3ac6a0dca818bf152348
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Jun 13 18:54:36 2015 -0300

    remove fix-sample patch, not needed anymore
---
 debian/changelog          |  1 +
 debian/patches/fix-sample | 32 --------------------------------
 debian/patches/series     |  1 -
 3 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 717c297..fc4a2a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,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
+  * debian/patches/fix-example: dropped, not needed anymore
   * Update packaging with a new dh-make-ruby run
 
  -- Antonio Terceiro <terceiro at debian.org>  Sat, 13 Jun 2015 17:25:51 -0300
diff --git a/debian/patches/fix-sample b/debian/patches/fix-sample
deleted file mode 100644
index 85d29dc..0000000
--- a/debian/patches/fix-sample
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: fix generated sample to fit debian
-Author: KURASHIKI Satoru <lurdan at gmail.com>
-Bug-Debian: http://bugs.debian.org/716662
-Origin: vendor
-
-Index: serverspec/lib/serverspec/setup.rb
-===================================================================
---- serverspec.orig/lib/serverspec/setup.rb	2014-03-26 22:00:46.000000000 +0900
-+++ serverspec/lib/serverspec/setup.rb	2014-03-26 22:00:46.000000000 +0900
-@@ -94,11 +94,11 @@
-       content = <<-EOF
- require 'spec_helper'
- 
--describe package('httpd') do
-+describe package('apache2') do
-   it { should be_installed }
- end
- 
--describe service('httpd') do
-+describe service('apache2') do
-   it { should be_enabled   }
-   it { should be_running   }
- end
-@@ -107,7 +107,7 @@
-   it { should be_listening }
- end
- 
--describe file('/etc/httpd/conf/httpd.conf') do
-+describe file('/etc/apache2/sites-enabled/000-default') do
-   it { should be_file }
-   its(:content) { should match /ServerName #{@hostname}/ }
- end
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 5fd7cc3..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix-sample

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