[DRE-commits] [ruby-libxml] 03/10: drop 0200_do_not_overwrite_LDFLAGS.patch, fixed upstream

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-libxml.

commit 7e17d4d9497cae26957ae96d56bbe867f64e29f4
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sun Jun 21 08:42:21 2015 +0200

    drop 0200_do_not_overwrite_LDFLAGS.patch, fixed upstream
---
 debian/patches/0200_do_not_overwrite_LDFLAGS.patch | 39 ----------------------
 debian/patches/fix_test_under_1.9.1                | 24 -------------
 debian/patches/series                              |  2 --
 3 files changed, 65 deletions(-)

diff --git a/debian/patches/0200_do_not_overwrite_LDFLAGS.patch b/debian/patches/0200_do_not_overwrite_LDFLAGS.patch
deleted file mode 100644
index 964656b..0000000
--- a/debian/patches/0200_do_not_overwrite_LDFLAGS.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: do not overwrite system LDFLAGS
-Author: Cédric Boutillier <boutil at debian.org>
-Origin: vendor
-Bug: https://github.com/xml4r/libxml-ruby/issues/74
-Last-Update: 2013-08-20
-
---- a/ext/libxml/extconf.rb
-+++ b/ext/libxml/extconf.rb
-@@ -4,19 +4,17 @@
- 
- require 'mkmf'
- 
--#if defined?(CFLAGS)
--#  if CFLAGS.index(CONFIG['CCDLFLAGS'])
--#    $CFLAGS = CFLAGS + ' ' + CONFIG['CCDLFLAGS']
--#  else
--#    $CFLAGS = CFLAGS
--#  end
--#else
--#  $CFLAGS = CONFIG['CFLAGS']
--#end
--#$LDFLAGS = CONFIG['LDFLAGS']
--#$LDFLAGS = "-L/usr/local/lib"
--#$LIBPATH.push(Config::CONFIG['libdir'])
--$LDFLAGS = "-Lc:/mingw/local/lib"
-+if defined?(CFLAGS)
-+  if CFLAGS.index(CONFIG['CCDLFLAGS'])
-+    $CFLAGS = CFLAGS + ' ' + CONFIG['CCDLFLAGS']
-+  else
-+    $CFLAGS = CFLAGS
-+  end
-+else
-+  $CFLAGS = CONFIG['CFLAGS']
-+end
-+$LDFLAGS = CONFIG['LDFLAGS']
-+$LIBPATH.push(Config::CONFIG['libdir'])
- 
- def crash(str)
-   printf(" extconf failure: %s\n", str)
diff --git a/debian/patches/fix_test_under_1.9.1 b/debian/patches/fix_test_under_1.9.1
deleted file mode 100644
index 1c32cbf..0000000
--- a/debian/patches/fix_test_under_1.9.1
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Add 'minitest/unit' to required files under 1.9.1
- The test runs only when under 1.9.1, and it's missing a dependency.
-Author: Gunnar Wolf <gwolf at debian.org>
-Last-update: 2012-03-27
-
-Index: ruby-libxml/test/tc_encoding_sax.rb
-===================================================================
---- ruby-libxml.orig/test/tc_encoding_sax.rb	2012-03-27 16:16:59.000000000 -0600
-+++ ruby-libxml/test/tc_encoding_sax.rb	2012-03-27 16:35:23.000000000 -0600
-@@ -1,6 +1,7 @@
- # encoding: UTF-8
- require './test_helper'
- require 'test/unit'
-+require 'minitest/unit'
- 
- class SaxEncodingCallbacks
-   attr_reader :encoding
-@@ -112,4 +113,4 @@
-     parser.callbacks = SaxEncodingCallbacks.new
-     parser.parse
-   end
--end
-\ No newline at end of file
-+end
diff --git a/debian/patches/series b/debian/patches/series
index c8fa637..0e42c82 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 0100_run_builtin_shell_command_ulimit_in_tests.patch
-#fix_test_under_1.9.1
-0200_do_not_overwrite_LDFLAGS.patch
 libxml2-2.9.2.patch

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