[DRE-commits] [SCM] ruby-gruff.git branch, master, updated. debian/0.3.6-4-2-g6847d0a

[Gunnar Wolf]

The following commit has been merged in the master branch:
commit 6847d0a7f4f3471dceab547cf599f4ad4dc928fd
Author: Gunnar Wolf <gwolf at gwolf.org>
Date:   Wed Sep 28 10:52:06 2011 -0500

    Added dep and build-dep on ruby-rmagick, build-dep on ghostscript; removed rubygems call

diff --git a/debian/changelog b/debian/changelog
index 6cd803f..be7960f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ruby-gruff (0.3.6-5) unstable; urgency=low
+
+  * Added missing dependency and build-dependency on ruby-rmagick
+    (Closes: #642744)
+  * Added missing build-dependency on ghostscript (required by the 
+    test suite)
+  * Drop the require (and the override to make the tests pass) on
+    Rubygems
+
+ -- Gunnar Wolf <gwolf at debian.org>  Wed, 28 Sep 2011 10:27:50 -0500
+
 ruby-gruff (0.3.6-4) unstable; urgency=low
 
   * Repackaged using the gem2deb framework
diff --git a/debian/control b/debian/control
index edd2128..6c77066 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Gunnar Wolf <gwolf at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.6~)
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.6~), ruby-rmagick, ghostscript
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-gruff.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-gruff.git;a=summary
@@ -14,7 +14,7 @@ XS-Ruby-Versions: all
 Package: ruby-gruff
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-rmagick
 Replaces: libgruff-ruby (<< 0.3.6-4~), libgruff-ruby-doc (<< 0.3.6-4~), libgruff-ruby1.8 (<< 0.3.6-4~)
 Breaks: libgruff-ruby (<< 0.3.6-4~), libgruff-ruby-doc (<< 0.3.6-4~), libgruff-ruby1.8 (<< 0.3.6-4~)
 Provides: libgruff-ruby, libgruff-ruby-doc, libgruff-ruby1.8
diff --git a/debian/patches/drop_require_rubygems b/debian/patches/drop_require_rubygems
new file mode 100644
index 0000000..b324c9a
--- /dev/null
+++ b/debian/patches/drop_require_rubygems
@@ -0,0 +1,18 @@
+Index: ruby-gruff/lib/gruff/base.rb
+===================================================================
+--- ruby-gruff.orig/lib/gruff/base.rb	2011-08-12 16:36:06.000000000 -0500
++++ ruby-gruff/lib/gruff/base.rb	2011-09-28 10:22:22.000000000 -0500
+@@ -1,4 +1,3 @@
+-require 'rubygems'
+ require 'RMagick'
+ 
+ require File.dirname(__FILE__) + '/deprecated'
+Index: ruby-gruff/Rakefile
+===================================================================
+--- ruby-gruff.orig/Rakefile	2011-08-12 16:36:06.000000000 -0500
++++ ruby-gruff/Rakefile	2011-09-28 10:23:10.000000000 -0500
+@@ -1,4 +1,3 @@
+-require 'rubygems'
+ require 'hoe'
+ $:.unshift(File.dirname(__FILE__) + "/lib")
+ require 'gruff'
diff --git a/debian/patches/series b/debian/patches/series
index 71259aa..76b56c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+drop_require_rubygems
 remove_obsolete_call_from_test_line
 sort_needed_for_test_scene
diff --git a/debian/require-rubygems.overrides b/debian/require-rubygems.overrides
deleted file mode 100644
index e3c5225..0000000
--- a/debian/require-rubygems.overrides
+++ /dev/null
@@ -1 +0,0 @@
-debian/ruby-gruff/usr/lib/ruby/vendor_ruby/gruff/base.rb

-- 
ruby-gruff.git