[DRE-commits] r2485 - packages/librmagick-ruby/trunk/debian/patches

[lucas at alioth.debian.org]

Author: lucas
Date: 2008-02-14 00:26:17 +0000 (Thu, 14 Feb 2008)
New Revision: 2485

Removed:
   packages/librmagick-ruby/trunk/debian/patches/pkg-config.dpatch
Modified:
   packages/librmagick-ruby/trunk/debian/patches/00list
Log:
removed pkg-config.dpatch

Modified: packages/librmagick-ruby/trunk/debian/patches/00list
===================================================================
--- packages/librmagick-ruby/trunk/debian/patches/00list	2008-02-14 00:24:00 UTC (rev 2484)
+++ packages/librmagick-ruby/trunk/debian/patches/00list	2008-02-14 00:26:17 UTC (rev 2485)
@@ -1,2 +1 @@
-pkg-config.dpatch
 fail-on-doc-failure.dpatch

Deleted: packages/librmagick-ruby/trunk/debian/patches/pkg-config.dpatch
===================================================================
--- packages/librmagick-ruby/trunk/debian/patches/pkg-config.dpatch	2008-02-14 00:24:00 UTC (rev 2484)
+++ packages/librmagick-ruby/trunk/debian/patches/pkg-config.dpatch	2008-02-14 00:26:17 UTC (rev 2485)
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## pkg-config.dpatch by  <lucas at lucas-nussbaum.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use pkg-config instead of MagickConfig (see bug 347401)
-
- at DPATCH@
-diff -urNad RMagick-1.14.1~/ext/RMagick/extconf.rb.in RMagick-1.14.1/ext/RMagick/extconf.rb.in
---- RMagick-1.14.1~/ext/RMagick/extconf.rb.in	2006-10-04 00:40:22.000000000 +0200
-+++ RMagick-1.14.1/ext/RMagick/extconf.rb.in	2006-10-23 14:27:42.000000000 +0200
-@@ -6,16 +6,10 @@
- # Pass along Ruby's version number
- VERSION_NUMBER = '0x'+RUBY_VERSION.tr('.','')
- 
--$CFLAGS = "@CFLAGS@"
--$CPPFLAGS = "-DRUBY_VERSION=#{VERSION_NUMBER} @CPPFLAGS@"
--
--if RUBY_VERSION >= '1.8.0'
--    $DLDFLAGS = "@LDFLAGS@"
--else
--    $LDFLAGS = "@LDFLAGS@"
--end
-+$CFLAGS = "-Wall -g" + `pkg-config --cflags ImageMagick`.chomp
-+$CPPFLAGS = "-DRUBY_VERSION=#{VERSION_NUMBER}"
- 
--$LOCAL_LIBS = "@LOCAL_LIBS@"
-+$LOCAL_LIBS = `pkg-config --libs ImageMagick`.chomp
- 
- # Force re-compilation if the generated Makefile or
- # rmagick_config.h changed.