[DRE-commits] [ruby-treetop] 03/06: Drop patch: 0001-Do-not-require-rubygems.patch. No longer needed.

Lucas Nussbaum lucas at moszumanska.debian.org
Tue May 12 11:31:14 UTC 2015


This is an automated email from the git hooks/post-receive script.

lucas pushed a commit to branch master
in repository ruby-treetop.

commit 9f95d1c4054bdf6e1f54792515f40df40acf60f1
Author: Lucas Nussbaum <lucas at debian.org>
Date:   Tue May 12 13:09:41 2015 +0200

    Drop patch: 0001-Do-not-require-rubygems.patch. No longer needed.
---
 debian/changelog                                  |  1 +
 debian/patches/0001-Do-not-require-rubygems.patch | 82 -----------------------
 debian/patches/series                             |  1 -
 3 files changed, 1 insertion(+), 83 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 843caed..9a737f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ ruby-treetop (1.6.2-1) UNRELEASED; urgency=medium
   * Refreshed packaging using dh-make-ruby.
   * Add patch: do-not-depend-on-lib-for-tests.patch. This is required
     to allow running tests on ci.d.n.
+  * Drop patch: 0001-Do-not-require-rubygems.patch. No longer needed.
 
  -- Lucas Nussbaum <lucas at debian.org>  Tue, 12 May 2015 12:55:39 +0200
 
diff --git a/debian/patches/0001-Do-not-require-rubygems.patch b/debian/patches/0001-Do-not-require-rubygems.patch
deleted file mode 100644
index 977b7ad..0000000
--- a/debian/patches/0001-Do-not-require-rubygems.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From: Carl Worth <cworth at debian.org>
-Last-Update: 2014-09-22
-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).
----
- 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(-)
-
---- a/README.md
-+++ b/README.md
-@@ -32,7 +32,6 @@
- 
- ```ruby
- # use_grammar.rb
--require 'rubygems'
- require 'treetop'
- Treetop.load 'my_grammar'
- # or just:
---- a/bin/tt
-+++ b/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'
---- 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 @@
- end
- 
- 
--Layout.generate_site
-\ No newline at end of file
-+Layout.generate_site
---- a/examples/lambda_calculus/test_helper.rb
-+++ b/examples/lambda_calculus/test_helper.rb
-@@ -1,5 +1,4 @@
- require 'test/unit'
--require 'rubygems'
- require 'treetop'
- 
- module ParserTestHelper
-@@ -15,4 +14,4 @@
-     assert !result.nil?
-     result
-   end
--end
-\ No newline at end of file
-+end
---- 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'
- 
- # Loading trusted version of Treetop to compile the compiler
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -1,4 +1,3 @@
--require 'rubygems'
- require 'benchmark'
- require 'rspec'
- require 'rspec/core/shared_context'
diff --git a/debian/patches/series b/debian/patches/series
index 5ce1e7f..70a94a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-Do-not-require-rubygems.patch
 do-not-depend-on-lib-for-tests.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-treetop.git



More information about the Pkg-ruby-extras-commits mailing list