[DRE-commits] r4350 - in trunk/libparsetree-ruby/debian: . patches

[Sebastien Delafond]

Author: seb
Date: 2009-11-20 16:35:56 +0000 (Fri, 20 Nov 2009)
New Revision: 4350

Added:
   trunk/libparsetree-ruby/debian/patches/30_no-rubygems.dpatch
Modified:
   trunk/libparsetree-ruby/debian/changelog
   trunk/libparsetree-ruby/debian/patches/00list
Log:
3.0.4-3.


Modified: trunk/libparsetree-ruby/debian/changelog
===================================================================
--- trunk/libparsetree-ruby/debian/changelog	2009-11-20 13:55:47 UTC (rev 4349)
+++ trunk/libparsetree-ruby/debian/changelog	2009-11-20 16:35:56 UTC (rev 4350)
@@ -1,3 +1,9 @@
+libparsetree-ruby (3.0.4-3) unstable; urgency=low
+
+  * Do not require rubygems (Closes: #553667).
+
+ -- Sebastien Delafond <seb at debian.org>  Fri, 20 Nov 2009 17:34:41 +0100
+
 libparsetree-ruby (3.0.4-2) unstable; urgency=low
 
   * Depend on libsexp-processor-ruby1.8 (Closes: #557205).

Modified: trunk/libparsetree-ruby/debian/patches/00list
===================================================================
--- trunk/libparsetree-ruby/debian/patches/00list	2009-11-20 13:55:47 UTC (rev 4349)
+++ trunk/libparsetree-ruby/debian/patches/00list	2009-11-20 16:35:56 UTC (rev 4350)
@@ -1,3 +1,4 @@
 10_correct-path-for-ruby-interpreter
 20_no-shebang
 #30_fix_for_ruby_1.8.7.160
+30_no-rubygems.dpatch

Added: trunk/libparsetree-ruby/debian/patches/30_no-rubygems.dpatch
===================================================================
--- trunk/libparsetree-ruby/debian/patches/30_no-rubygems.dpatch	                        (rev 0)
+++ trunk/libparsetree-ruby/debian/patches/30_no-rubygems.dpatch	2009-11-20 16:35:56 UTC (rev 4350)
@@ -0,0 +1,67 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30_no-rubygems.dpatch by Tobias Grimm <etobi at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Don't require rubygems if not available.
+
+ at DPATCH@
+diff -urNad libparsetree-ruby-3.0.4~/bin/parse_tree_abc libparsetree-ruby-3.0.4/bin/parse_tree_abc
+--- libparsetree-ruby-3.0.4~/bin/parse_tree_abc	2009-11-01 20:59:14.000000000 +0100
++++ libparsetree-ruby-3.0.4/bin/parse_tree_abc	2009-11-01 20:59:58.000000000 +0100
+@@ -14,7 +14,7 @@
+ 
+ PARSE_TREE_ABC=true
+ 
+-begin require 'rubygems' rescue LoadError end
++begin; require 'rubygems'; rescue LoadError; end
+ require 'sexp'
+ require 'parse_tree'
+ require 'sexp_processor'
+diff -urNad libparsetree-ruby-3.0.4~/bin/parse_tree_deps libparsetree-ruby-3.0.4/bin/parse_tree_deps
+--- libparsetree-ruby-3.0.4~/bin/parse_tree_deps	2009-11-01 20:59:14.000000000 +0100
++++ libparsetree-ruby-3.0.4/bin/parse_tree_deps	2009-11-01 21:00:07.000000000 +0100
+@@ -6,7 +6,7 @@
+ 
+ require 'pp'
+ 
+-begin require 'rubygems' rescue LoadError end
++begin; require 'rubygems'; rescue LoadError; end
+ require 'parse_tree'
+ require 'sexp_processor'
+ 
+diff -urNad libparsetree-ruby-3.0.4~/bin/parse_tree_show libparsetree-ruby-3.0.4/bin/parse_tree_show
+--- libparsetree-ruby-3.0.4~/bin/parse_tree_show	2009-11-01 20:59:14.000000000 +0100
++++ libparsetree-ruby-3.0.4/bin/parse_tree_show	2009-11-01 20:59:40.000000000 +0100
+@@ -1,7 +1,7 @@
+ #!/usr/bin/ruby1.8 -ws
+ 
+ require 'pp'
+-begin require 'rubygems' rescue LoadError end
++begin; require 'rubygems'; rescue LoadError; end
+ require 'parse_tree'
+ require 'sexp'
+ 
+diff -urNad libparsetree-ruby-3.0.4~/lib/gauntlet_parsetree.rb libparsetree-ruby-3.0.4/lib/gauntlet_parsetree.rb
+--- libparsetree-ruby-3.0.4~/lib/gauntlet_parsetree.rb	2008-12-14 08:55:23.000000000 +0100
++++ libparsetree-ruby-3.0.4/lib/gauntlet_parsetree.rb	2009-11-01 20:59:14.000000000 +0100
+@@ -5,7 +5,7 @@
+ $:.unshift "../../ruby_parser/dev/lib"
+ $:.unshift "../../ParseTree/dev/lib"
+ 
+-require 'rubygems'
++begin; require 'rubygems'; rescue LoadError; end
+ require 'parse_tree'
+ require 'ruby_parser'
+ 
+diff -urNad libparsetree-ruby-3.0.4~/lib/parse_tree.rb libparsetree-ruby-3.0.4/lib/parse_tree.rb
+--- libparsetree-ruby-3.0.4~/lib/parse_tree.rb	2009-11-01 20:59:14.000000000 +0100
++++ libparsetree-ruby-3.0.4/lib/parse_tree.rb	2009-11-01 20:59:14.000000000 +0100
+@@ -3,7 +3,7 @@
+ raise LoadError, "ParseTree isn't needed with rubinius" if
+   defined? RUBY_ENGINE and RUBY_ENGINE == "rbx"
+ 
+-require 'rubygems'
++begin; require 'rubygems'; rescue LoadError; end
+ require 'inline'
+ require 'unified_ruby'
+