[DRE-commits] [ruby-pkg-config] 04/06: dropped. fixed upstream.

[Daisuke Higuchi]

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

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

commit 5e4c8311d1bf70410732f73979ef849adac932d0
Author: HIGUCHI Daisuke (VDR dai) <dai at debian.org>
Date:   Mon Aug 7 21:50:47 2017 +0900

    dropped. fixed upstream.
---
 ...bygem-pkg-config-1.1.3-cflags-result-sort.patch | 26 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 27 deletions(-)

diff --git a/debian/patches/rubygem-pkg-config-1.1.3-cflags-result-sort.patch b/debian/patches/rubygem-pkg-config-1.1.3-cflags-result-sort.patch
deleted file mode 100644
index 1aeedba..0000000
--- a/debian/patches/rubygem-pkg-config-1.1.3-cflags-result-sort.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Fix test failure on test_cflags, test_cflags_only_I with
- recent pkgconfig
-Origin: http://pkgs.fedoraproject.org/cgit/rubygem-pkg-config.git/commit/?id=982fedb13f4d09e137b3f0bbd0f6f684fb8cac5e
-Forwarded: https://github.com/ruby-gnome2/pkg-config/issues/6
-Author: TASAKA Mamoru <mtasaka at fedoraproject.org>
-Reviewed-by: HIGUCHI Daisuke (VDR dai) <dai at debian.org>
-Last-Update: 2014-03-13
-
-Index: ruby-pkg-config/test/test_pkg_config.rb
-===================================================================
---- ruby-pkg-config.orig/test/test_pkg_config.rb
-+++ ruby-pkg-config/test/test_pkg_config.rb
-@@ -110,7 +110,12 @@ class PkgConfigTest < Test::Unit::TestCa
-   def assert_pkg_config(package, pkg_config_args, actual)
-     result = pkg_config(package, *pkg_config_args)
-     result = nil if result.empty?
--    assert_equal(result, actual)
-+    begin
-+      assert_equal(result, actual)
-+    rescue Exception
-+      puts "Did not match, retry with sorting"
-+      assert_equal(result.gsub(/"/,"").split(" ").sort.uniq.join(" "), actual.gsub(/"/,"").split(" ").sort.uniq.join(" "))
-+    end
-   end
- 
-   def assert_override_variables(expected, override_variables)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 644dc57..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-rubygem-pkg-config-1.1.3-cflags-result-sort.patch

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