[DRE-commits] r2481 - in packages/libsetup-ruby/trunk/debian: . patches
lucas at alioth.debian.org
lucas at alioth.debian.org
Wed Feb 13 22:51:47 UTC 2008
Author: lucas
Date: 2008-02-13 22:51:46 +0000 (Wed, 13 Feb 2008)
New Revision: 2481
Added:
packages/libsetup-ruby/trunk/debian/patches/
packages/libsetup-ruby/trunk/debian/patches/00list
packages/libsetup-ruby/trunk/debian/patches/fix-metaconfig.dpatch
Modified:
packages/libsetup-ruby/trunk/debian/rules
Log:
add a patch to fix add_bool_config
Added: packages/libsetup-ruby/trunk/debian/patches/00list
===================================================================
--- packages/libsetup-ruby/trunk/debian/patches/00list (rev 0)
+++ packages/libsetup-ruby/trunk/debian/patches/00list 2008-02-13 22:51:46 UTC (rev 2481)
@@ -0,0 +1 @@
+fix-metaconfig.dpatch
Added: packages/libsetup-ruby/trunk/debian/patches/fix-metaconfig.dpatch
===================================================================
--- packages/libsetup-ruby/trunk/debian/patches/fix-metaconfig.dpatch (rev 0)
+++ packages/libsetup-ruby/trunk/debian/patches/fix-metaconfig.dpatch 2008-02-13 22:51:46 UTC (rev 2481)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## plop.dpatch by Lucas Nussbaum <lucas at lucas-nussbaum.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix add_bool_config in metaconfig.
+## DP: From upstream's SVN commit 2634
+## DP: required for librmagick-ruby 2.2.0
+
+ at DPATCH@
+diff -urNad trunk~/setup.rb trunk/setup.rb
+--- trunk~/setup.rb 2005-11-20 12:54:27.000000000 +0100
++++ trunk/setup.rb 2008-02-13 23:48:53.000000000 +0100
+@@ -296,13 +296,14 @@
+ ALIASES.each do |ali, name|
+ @table[ali] = @table[name]
+ end
+- @items.freeze
+- @table.freeze
+- @options_re = /\A--(#{@table.keys.join('|')})(?:=(.*))?\z/
++ end
++
++ def options_re
++ /\A--(#{@table.keys.join('|')})(?:=(.*))?\z/
+ end
+
+ def parse_opt(opt)
+- m = @options_re.match(opt) or setup_rb_error "config: unknown option #{opt}"
++ m = options_re().match(opt) or setup_rb_error "config: unknown option #{opt}"
+ m.to_a[1,2]
+ end
+
Property changes on: packages/libsetup-ruby/trunk/debian/patches/fix-metaconfig.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/libsetup-ruby/trunk/debian/rules
===================================================================
--- packages/libsetup-ruby/trunk/debian/rules 2008-02-12 23:13:24 UTC (rev 2480)
+++ packages/libsetup-ruby/trunk/debian/rules 2008-02-13 22:51:46 UTC (rev 2481)
@@ -1,5 +1,6 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
# Add here any variable or target overrides you need.
More information about the Pkg-ruby-extras-commits
mailing list