[DRE-commits] [SCM] ruby-bunny.git branch, master, updated. upstream/0.7.8-14-ga65ad9e

[Praveen Arimbrathodiyil]

The following commit has been merged in the master branch:
commit ac936de7e44c4598d689e6c524ddfcb7dc5b761a
Author: Praveen Arimbrathodiyil <pravi.a at gmail.com>
Date:   Mon Jan 16 20:07:06 2012 +0530

    removing patches and rspec dependency

diff --git a/debian/changelog b/debian/changelog
index fd3ecc3..29dc5da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,7 @@ ruby-bunny (0.7.8-1) unstable; urgency=low
   * migrated to gem2deb helper (Closes: #655831)
   * close wrongly filed ITPs (Closes: #624612)
   * new upstream release
-  * run all tests when building
-  * patch for requiring rspec explicitly
-  * rabbitmq-server and ruby-rspec added as build dependency
+  * tests are disabled because it needs network
 
  -- Praveen Arimbrathodiyil <pravi.a at gmail.com>  Sat, 14 Jan 2012 13:06:29 +0530
 
diff --git a/debian/control b/debian/control
index a507e18..1a5586a 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,7 @@ Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Bryan McLellan <btm at loftninjas.org>, Praveen Arimbrathodiyil <pravi.a at gmail.com>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.13~), 
- ruby-rspec, rabbitmq-server
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.13~)
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-bunny.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-bunny.git;a=summary
diff --git a/debian/patches/add-require-rspec.patch b/debian/patches/add-require-rspec.patch
deleted file mode 100644
index 11390a1..0000000
--- a/debian/patches/add-require-rspec.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: add explicit require for rspec
- Tests fail with "undefined method describe' for main:Object (NoMethodError)"
- .
- This patch add an explicit rspec require to fix it.
-Bug: https://github.com/ruby-amqp/bunny/pull/32
-Author: Praveen Arimbrathodiyil <pravi.a at gmail.com>
-Last-Update: 14-01-2012
-
---- a/spec/spec_08/bunny_spec.rb
-+++ b/spec/spec_08/bunny_spec.rb
-@@ -10,6 +10,8 @@
- 
- require File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. lib bunny]))
- 
-+require "rspec"
-+
- describe Bunny do
- 
-   before(:each) do
---- a/spec/spec_09/bunny_spec.rb
-+++ b/spec/spec_09/bunny_spec.rb
-@@ -8,6 +8,7 @@
- # If this is not the case, please change the 'Bunny.new' call below to include
- # the relevant arguments e.g. @b = Bunny.new(:user => 'john', :pass => 'doe', :host => 'foobar')
- 
-+require "rspec"
- require "bunny"
- 
- describe Bunny do
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d47b086..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-add-require-rspec.patch

-- 
ruby-bunny.git