[DRE-commits] [ruby-cairo] 02/07: Refresh patches.

[Daisuke Higuchi]

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

dai pushed a commit to branch master
in repository ruby-cairo.

commit 269c59562eadadb1526d2fc4c6096787d9690aec
Author: HIGUCHI Daisuke (VDR dai) <dai at debian.org>
Date:   Fri Oct 20 11:49:38 2017 +0900

    Refresh patches.
---
 .../do-not-use-native-package-installer.patch      | 29 ++++++++++++++++------
 debian/patches/do-not-use-packnga.patch            | 28 +++++++++++++++------
 2 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/debian/patches/do-not-use-native-package-installer.patch b/debian/patches/do-not-use-native-package-installer.patch
index 664f4f1..269e12f 100644
--- a/debian/patches/do-not-use-native-package-installer.patch
+++ b/debian/patches/do-not-use-native-package-installer.patch
@@ -27,11 +27,26 @@ Index: ruby-cairo/cairo.gemspec
 ===================================================================
 --- ruby-cairo.orig/cairo.gemspec
 +++ ruby-cairo/cairo.gemspec
-@@ -36,7 +36,6 @@ Gem::Specification.new do |s|
-   s.extra_rdoc_files = ["README.rdoc"]
+@@ -27,14 +27,12 @@ Gem::Specification.new do |s|
  
-   s.add_runtime_dependency("pkg-config", ">= 1.2.2")
--  s.add_runtime_dependency("native-package-installer", ">= 1.0.3")
-   s.add_development_dependency("bundler")
-   s.add_development_dependency("test-unit-notify")
-   s.add_development_dependency("rake-compiler")
+     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+       s.add_development_dependency(%q<bundler>, [">= 0"])
+-      s.add_runtime_dependency(%q<native-package-installer>, [">= 1.0.3"])
+       s.add_development_dependency(%q<packnga>, [">= 0"])
+       s.add_runtime_dependency(%q<pkg-config>, [">= 1.2.2"])
+       s.add_development_dependency(%q<rake-compiler>, [">= 0"])
+       s.add_development_dependency(%q<test-unit-notify>, [">= 0"])
+     else
+       s.add_dependency(%q<bundler>, [">= 0"])
+-      s.add_dependency(%q<native-package-installer>, [">= 1.0.3"])
+       s.add_dependency(%q<packnga>, [">= 0"])
+       s.add_dependency(%q<pkg-config>, [">= 1.2.2"])
+       s.add_dependency(%q<rake-compiler>, [">= 0"])
+@@ -42,7 +40,6 @@ Gem::Specification.new do |s|
+     end
+   else
+     s.add_dependency(%q<bundler>, [">= 0"])
+-    s.add_dependency(%q<native-package-installer>, [">= 1.0.3"])
+     s.add_dependency(%q<packnga>, [">= 0"])
+     s.add_dependency(%q<pkg-config>, [">= 1.2.2"])
+     s.add_dependency(%q<rake-compiler>, [">= 0"])
diff --git a/debian/patches/do-not-use-packnga.patch b/debian/patches/do-not-use-packnga.patch
index d2d33a9..2130d6c 100644
--- a/debian/patches/do-not-use-packnga.patch
+++ b/debian/patches/do-not-use-packnga.patch
@@ -7,10 +7,24 @@ Index: ruby-cairo/cairo.gemspec
 ===================================================================
 --- ruby-cairo.orig/cairo.gemspec
 +++ ruby-cairo/cairo.gemspec
-@@ -39,6 +39,5 @@ Gem::Specification.new do |s|
-   s.add_development_dependency("bundler")
-   s.add_development_dependency("test-unit-notify")
-   s.add_development_dependency("rake-compiler")
--  s.add_development_dependency("packnga")
-   # s.add_development_dependency("poppler")
- end
+@@ -27,20 +27,17 @@ Gem::Specification.new do |s|
+ 
+     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+       s.add_development_dependency(%q<bundler>, [">= 0"])
+-      s.add_development_dependency(%q<packnga>, [">= 0"])
+       s.add_runtime_dependency(%q<pkg-config>, [">= 1.2.2"])
+       s.add_development_dependency(%q<rake-compiler>, [">= 0"])
+       s.add_development_dependency(%q<test-unit-notify>, [">= 0"])
+     else
+       s.add_dependency(%q<bundler>, [">= 0"])
+-      s.add_dependency(%q<packnga>, [">= 0"])
+       s.add_dependency(%q<pkg-config>, [">= 1.2.2"])
+       s.add_dependency(%q<rake-compiler>, [">= 0"])
+       s.add_dependency(%q<test-unit-notify>, [">= 0"])
+     end
+   else
+     s.add_dependency(%q<bundler>, [">= 0"])
+-    s.add_dependency(%q<packnga>, [">= 0"])
+     s.add_dependency(%q<pkg-config>, [">= 1.2.2"])
+     s.add_dependency(%q<rake-compiler>, [">= 0"])
+     s.add_dependency(%q<test-unit-notify>, [">= 0"])

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