[DRE-commits] [SCM] ruby-mixlib-log.git branch, master, updated. debian/1.3.0-1-5-g340f4ef

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 340f4efea23ccac266f5cd5f4c1f9aa13b8dca62
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Wed Jun 27 20:44:10 2012 +0200

    New upstream; bumped gem2deb build-dependency and standards-version

diff --git a/debian/changelog b/debian/changelog
index efb47ed..3bce783 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ruby-mixlib-log (1.4.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    - Bumped standards-version to 3.9.3.
+    - Bumped the build-dependency on gem2deb to >= 0.3.0~.
+  * debian/patches: dropped patch 001-require-explicit-rspec.patch; applied
+    upstream. 
+
+ -- Paul van Tilburg <paulvt at debian.org>  Wed, 27 Jun 2012 20:39:30 +0200
+
 ruby-mixlib-log (1.3.0-1) unstable; urgency=low
 
   * Transition to gem2deb. (Closes :#643616)
diff --git a/debian/control b/debian/control
index 1e5d636..6e4267f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Joshua Timberman <joshua at opscode.com>, Paul van Tilburg <paulvt at debian.org>, Praveen Arimbrathodiyil <pravi.a at gmail.com>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.9~), ruby-rspec
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), ruby-rspec
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-mixlib-log.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-mixlib-log.git;a=summary
 Homepage: http://github.com/opscode/mixlib-log
diff --git a/debian/patches/001-require-explicit-rspec.patch b/debian/patches/001-require-explicit-rspec.patch
deleted file mode 100644
index f4655d9..0000000
--- a/debian/patches/001-require-explicit-rspec.patch
+++ /dev/null
@@ -1,18 +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/opscode/mixlib-log/pull/2
-Author: Praveen Arimbrathodiyil <pravi.a at gmail.com>
-Last-Update: 28-09-2011
-
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -20,6 +20,7 @@
- $TESTING=true
- $:.push File.join(File.dirname(__FILE__), '..', 'lib')
- 
-+require 'rspec'
- require 'mixlib/log'
- require 'mixlib/log/formatter'
- 
diff --git a/debian/patches/series b/debian/patches/series
index d8318f9..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-001-require-explicit-rspec.patch

-- 
ruby-mixlib-log.git