[DRE-commits] [ruby-gnome2] 02/10: removed, 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-gnome2.

commit 688cd06a691da36995d06e9214c8463d7fe01ea4
Author: HIGUCHI Daisuke (VDR dai) <dai at debian.org>
Date:   Fri Oct 20 12:13:09 2017 +0900

    removed, applied upstream.
---
 .../patches/check-exist-makefile-before-make.patch | 45 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 46 deletions(-)

diff --git a/debian/patches/check-exist-makefile-before-make.patch b/debian/patches/check-exist-makefile-before-make.patch
deleted file mode 100644
index c7f519f..0000000
--- a/debian/patches/check-exist-makefile-before-make.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Description: check existence of Makefile before running make
-Author: HIGUCHI Daisuke (VDR dai) <dai at debian.org>
-Forwarded: https://github.com/ruby-gnome2/ruby-gnome2/pull/1065
-Applied-Upstream: 3.1.8+, https://github.com/ruby-gnome2/ruby-gnome2/pull/1065/commits/35cb46ea9bfed1aa7df9eb143942126a52728672
-Last-Update: 2017-07-20
-
-Index: ruby-gnome2/cairo-gobject/test/run-test.rb
-===================================================================
---- ruby-gnome2.orig/cairo-gobject/test/run-test.rb
-+++ ruby-gnome2/cairo-gobject/test/run-test.rb
-@@ -29,7 +29,7 @@ modules = [
-   [cairo_gobject_base, "cairo-gobject"],
- ]
- modules.each do |target, module_name|
--  if system("which make > /dev/null")
-+  if File.exist?("#{target}/Makefile") and system("which make > /dev/null")
-     `make -C #{target.dump} > /dev/null` or exit(false)
-   end
-   $LOAD_PATH.unshift(File.join(target, "ext", module_name))
-Index: ruby-gnome2/glib2/test/run-test.rb
-===================================================================
---- ruby-gnome2.orig/glib2/test/run-test.rb
-+++ ruby-gnome2/glib2/test/run-test.rb
-@@ -22,7 +22,7 @@ top = File.expand_path(File.join(base, "
- $LOAD_PATH.unshift(top)
- require 'test/glib-test-init'
- 
--if system("which make > /dev/null")
-+if File.exist?("#{top}/Makefile") and system("which make > /dev/null")
-   system("cd #{top.dump} && make > /dev/null") or exit(1)
- end
- 
-Index: ruby-gnome2/gobject-introspection/test/run-test.rb
-===================================================================
---- ruby-gnome2.orig/gobject-introspection/test/run-test.rb
-+++ ruby-gnome2/gobject-introspection/test/run-test.rb
-@@ -27,7 +27,7 @@ modules = [
-   [gobject_introspection_base, "gobject-introspection"]
- ]
- modules.each do |target, module_name|
--  if system("which make > /dev/null")
-+  if File.exist?("#{target}/Makefile") and system("which make > /dev/null")
-     `make -C #{target.dump} > /dev/null` or exit(false)
-   end
-   $LOAD_PATH.unshift(File.join(target, "ext", module_name))
diff --git a/debian/patches/series b/debian/patches/series
index 36229b3..f6881c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@ Fail-the-build-if-any-subpackage-fails
 no-clutter-gst-2.0
 reject_gvlc.patch
 do-not-use-native-package-installer.patch
-check-exist-makefile-before-make.patch
 fix-example-shebang-path.patch
 extend-timeout-test-webkit2-gtk-web-view.patch
 ignored-test-modules.patch

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