[DRE-commits] [ruby-rmagick] 03/11: New upstream release

Antonio Terceiro terceiro at moszumanska.debian.org
Tue Aug 25 23:32:00 UTC 2015


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

terceiro pushed a commit to branch master
in repository ruby-rmagick.

commit 25e630f1531afadf6b4df8870bafde2b93cd9bd2
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Aug 25 18:30:40 2015 -0300

    New upstream release
---
 debian/changelog                                   |  15 +++
 debian/control                                     |  24 ++--
 debian/patches/buid-samples-unconditionally.diff   |  13 ---
 debian/patches/disable-version-check.diff          |  16 ---
 debian/patches/extconf-use-pkg-config.patch        |  86 --------------
 debian/patches/fail-on-doc-failure.dpatch          |  21 ----
 .../patches/fix-missing-MagickLibSubversion.diff   |  32 ------
 debian/patches/fix_example_shebang.patch           |  29 -----
 debian/patches/format-security.patch               |  24 ----
 debian/patches/relative_paths_on_examples          | 127 ---------------------
 debian/patches/series                              |   8 --
 debian/ruby-rmagick.docs                           |   2 +-
 debian/ruby-test-files.yaml                        |  20 ----
 debian/ruby-tests.rake                             |   5 +
 debian/rules                                       |  10 +-
 15 files changed, 43 insertions(+), 389 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 266e453..34e52de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+ruby-rmagick (2.15.4-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+  * Update packaging with a new dh-make-ruby run
+  * Patches:
+    - buid-samples-unconditionally.diff: dropped, the package now has proper
+      tests
+    - relative_paths_on_examples: dropped, not needed anymore
+    - disable-version-check.diff: dropped
+    - fix_example_shebang.patch: dropped
+    - force-security.patch: dropped, already applied upstream
+    - extconf-use-pkg-config.patch: dropped, fixed upstream
+
+ -- Antonio Terceiro <terceiro at debian.org>  Tue, 25 Aug 2015 18:18:37 -0300
+
 ruby-rmagick (2.13.2-4) unstable; urgency=low
 
   * Replaces the calls to now-deprecated Magick-config by calls to
diff --git a/debian/control b/debian/control
index 4a41021..73dfec0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,19 +3,29 @@ Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Antonio Terceiro <terceiro at softwarelivre.org>, Gunnar Wolf <gwolf at debian.org>, Vincent Fourmond <fourmond at debian.org>
-Build-Depends: debhelper (>= 9~), gem2deb (>= 0.3.0~), 
-               libmagickcore-dev (>= 7:6.6.0.4-2~), libwmf-bin, 
-               ghostscript, gsfonts, libmagickwand-dev, dpkg-dev (>= 1.16.1~)
-Standards-Version: 3.9.5
+Build-Depends: debhelper (>= 9~),
+               gem2deb,
+               rake,
+               ruby-rspec,
+               libmagickcore-dev (>= 7:6.6.0.4-2~),
+               libwmf-bin, 
+               ghostscript,
+               gsfonts,
+               libmagickwand-dev,
+               dpkg-dev (>= 1.16.1~),
+Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-rmagick.git
-Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/ruby-rmagick.git;a=summary
-Homepage: http://rubyforge.org/projects/rmagick
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-rmagick.git
+Homepage: https://github.com/rmagick/rmagick
+Testsuite: autopkgtest-pkg-ruby
 XS-Ruby-Versions: all
 
 Package: ruby-rmagick
 Architecture: any
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
+Depends: ruby | ruby-interpreter,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: ImageMagick API for Ruby
  RMagick is an interface between the Ruby programming language and the
  ImageMagick image processing library.
diff --git a/debian/patches/buid-samples-unconditionally.diff b/debian/patches/buid-samples-unconditionally.diff
deleted file mode 100644
index 4b6a00b..0000000
--- a/debian/patches/buid-samples-unconditionally.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: ruby-rmagick/post-setup.rb
-===================================================================
---- ruby-rmagick.orig/post-setup.rb	2011-06-07 01:29:12.670529194 +0200
-+++ ruby-rmagick/post-setup.rb	2011-06-07 01:29:18.750529196 +0200
-@@ -236,7 +236,7 @@
-     examples -= DONT_RUN
-     es = ExampleSet.new(examples.length)
-     begin
--      examples.each { |example| es.update(example) }
-+      examples.each { |example| es.build(example) }
-     ensure
-       es.persist
-     end
diff --git a/debian/patches/disable-version-check.diff b/debian/patches/disable-version-check.diff
deleted file mode 100644
index 1b738d7..0000000
--- a/debian/patches/disable-version-check.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: ruby-rmagick/ext/RMagick/rmmain.c
-===================================================================
---- ruby-rmagick.orig/ext/RMagick/rmmain.c	2011-05-17 12:20:11.000000000 -0500
-+++ ruby-rmagick/ext/RMagick/rmmain.c	2011-05-17 12:54:43.000000000 -0500
-@@ -1639,6 +1639,11 @@
-     int x, n;
-     ID bypass = rb_intern("RMAGICK_BYPASS_VERSION_TEST");
- 
-+    /* Vincent Fourmond: disabled by default on Debian as it is
-+       obnoxious and unnecessary when appropriate SONAME is set for
-+       ImageMagick libraries (which we should assume anyway) */
-+    return;
-+
-     if (RTEST(rb_const_defined(rb_cObject, bypass)) && RTEST(rb_const_get(rb_cObject, bypass)))
-     {
-         return;
diff --git a/debian/patches/extconf-use-pkg-config.patch b/debian/patches/extconf-use-pkg-config.patch
deleted file mode 100644
index 939e145..0000000
--- a/debian/patches/extconf-use-pkg-config.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Description: Do not use Magick-config anymore
- This dirty hack just disables a fair bit of (unused ?) checks in the 
- configuration process and now uses pkg-config rather than Magick-config
- (which is not provided anymore)
-Author: Vincent Fourmond <fourmond at debian.org>
-Index: ruby-rmagick/ext/RMagick/extconf.rb
-===================================================================
---- ruby-rmagick.orig/ext/RMagick/extconf.rb
-+++ ruby-rmagick/ext/RMagick/extconf.rb
-@@ -132,40 +132,42 @@ if RUBY_PLATFORM !~ /mswin|mingw/
-   end
- 
-   # Check for Magick-config
--  unless find_executable("Magick-config")
--    exit_failure "Can't install RMagick #{RMAGICK_VERS}. Can't find Magick-config in #{ENV['PATH']}\n"
--  end
-+  # unless find_executable("Magick-config")
-+  #   exit_failure "Can't install RMagick #{RMAGICK_VERS}. Can't find Magick-config in #{ENV['PATH']}\n"
-+  # end
- 
--  check_multiple_imagemagick_versions()
--  check_partial_imagemagick_versions()
-+  # check_multiple_imagemagick_versions()
-+  # check_partial_imagemagick_versions()
- 
--  # Ensure minimum ImageMagick version
--  unless checking_for("ImageMagick version >= #{MIN_IM_VERS}")  do
--    version = `Magick-config --version`.chomp.tr(".","").to_i
--    version >= MIN_IM_VERS_NO
--  end
--    exit_failure "Can't install RMagick #{RMAGICK_VERS}. You must have ImageMagick #{MIN_IM_VERS} or later.\n"
--  end
-+  # # Ensure minimum ImageMagick version
-+  # unless checking_for("ImageMagick version >= #{MIN_IM_VERS}")  do
-+  #   version = `Magick-config --version`.chomp.tr(".","").to_i
-+  #   version >= MIN_IM_VERS_NO
-+  # end
-+  #   exit_failure "Can't install RMagick #{RMAGICK_VERS}. You must have ImageMagick #{MIN_IM_VERS} or later.\n"
-+  # end
- 
- 
- 
- 
--  $magick_version = `Magick-config --version`.chomp
-+  # $magick_version = `Magick-config --version`.chomp
- 
--  # Ensure ImageMagick is not configured for HDRI
--  unless checking_for("HDRI disabled version of ImageMagick") do
--    not (`Magick-config --version`["HDRI"])
--  end
--    exit_failure "\nCan't install RMagick #{RMAGICK_VERS}."+
--           "\nRMagick does not work when ImageMagick is configured for High Dynamic Range Images."+
--           "\nDon't use the --enable-hdri option when configuring ImageMagick.\n"
--  end
-+  # # Ensure ImageMagick is not configured for HDRI
-+  # unless checking_for("HDRI disabled version of ImageMagick") do
-+  #   not (`Magick-config --version`["HDRI"])
-+  # end
-+  #   exit_failure "\nCan't install RMagick #{RMAGICK_VERS}."+
-+  #          "\nRMagick does not work when ImageMagick is configured for High Dynamic Range Images."+
-+  #          "\nDon't use the --enable-hdri option when configuring ImageMagick.\n"
-+  # end
-+
-+  $magick_version = `pkg-config --modversion ImageMagick`
- 
-   # Save flags
--  $CFLAGS     = ENV["CFLAGS"].to_s   + " " + `Magick-config --cflags`.chomp
--  $CPPFLAGS   = ENV["CPPFLAGS"].to_s + " " + `Magick-config --cppflags`.chomp
--  $LDFLAGS    = ENV["LDFLAGS"].to_s  + " " + `Magick-config --ldflags`.chomp
--  $LOCAL_LIBS = ENV["LIBS"].to_s     + " " + `Magick-config --libs`.chomp
-+  $CFLAGS     = ENV["CFLAGS"].to_s   + " " + `pkg-config ImageMagick --cflags`.chomp
-+  $CPPFLAGS   = ENV["CPPFLAGS"].to_s + " " + `pkg-config ImageMagick --cflags-only-I`.chomp
-+  $LDFLAGS    = ENV["LDFLAGS"].to_s  + " " + `pkg-config ImageMagick --libs`.chomp
-+  $LOCAL_LIBS = ENV["LIBS"].to_s     + " " + `pkg-config ImageMagick --libs`.chomp
- 
- elsif RUBY_PLATFORM =~ /mingw/  # mingw
- 
-@@ -205,7 +207,7 @@ end
- 
- if RUBY_PLATFORM !~ /mswin|mingw/
- 
--  unless `Magick-config --libs`[/\bl\s*(MagickCore|Magick)\b/]
-+  unless `pkg-config ImageMagick --libs`[/\bl\s*(MagickCore|Magick)\b/]
-     exit_failure "Can't install RMagick #{RMAGICK_VERS}. " +
-            "Can't find the ImageMagick library or one of the dependent libraries. " +
-            "Check the mkmf.log file for more detailed information.\n"
diff --git a/debian/patches/fail-on-doc-failure.dpatch b/debian/patches/fail-on-doc-failure.dpatch
deleted file mode 100644
index 18a8fc4..0000000
--- a/debian/patches/fail-on-doc-failure.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fail-on-doc-failure.dpatch by  <lucas at lucas-nussbaum.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Be more pedantic than upstream regarding documentation generation
-## DP: failures.
-
- at DPATCH@
-Index: ruby-rmagick/post-setup.rb
-===================================================================
---- ruby-rmagick.orig/post-setup.rb	2011-05-17 12:20:11.000000000 -0500
-+++ ruby-rmagick/post-setup.rb	2011-05-17 12:54:46.000000000 -0500
-@@ -84,7 +84,7 @@
-     if $? != 0 then
-       puts("post-setup.rb: #{example} example returned error code #{$?}")
-       @errs += 1 unless ALLOW_EXAMPLE_ERRORS
--      if @errs > 4
-+      if @errs > 1
-          err(<<-END_EXFAIL
-             Too many examples failed. Search for "Help!" at
-             http://rmagick.rubyforge.org/install-faq.html.
diff --git a/debian/patches/fix-missing-MagickLibSubversion.diff b/debian/patches/fix-missing-MagickLibSubversion.diff
deleted file mode 100644
index ffa990c..0000000
--- a/debian/patches/fix-missing-MagickLibSubversion.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: fix missing MagickLibSubversion symbol
-Origin: upstream, slightly trimmed version of commit: http://github.com/rmagick/rmagick/commit/70dfc29c883588a6bf7d609dd70193f3ce49509d
-Index: librmagick-ruby-2.13.0/ext/RMagick/extconf.rb
-===================================================================
---- librmagick-ruby-2.13.0.orig/ext/RMagick/extconf.rb	2009-12-24 07:03:02.000000000 +0100
-+++ librmagick-ruby-2.13.0/ext/RMagick/extconf.rb	2010-03-15 20:27:17.822392038 +0100
-@@ -233,6 +233,7 @@
-    "LevelColorsImageChannel",        # 6.5.6-4
-    "LevelizeImageChannel",           # 6.4.2
-    "LiquidRescaleImage",             # 6.3.8-2
-+   "MagickLibAddendum",              # 6.5.9-1
-    "OpaquePaintImageChannel",        # 6.3.7-10
-    "QueueAuthenticPixels",           # 6.4.5-6
-    "RemapImage",                     # 6.4.4-0
-Index: librmagick-ruby-2.13.0/ext/RMagick/rmagick.h
-===================================================================
---- librmagick-ruby-2.13.0.orig/ext/RMagick/rmagick.h	2009-12-21 11:34:56.000000000 +0100
-+++ librmagick-ruby-2.13.0/ext/RMagick/rmagick.h	2010-03-15 20:27:17.822392038 +0100
-@@ -162,6 +162,13 @@
- #define DestroyConstitute(void) ConstituteComponentTerminus(void)
- #endif
- 
-+/** ImageMagick 6.5.9 replaced MagickLibSubversion with
-+ * MagickLibAddendum.
-+ */
-+#if defined(HAVE_MAGICKLIBADDENDUM)
-+#define MagickLibSubversion MagickLibAddendum
-+#endif
-+
- /** IM 6.4.1 replaced AllocateImage with AcquireImage.
-  * Both have the same signature.
-  */
diff --git a/debian/patches/fix_example_shebang.patch b/debian/patches/fix_example_shebang.patch
deleted file mode 100644
index 73a3661..0000000
--- a/debian/patches/fix_example_shebang.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: have proper shebangs in example
-Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2014-01-15
-Forwarded: no
-
---- a/examples/constitute.rb
-+++ b/examples/constitute.rb
-@@ -1,4 +1,4 @@
--#! /usr/local/bin/ruby -w
-+#! /usr/bin/env ruby
- require 'RMagick'
- 
- f = Magick::Image.read(File.join(File.dirname(__FILE__), "../doc/ex/images/Flower_Hat.jpg")).first
---- a/examples/crop_with_gravity.rb
-+++ b/examples/crop_with_gravity.rb
-@@ -1,4 +1,4 @@
--#! /usr/local/bin/ruby -w
-+#! /usr/bin/env ruby
- 
- #=======================================================#
- # Thanks to Robert Wagner for the idea of allowing a    #
---- a/examples/demo.rb
-+++ b/examples/demo.rb
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ruby -w
-+#!/usr/bin/env ruby
- #
- # Simple demo program for RMagick
- #
diff --git a/debian/patches/format-security.patch b/debian/patches/format-security.patch
deleted file mode 100644
index 0f2389d..0000000
--- a/debian/patches/format-security.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: fix format security warnings
-Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2014-01-15
-
---- a/ext/RMagick/rmutil.c
-+++ b/ext/RMagick/rmutil.c
-@@ -1609,7 +1609,7 @@
- void
- rm_fatal_error_handler(const ExceptionType severity, const char *reason, const char *description)
- {
--    rb_raise(Class_FatalImageMagickError, GetLocaleExceptionMessage(severity, reason));
-+    rb_raise(Class_FatalImageMagickError, "%s", GetLocaleExceptionMessage(severity, reason));
-     description = description;
- }
- 
-@@ -1649,7 +1649,7 @@
-             exception->description ? ": " : "",
-             exception->description ? GetLocaleExceptionMessage(exception->severity, exception->description) : "");
-         msg[sizeof(msg)-1] = '\0';
--        rb_warning(msg);
-+        rb_warning("%s", msg);
- 
-         // Caller deletes ExceptionInfo...
- 
diff --git a/debian/patches/relative_paths_on_examples b/debian/patches/relative_paths_on_examples
deleted file mode 100644
index 5faaf8f..0000000
--- a/debian/patches/relative_paths_on_examples
+++ /dev/null
@@ -1,127 +0,0 @@
-Author: Gunnar Wolf <gwolf at debian.org>
-Forwarded: not-needed
-Description: Include the path relative to each of the programs being
- run in the examples, to allow them to be called at build time
-Index: ruby-rmagick/examples/constitute.rb
-===================================================================
---- ruby-rmagick.orig/examples/constitute.rb	2011-05-17 13:33:51.000000000 -0500
-+++ ruby-rmagick/examples/constitute.rb	2011-05-17 13:36:27.000000000 -0500
-@@ -1,7 +1,7 @@
- #! /usr/local/bin/ruby -w
- require 'RMagick'
- 
--f = Magick::Image.read("../doc/ex/images/Flower_Hat.jpg").first
-+f = Magick::Image.read(File.join(File.dirname(__FILE__), "../doc/ex/images/Flower_Hat.jpg")).first
- pixels = f.dispatch(0,0,f.columns, f.rows, "RGB")
- image = Magick::Image.constitute(f.columns, f.rows, "RGB", pixels)
- image.write("constitute.miff")
-Index: ruby-rmagick/examples/crop_with_gravity.rb
-===================================================================
---- ruby-rmagick.orig/examples/crop_with_gravity.rb	2011-05-17 13:33:51.000000000 -0500
-+++ ruby-rmagick/examples/crop_with_gravity.rb	2011-05-17 13:36:21.000000000 -0500
-@@ -10,7 +10,7 @@
- require 'RMagick'
- include Magick
- 
--shorts = Image.read('../doc/ex/images/Shorts.jpg').first
-+shorts = Image.read(File.join(File.dirname(__FILE__), '../doc/ex/images/Shorts.jpg')).first
- 
- regwidth = shorts.columns/2
- regheight = shorts.rows/2
-Index: ruby-rmagick/examples/demo.rb
-===================================================================
---- ruby-rmagick.orig/examples/demo.rb	2011-05-17 13:33:51.000000000 -0500
-+++ ruby-rmagick/examples/demo.rb	2011-05-17 13:36:14.000000000 -0500
-@@ -17,12 +17,12 @@
- begin
-     puts "Read images..."
- 
--    model = ImageList.new("../doc/ex/images/model.miff")
-+    model = ImageList.new(File.join(File.dirname(__FILE__), "../doc/ex/images/model.miff"))
-     model.border_color = "black"
-     model.background_color = "black"
-     model.cur_image[:Label] = "RMagick"
- 
--    smile = ImageList.new("../doc/ex/images/smile.miff")
-+    smile = ImageList.new(File.join(File.dirname(__FILE__), "../doc/ex/images/smile.miff"))
-     smile.border_color = "black"
-     smile.cur_image[:Label] = "Smile"
- 
-Index: ruby-rmagick/examples/find_similar_region.rb
-===================================================================
---- ruby-rmagick.orig/examples/find_similar_region.rb	2011-05-17 13:33:51.000000000 -0500
-+++ ruby-rmagick/examples/find_similar_region.rb	2011-05-17 13:35:41.000000000 -0500
-@@ -6,7 +6,7 @@
- 
- #   Draw a red rectangle over the image that shows where the target matched.
- 
--img = Magick::Image.read('../doc/ex/images/Flower_Hat.jpg').first
-+img = Magick::Image.read(File.join(File.dirname(__FILE__), '../doc/ex/images/Flower_Hat.jpg')).first
- target = img.crop(21, 94, 118, 126)
- 
- begin
-Index: ruby-rmagick/examples/histogram.rb
-===================================================================
---- ruby-rmagick.orig/examples/histogram.rb	2011-05-17 13:33:51.000000000 -0500
-+++ ruby-rmagick/examples/histogram.rb	2011-05-17 13:35:30.000000000 -0500
-@@ -288,7 +288,7 @@
- # Get filename from command line.
- if !ARGV[0] then
-     puts "No filename argument. Defaulting to Flower_Hat.jpg"
--    filename = '../doc/ex/images/Flower_Hat.jpg'
-+    filename = File.join(File.dirname(__FILE__), '../doc/ex/images/Flower_Hat.jpg')
- else
-     filename = ARGV[0]
- end
-Index: ruby-rmagick/examples/image_opacity.rb
-===================================================================
---- ruby-rmagick.orig/examples/image_opacity.rb	2011-05-17 13:33:51.000000000 -0500
-+++ ruby-rmagick/examples/image_opacity.rb	2011-05-17 13:35:19.000000000 -0500
-@@ -11,7 +11,7 @@
- 
- END_INFO
- 
--balloons = Image.read('../doc/ex/images/Hot_Air_Balloons_H.jpg').first
-+balloons = Image.read(File.join(File.dirname(__FILE__), '../doc/ex/images/Hot_Air_Balloons_H.jpg')).first
- legend = Image.new(160, 50) { self.background_color = '#ffffffc0' }
- 
- gc = Draw.new
-Index: ruby-rmagick/examples/import_export.rb
-===================================================================
---- ruby-rmagick.orig/examples/import_export.rb	2011-05-17 13:33:51.000000000 -0500
-+++ ruby-rmagick/examples/import_export.rb	2011-05-17 13:35:07.000000000 -0500
-@@ -13,7 +13,7 @@
- 
- END_INFO
- 
--img = Image.read('../doc/ex/images/Gold_Statue.jpg').first
-+img = Image.read(File.join(File.dirname(__FILE__), '../doc/ex/images/Gold_Statue.jpg')).first
- copy = Image.new(img.columns, img.rows);
- 
- begin
-Index: ruby-rmagick/examples/thumbnail.rb
-===================================================================
---- ruby-rmagick.orig/examples/thumbnail.rb	2011-05-17 13:33:51.000000000 -0500
-+++ ruby-rmagick/examples/thumbnail.rb	2011-05-17 13:34:45.000000000 -0500
-@@ -30,7 +30,7 @@
-         size = DEFAULT_SIZE
-     else
-         size = DEFAULT_SIZE
--        image = "../doc/ex/images/Flower_Hat.jpg"
-+        image = File.join(File.dirname(__FILE__), "../doc/ex/images/Flower_Hat.jpg")
- end
- 
- geom = "#{size}x#{size}"
-Index: ruby-rmagick/examples/vignette.rb
-===================================================================
---- ruby-rmagick.orig/examples/vignette.rb	2011-05-17 13:33:51.000000000 -0500
-+++ ruby-rmagick/examples/vignette.rb	2011-05-17 13:34:37.000000000 -0500
-@@ -13,7 +13,7 @@
- 
- END_INFO
- 
--ballerina = Image.read("../doc/ex/images/Ballerina3.jpg")[0]
-+ballerina = Image.read(File.join(File.dirname(__FILE__), "../doc/ex/images/Ballerina3.jpg"))[0]
- 
- # Note: this technique won't work with every image. To make a pretty
- # vignette you need an image with a uniform, fairly dark background.
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 821a3c8..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,8 +0,0 @@
-# fix-missing-MagickLibSubversion.diff
-buid-samples-unconditionally.diff
-relative_paths_on_examples
-disable-version-check.diff
-#fail-on-doc-failure.dpatch
-fix_example_shebang.patch
-format-security.patch
-extconf-use-pkg-config.patch
diff --git a/debian/ruby-rmagick.docs b/debian/ruby-rmagick.docs
index daa30a3..5d86051 100644
--- a/debian/ruby-rmagick.docs
+++ b/debian/ruby-rmagick.docs
@@ -1 +1 @@
-README.html
+README.textile
diff --git a/debian/ruby-test-files.yaml b/debian/ruby-test-files.yaml
deleted file mode 100644
index 66846f3..0000000
--- a/debian/ruby-test-files.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-# They are not formally test suites, but just examples... However,
-# they will provide a first approach at breakage if we b0rk something
-# ;-)
-#
-# vignette.rb is left out, as it requires an X connection.
---- 
-- examples/constitute.rb
-- examples/crop_with_gravity.rb
-- examples/demo.rb
-- examples/describe.rb
-- examples/find_similar_region.rb
-- examples/histogram.rb
-- examples/identify.rb
-- examples/image_opacity.rb
-- examples/import_export.rb
-- examples/pattern_fill.rb
-- examples/rotating_text.rb
-- examples/spinner.rb
-- examples/thumbnail.rb
-
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
new file mode 100644
index 0000000..cf1591e
--- /dev/null
+++ b/debian/ruby-tests.rake
@@ -0,0 +1,5 @@
+require 'gem2deb/rake/spectask'
+
+Gem2Deb::Rake::RSpecTask.new do |spec|
+  spec.pattern = './spec/**/*_spec.rb'
+end
diff --git a/debian/rules b/debian/rules
index 5d5f444..331eb65 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,16 +6,16 @@
 #
 # Uncomment to ignore some test failures (but the tests will run anyway).
 # Valid values:
-#export DH_RUBY_IGNORE_TESTS=ruby1.8 ruby1.9.1 require-rubygems
+#export DH_RUBY_IGNORE_TESTS=ruby2.1 ruby2.2
 #
 # If you need to specify the .gemspec (eg there is more than one)
 #export DH_RUBY_GEMSPEC=gem.gemspec
-
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
+#
+# Uncomment to check dependencies during build:
+# export GEM2DEB_TEST_RUNNER = --check-dependencies
 
 %:
-	dh $@ --buildsystem=rubysetuprb --with ruby
+	dh $@ --buildsystem=ruby --with ruby
 
 override_dh_clean:
 	dh_clean

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



More information about the Pkg-ruby-extras-commits mailing list