[DRE-commits] [SCM] ruby-treetop.git branch, master, updated. upstream/1.4.10-13-g262c329

[Carl Worth]

The following commit has been merged in the master branch:
commit 6b5ae8723efc9ba5b034cb1c5aa64f19885abc53
Author: Carl Worth <cworth at debian.org>
Date:   Tue Feb 28 17:07:23 2012 -0800

    debian: Add a patch to remove uses of "require rubygems".
    
    These are undesired with a Debian-packaged treetop.

diff --git a/debian/patches/do-not-require-rubygems.patch b/debian/patches/do-not-require-rubygems.patch
new file mode 100644
index 0000000..baa43e0
--- /dev/null
+++ b/debian/patches/do-not-require-rubygems.patch
@@ -0,0 +1,78 @@
+Do not require rubygems
+
+ With Debian-packaged treetop, the implementation need not require
+ rubygems, (nor should it instruct the user to require rubygems in
+ order to use treetop).
+ .
+ ruby-treetop (1.4.10-1) UNRELEASED; urgency=low
+ .
+   * Initial release (Closes: #624624)
+Author: Carl Worth <cworth at debian.org>
+Bug-Debian: http://bugs.debian.org/624624
+
+--- ruby-treetop-1.4.10.orig/README.md
++++ ruby-treetop-1.4.10/README.md
+@@ -31,7 +31,6 @@ Next, you start filling your grammar wit
+ The first rule becomes the *root* of the grammar, causing its expression to be matched when a parser for the grammar is fed a string. The above grammar can now be used in a Ruby program. Notice how a string matching the first rule parses successfully, but a second nonmatching string does not.
+ 
+     # use_grammar.rb
+-    require 'rubygems'
+     require 'treetop'
+     Treetop.load 'my_grammar'
+     # or just:
+--- ruby-treetop-1.4.10.orig/spec/spec_helper.rb
++++ ruby-treetop-1.4.10/spec/spec_helper.rb
+@@ -1,4 +1,3 @@
+-require 'rubygems'
+ require 'benchmark'
+ require 'rspec'
+ require 'polyglot'
+--- ruby-treetop-1.4.10.orig/lib/treetop/bootstrap_gen_1_metagrammar.rb
++++ ruby-treetop-1.4.10/lib/treetop/bootstrap_gen_1_metagrammar.rb
+@@ -1,8 +1,6 @@
+ # This file's job is to load a Treetop::Compiler::Metagrammar and Treetop::Compiler::MetagrammarParser
+ # into the environment by compiling the current metagrammar.treetop using a trusted version of Treetop.
+ 
+-require 'rubygems'
+-
+ TREETOP_VERSION_REQUIRED_TO_BOOTSTRAP = '>= 1.1.5'
+ 
+ # Loading trusted version of Treetop to compile the compiler
+--- ruby-treetop-1.4.10.orig/bin/tt
++++ ruby-treetop-1.4.10/bin/tt
+@@ -1,6 +1,5 @@
+ #!/usr/bin/env ruby
+ require 'optparse'
+-require 'rubygems'
+ 
+ $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
+ require 'treetop'
+--- ruby-treetop-1.4.10.orig/examples/lambda_calculus/test_helper.rb
++++ ruby-treetop-1.4.10/examples/lambda_calculus/test_helper.rb
+@@ -1,5 +1,4 @@
+ require 'test/unit'
+-require 'rubygems'
+ require 'treetop'
+ 
+ module ParserTestHelper
+@@ -15,4 +14,4 @@ module ParserTestHelper
+     assert !result.nil?
+     result
+   end
+-end
+\ No newline at end of file
++end
+--- ruby-treetop-1.4.10.orig/doc/site.rb
++++ ruby-treetop-1.4.10/doc/site.rb
+@@ -1,4 +1,3 @@
+-require 'rubygems'
+ require 'erector'
+ require "#{File.dirname(__FILE__)}/sitegen"
+ require 'fileutils'
+@@ -109,4 +108,4 @@ class Contribute < Layout
+ end
+ 
+ 
+-Layout.generate_site
+\ No newline at end of file
++Layout.generate_site
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1f6221c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+do-not-require-rubygems.patch

-- 
ruby-treetop.git