[DRE-commits] [ruby-rmagick] 03/03: remove preserve_flags.patch

[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-rmagick.

commit 82ce1ae65aa25e838ef549b3be344c1b84845a66
Author: Cédric Boutillier <boutil at debian.org>
Date:   Fri Jan 31 08:08:37 2014 +0100

    remove preserve_flags.patch
---
 debian/changelog                    |  1 +
 debian/patches/preserve_flags.patch | 22 ----------------------
 debian/patches/series               |  1 -
 3 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1619c9a..0d348e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ ruby-rmagick (2.13.2-3) unstable; urgency=medium
     + bump dh compatibility to 9
     + build-depend on dpkg-dev
     + export flags in debian/rules
+    + remove preserve_flags.patch
 
  -- Cédric Boutillier <boutil at debian.org>  Fri, 31 Jan 2014 07:16:52 +0100
 
diff --git a/debian/patches/preserve_flags.patch b/debian/patches/preserve_flags.patch
deleted file mode 100644
index 11aadcb..0000000
--- a/debian/patches/preserve_flags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: do not overwrite default flags to preserve hardening options
-Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2014-01-15
-Forwarded: no
-
---- a/ext/RMagick/extconf.rb
-+++ b/ext/RMagick/extconf.rb
-@@ -162,10 +162,10 @@
-   end
- 
-   # Save flags
--  $CFLAGS     = ENV["CFLAGS"].to_s   + " " + `Magick-config --cflags`.chomp
--  $CPPFLAGS   = ENV["CPPFLAGS"].to_s + " " + `Magick-config --cppflags`.chomp
--  $LDFLAGS    = ENV["LDFLAGS"].to_s  + " " + `Magick-config --ldflags`.chomp
--  $LOCAL_LIBS = ENV["LIBS"].to_s     + " " + `Magick-config --libs`.chomp
-+  $CFLAGS     << " " << `Magick-config --cflags`.chomp
-+  $CPPFLAGS   << " " << `Magick-config --cppflags`.chomp
-+  $LDFLAGS    << " " << `Magick-config --ldflags`.chomp
-+  $LOCAL_LIBS << " " << `Magick-config --libs`.chomp
- 
- elsif RUBY_PLATFORM =~ /mingw/  # mingw
- 
diff --git a/debian/patches/series b/debian/patches/series
index 5d5709a..f27a0c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,4 @@ relative_paths_on_examples
 disable-version-check.diff
 #fail-on-doc-failure.dpatch
 fix_example_shebang.patch
-preserve_flags.patch
 format-security.patch

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