[DRE-commits] [ruby-rbpdf] 02/25: update patches

[Antonio Terceiro]

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

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

commit c1123acf4726a9ccbd63a4ed8a4a26c2abdfad3f
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Sat Jan 23 12:08:14 2016 -0200

    update patches
---
 ...related-to-alpha-channel-support-in-rmagi.patch | 36 +++++++++++++++
 .../0002-Relax-dependency-on-htmlentities.patch    | 21 +++++++++
 debian/patches/rmagick-alpha                       | 51 ----------------------
 debian/patches/series                              |  3 +-
 4 files changed, 59 insertions(+), 52 deletions(-)

diff --git a/debian/patches/0001-Skip-tests-related-to-alpha-channel-support-in-rmagi.patch b/debian/patches/0001-Skip-tests-related-to-alpha-channel-support-in-rmagi.patch
new file mode 100644
index 0000000..3bc8a37
--- /dev/null
+++ b/debian/patches/0001-Skip-tests-related-to-alpha-channel-support-in-rmagi.patch
@@ -0,0 +1,36 @@
+From: Klee Dienes <klee at mit.edu>
+Date: Sat, 23 Jan 2016 12:04:57 -0200
+Subject: Skip tests related to alpha channel support in rmagick
+
+---
+ test/rbpdf_image_rmagick_test.rb | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/test/rbpdf_image_rmagick_test.rb b/test/rbpdf_image_rmagick_test.rb
+index d6277e2..abd2cad 100644
+--- a/test/rbpdf_image_rmagick_test.rb
++++ b/test/rbpdf_image_rmagick_test.rb
+@@ -160,6 +160,7 @@ class RbpdfTest < Test::Unit::TestCase
+   end
+ 
+   test "imageToPNG delete GIF alpha channel test" do
++    skip
+     pdf = MYPDF.new
+     pdf.add_page
+     img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_8bit_alpha.gif')
+@@ -177,6 +178,7 @@ class RbpdfTest < Test::Unit::TestCase
+   end
+ 
+   test "imageToPNG delete PNG alpha channel test" do
++    skip
+     pdf = MYPDF.new
+     pdf.add_page
+     img_file = File.join(File.dirname(__FILE__), 'png_test_alpha.png')
+@@ -218,6 +220,7 @@ class RbpdfTest < Test::Unit::TestCase
+   end
+ 
+   test "Image PNG alpha test" do
++    skip
+     return unless Object.const_defined?(:Magick)
+ 
+     pdf = RBPDF.new
diff --git a/debian/patches/0002-Relax-dependency-on-htmlentities.patch b/debian/patches/0002-Relax-dependency-on-htmlentities.patch
new file mode 100644
index 0000000..2f1e2a0
--- /dev/null
+++ b/debian/patches/0002-Relax-dependency-on-htmlentities.patch
@@ -0,0 +1,21 @@
+From: Antonio Terceiro <terceiro at softwarelivre.org>
+Date: Sat, 23 Jan 2016 12:07:15 -0200
+Subject: Relax dependency on htmlentities
+
+---
+ rbpdf.gemspec | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rbpdf.gemspec b/rbpdf.gemspec
+index 5f985ea..96f345c 100644
+--- a/rbpdf.gemspec
++++ b/rbpdf.gemspec
+@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
+   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+   spec.require_paths = ["lib"]
+ 
+-  spec.add_runtime_dependency "htmlentities", "= 4.3.1"
++  spec.add_runtime_dependency "htmlentities", ">= 4.3.1"
+   spec.add_runtime_dependency "rbpdf-font", "~> 1.19.0"
+   spec.required_ruby_version = '>= 1.8.7'
+ 
diff --git a/debian/patches/rmagick-alpha b/debian/patches/rmagick-alpha
deleted file mode 100644
index da3c029..0000000
--- a/debian/patches/rmagick-alpha
+++ /dev/null
@@ -1,51 +0,0 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- ruby-rbpdf (1.18.6-1) UNRELEASED; urgency=medium
- .
-   * Initial release (Closes: #nnnn)
-Author: Klee Dienes <kdienes at romulus.hadronindustries.com>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: https://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- ruby-rbpdf-1.18.6.orig/test/rbpdf_image_rmagick_test.rb
-+++ ruby-rbpdf-1.18.6/test/rbpdf_image_rmagick_test.rb
-@@ -161,6 +161,7 @@ class RbpdfTest < ActiveSupport::TestCas
-   end
- 
-   test "imageToPNG delete GIF alpha channel test" do
-+    skip
-     pdf = MYPDF.new
-     pdf.add_page
-     img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_8bit_alpha.gif')
-@@ -178,6 +179,7 @@ class RbpdfTest < ActiveSupport::TestCas
-   end
- 
-   test "imageToPNG delete PNG alpha channel test" do
-+    skip
-     pdf = MYPDF.new
-     pdf.add_page
-     img_file = File.join(File.dirname(__FILE__), 'png_test_alpha.png')
-@@ -219,6 +221,7 @@ class RbpdfTest < ActiveSupport::TestCas
-   end
- 
-   test "Image PNG alpha test" do
-+    skip
-     return unless Object.const_defined?(:Magick)
- 
-     pdf = RBPDF.new
diff --git a/debian/patches/series b/debian/patches/series
index 1a4a196..1425efe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-rmagick-alpha
+0001-Skip-tests-related-to-alpha-channel-support-in-rmagi.patch
+0002-Relax-dependency-on-htmlentities.patch

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