[DRE-commits] [SCM] ruby-mini-magick.git branch, master, updated. debian/3.5.0-2-8-gf718337

[markus tornow]

The following commit has been merged in the master branch:
commit 96f92ecd92a2f9e28ba1e15584b56019663d2253
Author: markus tornow <tornow at riseup.net>
Date:   Fri May 24 15:17:36 2013 +0200

    renaming patch which removes require rubygems from tests, edit debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 7f2f308..8903ea9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ruby-mini-magick (3.6.0-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Markus Tornow <tornow at riseup.net>  Fri, 24 May 2013 15:14:46 +0200
+
 ruby-mini-magick (3.5.0-2) unstable; urgency=low
 
   * Applying patch remove-remote-test by Felix Geyer (thanks to him) 
diff --git a/debian/patches/remove-require-rubygems-from-test_helper b/debian/patches/remove-rubygems
similarity index 51%
rename from debian/patches/remove-require-rubygems-from-test_helper
rename to debian/patches/remove-rubygems
index b5bc831..36f9b26 100644
--- a/debian/patches/remove-require-rubygems-from-test_helper
+++ b/debian/patches/remove-rubygems
@@ -1,7 +1,7 @@
-Description: removing require of rubygems from test_helper.rb 
+Description: remove require rubygems from test_helper.rb 
 Author: Markus Tornow <tornow at riseup.net>
 Forwarded: not-needed
-Last-Update: 2013-03-31
+Last-Update: 2013-05-24
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/test/test_helper.rb
@@ -11,10 +11,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  require 'test/unit'
  require 'pathname'
  require 'tempfile'
-@@ -18,4 +17,4 @@ module MiniMagickTestFiles
-   PNG_PATH             = test_files + "/png.png"
-   COMP_IMAGE_PATH      = test_files + "/composited.jpg"
-   ERRONEOUS_IMAGE_PATH = test_files + "/erroneous.jpg"
+@@ -19,4 +18,4 @@ module MiniMagickTestFiles
+   PNG_PATH                 = test_files + "/png.png"
+   COMP_IMAGE_PATH          = test_files + "/composited.jpg"
+   ERRONEOUS_IMAGE_PATH     = test_files + "/erroneous.jpg"
 -end
 \ No newline at end of file
 +end
diff --git a/debian/patches/series b/debian/patches/series
index 3b01512..43867ec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
+remove-rubygems
 remove-remote-tests
 remove-function-valid_version_installed
-remove-require-rubygems-from-test_helper

-- 
ruby-mini-magick.git