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

[Lucas Nussbaum]

Author: lucas-guest
Date: 2006-10-23 12:55:37 +0000 (Mon, 23 Oct 2006)
New Revision: 938

Modified:
   packages/librmagick-ruby/trunk/debian/changelog
   packages/librmagick-ruby/trunk/debian/control
   packages/librmagick-ruby/trunk/debian/patches/pkg-config.dpatch
Log:
Packaged librmagick-ruby 1.14.1.

New upstream release ; adjusted pkg-config.dpatch.
Well tested, ready for upload from my POV.



Modified: packages/librmagick-ruby/trunk/debian/changelog
===================================================================
--- packages/librmagick-ruby/trunk/debian/changelog	2006-10-22 17:25:07 UTC (rev 937)
+++ packages/librmagick-ruby/trunk/debian/changelog	2006-10-23 12:55:37 UTC (rev 938)
@@ -1,9 +1,13 @@
-librmagick-ruby (1.13.0-2) UNRELEASED; urgency=low
+librmagick-ruby (1.14.1-1) UNRELEASED; urgency=low
 
+  [ Paul van Tilburg ]
   * Include the upstream examples in the librmagick-ruby-doc package.
 
- -- Paul van Tilburg <paulvt at debian.org>  Sun, 30 Jul 2006 21:08:50 +0200
+  [ Lucas Nussbaum ]
+  * New upstream release.
 
+ -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Mon, 23 Oct 2006 14:16:21 +0200
+
 librmagick-ruby (1.13.0-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/librmagick-ruby/trunk/debian/control
===================================================================
--- packages/librmagick-ruby/trunk/debian/control	2006-10-22 17:25:07 UTC (rev 937)
+++ packages/librmagick-ruby/trunk/debian/control	2006-10-23 12:55:37 UTC (rev 938)
@@ -2,7 +2,7 @@
 Section: interpreters
 Priority: optional
 Maintainer: Lucas Nussbaum <lucas at lucas-nussbaum.net>
-Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, 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>, Thierry Reding <thierry at doppeltgemoppelt.de>, Marc Dequènes (Duck) <Duck at DuckCorp.org>, Ari Pollak <ari at debian.org>
+Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, 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>, Thierry Reding <thierry at doppeltgemoppelt.de>, Marc Dequènes (Duck) <Duck at DuckCorp.org>, Ari Pollak <ari at debian.org>, Daigo Moriwaki <daigo at debian.org>, Vincent Fourmond <vincent.fourmond at 9online.fr>, Rudi Cilibrasi <cilibrar at cilibrar.com>, Patrick Ringl <patrick_ at freenet.de>
 Build-Depends: debhelper (>= 5), libmagick9-dev (>= 6.2.4), ruby1.8, ruby1.8-dev, libwmf-bin, gs-gpl, gsfonts, cdbs (>= 0.4.33), ruby-pkg-tools (>= 0.8), rdoc, graphviz, dpatch, pkg-config
 Standards-Version: 3.7.2
 

Modified: packages/librmagick-ruby/trunk/debian/patches/pkg-config.dpatch
===================================================================
--- packages/librmagick-ruby/trunk/debian/patches/pkg-config.dpatch	2006-10-22 17:25:07 UTC (rev 937)
+++ packages/librmagick-ruby/trunk/debian/patches/pkg-config.dpatch	2006-10-23 12:55:37 UTC (rev 938)
@@ -5,14 +5,14 @@
 ## DP: Use pkg-config instead of MagickConfig (see bug 347401)
 
 @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-02-01 23:37:05.000000000 +0100
+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 = "-Wall -g @CFLAGS@"
+-$CFLAGS = "@CFLAGS@"
 -$CPPFLAGS = "-DRUBY_VERSION=#{VERSION_NUMBER} @CPPFLAGS@"
 -
 -if RUBY_VERSION >= '1.8.0'
@@ -20,11 +20,11 @@
 -else
 -    $LDFLAGS = "@LDFLAGS@"
 -end
-+$CFLAGS = "-Wall -g " + `pkg-config --cflags ImageMagick`.chomp
++$CFLAGS = "-Wall -g" + `pkg-config --cflags ImageMagick`.chomp
 +$CPPFLAGS = "-DRUBY_VERSION=#{VERSION_NUMBER}"
  
 -$LOCAL_LIBS = "@LOCAL_LIBS@"
 +$LOCAL_LIBS = `pkg-config --libs ImageMagick`.chomp
  
- create_makefile("RMagick")
- 
+ # Force re-compilation if the generated Makefile or
+ # rmagick_config.h changed.