[DRE-commits] [ruby-color-tools] 01/02: build-depend on ruby-minitest; simplify require_instead_of_gem patch

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-color-tools.

commit 35dfadea1e2ed166b1c7b8806425abc3453689ae
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon Oct 7 15:34:08 2013 +0200

    build-depend on ruby-minitest; simplify require_instead_of_gem patch
---
 debian/changelog                      |    9 ++++++++
 debian/control                        |    2 +-
 debian/patches/require_instead_of_gem |   38 ++++++++++++---------------------
 3 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b55f928..55eb146 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ruby-color-tools (1.4.2-2) unstable; urgency=low
+
+  * Team upload
+  * Build-depend on ruby-minitest (Closes: #725548).
+  * Modify require_instead_of_gem patch to simply delete the gem statement
+    instead of replacing it with a require.
+
+ -- Cédric Boutillier <boutil at debian.org>  Mon, 07 Oct 2013 15:30:54 +0200
+
 ruby-color-tools (1.4.2-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index ec286db..f4e3399 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Gunnar Wolf <gwolf at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~)
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), ruby-minitest
 Standards-Version: 3.9.4
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-color-tools.git
 Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/ruby-color-tools.git;a=summary
diff --git a/debian/patches/require_instead_of_gem b/debian/patches/require_instead_of_gem
index fff516f..e3b4850 100644
--- a/debian/patches/require_instead_of_gem
+++ b/debian/patches/require_instead_of_gem
@@ -1,16 +1,15 @@
-Description: Avoid calling "gem", use "require" instead
- The "gem" call fails under Ruby 2.0; replace it by the more orthodox
- "require".
+Description: Avoid calling "gem"
+ The "gem" call fails under Ruby 2.0; it is not needed since dependencies are
+ managed by APT
 Author: Gunnar Wolf <gwolf at debian.org>
-Last-Update: 2013-10-01
+Last-Update: 2013-10-07
 
 Index: ruby-color-tools/test/test_adobecolor.rb
 ===================================================================
 --- ruby-color-tools.orig/test/test_adobecolor.rb	2013-10-01 11:12:52.000000000 -0500
 +++ ruby-color-tools/test/test_adobecolor.rb	2013-10-01 11:13:41.000000000 -0500
-@@ -1,4 +1,4 @@
+@@ -1,4 +1,3 @@
 -gem 'minitest'
-+require 'minitest'
  require 'minitest/autorun'
  
  require 'color'
@@ -18,9 +17,8 @@ Index: ruby-color-tools/test/test_cmyk.rb
 ===================================================================
 --- ruby-color-tools.orig/test/test_cmyk.rb	2013-10-01 10:59:45.000000000 -0500
 +++ ruby-color-tools/test/test_cmyk.rb	2013-10-01 11:13:41.000000000 -0500
-@@ -1,4 +1,4 @@
+@@ -1,4 +1,3 @@
 -gem 'minitest'
-+require 'minitest'
  require 'minitest/autorun'
  
  require 'color'
@@ -28,9 +26,8 @@ Index: ruby-color-tools/test/test_color.rb
 ===================================================================
 --- ruby-color-tools.orig/test/test_color.rb	2013-10-01 10:59:45.000000000 -0500
 +++ ruby-color-tools/test/test_color.rb	2013-10-01 11:13:41.000000000 -0500
-@@ -1,4 +1,4 @@
+@@ -1,4 +1,3 @@
 -gem 'minitest'
-+require 'minitest'
  require 'minitest/autorun'
  
  require 'color'
@@ -38,9 +35,8 @@ Index: ruby-color-tools/test/test_css.rb
 ===================================================================
 --- ruby-color-tools.orig/test/test_css.rb	2013-10-01 10:59:45.000000000 -0500
 +++ ruby-color-tools/test/test_css.rb	2013-10-01 11:13:41.000000000 -0500
-@@ -1,4 +1,4 @@
+@@ -1,4 +1,3 @@
 -gem 'minitest'
-+require 'minitest'
  require 'minitest/autorun'
  
  require 'color'
@@ -48,9 +44,8 @@ Index: ruby-color-tools/test/test_gimp.rb
 ===================================================================
 --- ruby-color-tools.orig/test/test_gimp.rb	2013-10-01 10:59:45.000000000 -0500
 +++ ruby-color-tools/test/test_gimp.rb	2013-10-01 11:13:41.000000000 -0500
-@@ -1,4 +1,4 @@
+@@ -1,4 +1,3 @@
 -gem 'minitest'
-+require 'minitest'
  require 'minitest/autorun'
  
  require 'color'
@@ -58,9 +53,8 @@ Index: ruby-color-tools/test/test_grayscale.rb
 ===================================================================
 --- ruby-color-tools.orig/test/test_grayscale.rb	2013-10-01 10:59:45.000000000 -0500
 +++ ruby-color-tools/test/test_grayscale.rb	2013-10-01 11:13:41.000000000 -0500
-@@ -1,4 +1,4 @@
+@@ -1,4 +1,3 @@
 -gem 'minitest'
-+require 'minitest'
  require 'minitest/autorun'
  
  require 'color'
@@ -68,9 +62,8 @@ Index: ruby-color-tools/test/test_hsl.rb
 ===================================================================
 --- ruby-color-tools.orig/test/test_hsl.rb	2013-10-01 10:59:45.000000000 -0500
 +++ ruby-color-tools/test/test_hsl.rb	2013-10-01 11:13:41.000000000 -0500
-@@ -1,4 +1,4 @@
+@@ -1,4 +1,3 @@
 -gem 'minitest'
-+require 'minitest'
  require 'minitest/autorun'
  
  require 'color'
@@ -78,9 +71,8 @@ Index: ruby-color-tools/test/test_monocontrast.rb
 ===================================================================
 --- ruby-color-tools.orig/test/test_monocontrast.rb	2013-10-01 10:59:45.000000000 -0500
 +++ ruby-color-tools/test/test_monocontrast.rb	2013-10-01 11:13:41.000000000 -0500
-@@ -1,4 +1,4 @@
+@@ -1,4 +1,3 @@
 -gem 'minitest'
-+require 'minitest'
  require 'minitest/autorun'
  
  require 'color'
@@ -88,9 +80,8 @@ Index: ruby-color-tools/test/test_rgb.rb
 ===================================================================
 --- ruby-color-tools.orig/test/test_rgb.rb	2013-10-01 10:59:45.000000000 -0500
 +++ ruby-color-tools/test/test_rgb.rb	2013-10-01 11:13:41.000000000 -0500
-@@ -1,4 +1,4 @@
+@@ -1,4 +1,3 @@
 -gem 'minitest'
-+require 'minitest'
  require 'minitest/autorun'
  
  require 'color'
@@ -98,9 +89,8 @@ Index: ruby-color-tools/test/test_yiq.rb
 ===================================================================
 --- ruby-color-tools.orig/test/test_yiq.rb	2013-10-01 10:59:45.000000000 -0500
 +++ ruby-color-tools/test/test_yiq.rb	2013-10-01 11:13:41.000000000 -0500
-@@ -1,4 +1,4 @@
+@@ -1,4 +1,3 @@
 -gem 'minitest'
-+require 'minitest'
  require 'minitest/autorun'
  
  require 'color'

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