[Pkg-ruby-extras-maintainers] r320 - in packages/librmagick-ruby/trunk/debian: . patches

[Lucas Nussbaum]

Author: lucas-guest
Date: 2006-01-30 09:35:00 +0000 (Mon, 30 Jan 2006)
New Revision: 320

Added:
   packages/librmagick-ruby/trunk/debian/patches/00list
Modified:
   packages/librmagick-ruby/trunk/debian/control
   packages/librmagick-ruby/trunk/debian/control.in
   packages/librmagick-ruby/trunk/debian/patches/pkg-config.dpatch
Log:
dpatch fixes. still doesn't work as expected.

Modified: packages/librmagick-ruby/trunk/debian/control
===================================================================
--- packages/librmagick-ruby/trunk/debian/control	2006-01-30 08:46:55 UTC (rev 319)
+++ packages/librmagick-ruby/trunk/debian/control	2006-01-30 09:35:00 UTC (rev 320)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Antonio S. de A. Terceiro <asaterceiro at inf.ufrgs.br>, David Moreno Garza <damog at debian.org>, David Nusinow <dnusinow at debian.org>, Paul van Tilburg <paulvt at debian.org>, Esteban Manchado Velázquez <zoso at debian.org>, Arnaud Cornet <arnaud.cornet at gmail.com>, Lucas Nussbaum <lucas at lucas-nussbaum.net>, Thierry Reding <thierry at doppeltgemoppelt.de>, Marc Dequènes (Duck) <Duck at DuckCorp.org>
-Build-Depends: debhelper (>> 5), libmagick9-dev, ruby1.8, ruby1.8-dev, libwmf-bin, gs-gpl, cdbs, ruby-pkg-tools, rdoc, graphviz
+Build-Depends: debhelper (>> 5), libmagick9-dev, ruby1.8, ruby1.8-dev, libwmf-bin, gs-gpl, cdbs, ruby-pkg-tools, rdoc, graphviz, dpatch
 Standards-Version: 3.6.2.2
 
 Package: librmagick-ruby

Modified: packages/librmagick-ruby/trunk/debian/control.in
===================================================================
--- packages/librmagick-ruby/trunk/debian/control.in	2006-01-30 08:46:55 UTC (rev 319)
+++ packages/librmagick-ruby/trunk/debian/control.in	2006-01-30 09:35:00 UTC (rev 320)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: @RUBY_TEAM@
-Build-Depends: debhelper (>= 5), libmagick9-dev (>= 6.2.4), ruby1.8, ruby1.8-dev, libwmf-bin, gs-gpl,gsfonts, cdbs, ruby-pkg-tools, rdoc, graphviz
+Build-Depends: debhelper (>= 5), libmagick9-dev (>= 6.2.4), ruby1.8, ruby1.8-dev, libwmf-bin, gs-gpl,gsfonts, cdbs, ruby-pkg-tools, rdoc, graphviz, dpatch
 Standards-Version: 3.6.2.2
 
 Package: librmagick-ruby

Added: packages/librmagick-ruby/trunk/debian/patches/00list
===================================================================
--- packages/librmagick-ruby/trunk/debian/patches/00list	2006-01-30 08:46:55 UTC (rev 319)
+++ packages/librmagick-ruby/trunk/debian/patches/00list	2006-01-30 09:35:00 UTC (rev 320)
@@ -0,0 +1,2 @@
+pkg-config.dpatch
+fail-on-doc-failure.dpatch

Modified: packages/librmagick-ruby/trunk/debian/patches/pkg-config.dpatch
===================================================================
--- packages/librmagick-ruby/trunk/debian/patches/pkg-config.dpatch	2006-01-30 08:46:55 UTC (rev 319)
+++ packages/librmagick-ruby/trunk/debian/patches/pkg-config.dpatch	2006-01-30 09:35:00 UTC (rev 320)
@@ -7,22 +7,22 @@
 @DPATCH@
 diff -urNad trunk~/ext/RMagick/extconf.rb.in trunk/ext/RMagick/extconf.rb.in
 --- trunk~/ext/RMagick/extconf.rb.in	2005-05-06 02:28:41.000000000 +0200
-+++ trunk/ext/RMagick/extconf.rb.in	2006-01-30 09:41:38.000000000 +0100
-@@ -6,8 +6,8 @@
++++ trunk/ext/RMagick/extconf.rb.in	2006-01-30 10:20:56.000000000 +0100
+@@ -6,16 +6,10 @@
  # Pass along Ruby's version number
  VERSION_NUMBER = '0x'+RUBY_VERSION.tr('.','')
  
 -$CFLAGS = "-Wall -g @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}"
  
- if RUBY_VERSION >= '1.8.0'
-     $DLDFLAGS = "@LDFLAGS@"
-@@ -15,7 +15,7 @@
-     $LDFLAGS = "@LDFLAGS@"
- end
- 
 -$LOCAL_LIBS = "@LOCAL_LIBS@"
 +$LOCAL_LIBS = `pkg-config --libs ImageMagick`.chomp