[DRE-commits] [SCM] ruby-treetop.git branch, master, updated. upstream/1.4.10-22-g9fb36ef
Carl Worth
cworth at debian.org
Thu Mar 1 22:48:04 UTC 2012
The following commit has been merged in the master branch:
commit a72ecd044a552ea9b16065d923e5ec8e6f2e6614
Author: Carl Worth <cworth at debian.org>
Date: Thu Mar 1 13:57:45 2012 -0800
Refresh debian/patches
diff --git a/debian/patches/do-not-require-rubygems.patch b/debian/patches/0001-Do-not-require-rubygems.patch
similarity index 53%
rename from debian/patches/do-not-require-rubygems.patch
rename to debian/patches/0001-Do-not-require-rubygems.patch
index baa43e0..17caf67 100644
--- a/debian/patches/do-not-require-rubygems.patch
+++ b/debian/patches/0001-Do-not-require-rubygems.patch
@@ -1,18 +1,24 @@
-Do not require rubygems
+From: Carl Worth <cworth at debian.org>
+Date: Thu, 1 Mar 2012 13:41:38 -0800
+Subject: 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
+---
+ README.md | 1 -
+ bin/tt | 1 -
+ doc/site.rb | 3 +--
+ examples/lambda_calculus/test_helper.rb | 3 +--
+ lib/treetop/bootstrap_gen_1_metagrammar.rb | 2 --
+ spec/spec_helper.rb | 1 -
+ 6 files changed, 2 insertions(+), 9 deletions(-)
---- 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
+diff --git a/README.md b/README.md
+index 52ea59e..e89a758 100644
+--- a/README.md
++++ b/README.md
+@@ -31,7 +31,6 @@ Next, you start filling your grammar with rules. Each rule associates a name 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
@@ -20,26 +26,10 @@ Bug-Debian: http://bugs.debian.org/624624
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
+diff --git a/bin/tt b/bin/tt
+index f0f8113..1dcf278 100755
+--- a/bin/tt
++++ b/bin/tt
@@ -1,6 +1,5 @@
#!/usr/bin/env ruby
require 'optparse'
@@ -47,8 +37,26 @@ Bug-Debian: http://bugs.debian.org/624624
$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
+diff --git a/doc/site.rb b/doc/site.rb
+index c65f5b1..1220624 100644
+--- a/doc/site.rb
++++ b/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/examples/lambda_calculus/test_helper.rb b/examples/lambda_calculus/test_helper.rb
+index bfdb7ad..cbb56d4 100644
+--- a/examples/lambda_calculus/test_helper.rb
++++ b/examples/lambda_calculus/test_helper.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require 'rubygems'
@@ -62,17 +70,25 @@ Bug-Debian: http://bugs.debian.org/624624
-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
+diff --git a/lib/treetop/bootstrap_gen_1_metagrammar.rb b/lib/treetop/bootstrap_gen_1_metagrammar.rb
+index eeea9ab..e86a421 100644
+--- a/lib/treetop/bootstrap_gen_1_metagrammar.rb
++++ b/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'
--Layout.generate_site
-\ No newline at end of file
-+Layout.generate_site
+ # Loading trusted version of Treetop to compile the compiler
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index 8870005..450e5cf 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -1,4 +1,3 @@
+-require 'rubygems'
+ require 'benchmark'
+ require 'rspec'
+ require 'polyglot'
diff --git a/debian/patches/add-tt-manual-page.patch b/debian/patches/0002-Add-a-tt-manual-page.patch
similarity index 56%
rename from debian/patches/add-tt-manual-page.patch
rename to debian/patches/0002-Add-a-tt-manual-page.patch
index eb0a1ca..ad0e564 100644
--- a/debian/patches/add-tt-manual-page.patch
+++ b/debian/patches/0002-Add-a-tt-manual-page.patch
@@ -1,31 +1,39 @@
-Description: Add a manual page for the tt command.
- Debian is nice enough to warn on binaries without manual pages. We can
- be nice enough to provide one. Most of the text here comes from:
- .
- http://treetop.rubyforge.org/using_in_ruby.html
- .
- ruby-treetop (1.4.10-1) UNRELEASED; urgency=low
- .
- * Initial release (Closes: #624624)
-Author: Carl Worth <cworth at debian.org>
+From: Carl Worth <cworth at debian.org>
+Date: Thu, 1 Mar 2012 13:42:01 -0800
+Subject: Add a tt manual page.
+Debian is nice enough to warn on binaries without manual pages. We can
+be nice enough to provide one. Most of the text here comes from:
+
+ http://treetop.rubyforge.org/using_in_ruby.html
+
+Some additional text, (including the available options), come from the
+output of "tt --help".
+---
+ doc/tt.1 | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 82 insertions(+), 0 deletions(-)
+ create mode 100644 doc/tt.1
+
+diff --git a/doc/tt.1 b/doc/tt.1
+new file mode 100644
+index 0000000..e2adebd
--- /dev/null
-+++ ruby-treetop-1.4.10/doc/tt.1
-@@ -0,0 +1,49 @@
++++ b/doc/tt.1
+@@ -0,0 +1,82 @@
+.\" treetop - Bringing the simplicity of Ruby to syntactic analysis
+.\"
+.\" Copyright (c) 2007 Nathan Sobo.
-+.\"
++.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining a copy
+.\" of this software and associated documentation files (the "Software"), to deal
+.\" in the Software without restriction, including without limitation the rights
+.\" to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+.\" copies of the Software, and to permit persons to whom the Software is
+.\" furnished to do so, subject to the following conditions:
-+.\"
++.\"
+.\" The above copyright notice and this permission notice shall be included in
+.\" all copies or substantial portions of the Software.
-+.\"
++.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -33,15 +41,13 @@ Author: Carl Worth <cworth at debian.org>
+.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+.\" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+.\" THE SOFTWARE.
-+.TH tt 1 2012-03-01 Treetop Treetop
++.TH tt 1 2012-03-01 Treetop "Treetop v1.4.10"
+.SH NAME
+tt \- Compile a treetop grammar file to ruby source code
+.SH SYNOPSIS
+.B tt
-+foo.treetop bar.treetop [...]
++[options] grammar_file[.treetop|.tt] ...
+
-+.B tt
-+foo.treetop -o foogrammar.rb
+.SH DESCRIPTION
+The
+.B tt
@@ -56,6 +62,41 @@ Author: Carl Worth <cworth at debian.org>
+
+Alternately, you can supply just one .treetop file and a -o flag to
+specify the name of the output file.
++
++Note: While treetop grammar files
++.B must
++have a supported filename extensions, (.treetop or .tt), the extension
++name is not required when calling the compiler with grammar file
++names.
++.SH OPTIONS
++.TP 4
++.BR "\-o, \-\-output" " FILENAME"
++
++Write parser source to FILENAME.
++.TP 4
++.B \-f, \-\-force
++
++Overwrite existing output file(s)
++.TP 4
++.B \-v, \-\-version
++
++Show Treetop version
++.TP 4
++.B \-h, \-\-help
++
++.SH EXAMPLES
++.TP 4
++1 grammar -> 1 parser source
++
++tt foo.tt
++.TP 4
++2 grammars -> 2 separate parsers
++
++tt foo bar.treetop
++.TP 4
++Alternately named output file
++
++tt -o alterate_name.rb foo
+.SH SEE ALSO
+
+The treetop website:
diff --git a/debian/patches/series b/debian/patches/series
index de92396..04924e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-do-not-require-rubygems.patch
-add-tt-manual-page.patch
+0001-Do-not-require-rubygems.patch
+0002-Add-a-tt-manual-page.patch
--
ruby-treetop.git
More information about the Pkg-ruby-extras-commits
mailing list