[DRE-commits] [ruby-pkg-config] 02/06: dropped. applied 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 1145566eb9d693fceb2e240a522571c44f8f556f
Author: HIGUCHI Daisuke (VDR dai) <dai at debian.org>
Date:   Mon Aug 7 21:44:38 2017 +0900

    dropped. applied upstream.
---
 debian/patches/fix_libz_bug870850.patch | 19 -------------------
 debian/patches/series                   |  1 -
 2 files changed, 20 deletions(-)

diff --git a/debian/patches/fix_libz_bug870850.patch b/debian/patches/fix_libz_bug870850.patch
deleted file mode 100644
index 367cbd3..0000000
--- a/debian/patches/fix_libz_bug870850.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Fix test failure on --libs-only-l with libz
-Author: HIGUCHI Daisuke (VDR dai) <dai at debian.org>
-Bug-Debian: https://bugs.debian.org/870850
-Forwarded: https://github.com/ruby-gnome2/pkg-config/pull/14
-Last-Update: 2017-08-06
-
-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
-@@ -45,7 +45,7 @@ class PkgConfigTest < Test::Unit::TestCa
- 
-     @cairo_png.msvc_syntax = true
-     result = pkg_config("cairo-png", "--libs-only-l")
--    msvc_result = result.gsub(/-l(cairo|png[0-9]+)\b/, '\1.lib')
-+    msvc_result = result.gsub(/-l(cairo|png[0-9]+|z)\b/, '\1.lib')
-     assert_not_equal(msvc_result, result)
-     assert_equal(msvc_result, @cairo_png.libs_only_l)
-   end
diff --git a/debian/patches/series b/debian/patches/series
index cd2263b..644dc57 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 rubygem-pkg-config-1.1.3-cflags-result-sort.patch
-fix_libz_bug870850.patch

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