[DRE-commits] [ruby-gherkin] 03/08: Drop all patches, superseded upstream.
Stefano Rivera
stefano at rivera.za.net
Fri Jul 22 18:42:53 UTC 2016
This is an automated email from the git hooks/post-receive script.
stefanor pushed a commit to branch master
in repository ruby-gherkin.
commit 5c64ca835b0ea397d0f4fdcbe9d6f74dcd5d0a88
Author: Stefano Rivera <stefanor at debian.org>
Date: Wed Jul 20 16:31:32 2016 -0700
Drop all patches, superseded upstream.
---
debian/changelog | 1 +
debian/patches/encoding_ruby21.patch | 45 ----------------------
debian/patches/fix_path_ragel_task.patch | 19 ---------
debian/patches/remove_bundler_rubygems_stuff.patch | 19 ---------
debian/patches/same_sed_all_arches.patch | 20 ----------
debian/patches/series | 6 ---
debian/patches/skip_beautify_ragel_task.patch | 30 ---------------
debian/patches/skip_encoding_lexer.patch | 28 --------------
8 files changed, 1 insertion(+), 167 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0b87ace..1d3ecb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
ruby-gherkin (4.0.0-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Drop all patches, superseded upstream.
-- Stefano Rivera <stefanor at debian.org> Wed, 20 Jul 2016 16:22:33 -0700
diff --git a/debian/patches/encoding_ruby21.patch b/debian/patches/encoding_ruby21.patch
deleted file mode 100644
index 84ac5a4..0000000
--- a/debian/patches/encoding_ruby21.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Description: change regexp match on Ruby version to handle Ruby2.1
- in order to known when to use Encoding features.
- This change makes ruby-gherkin compatible with Ruby2.1.
- Use something like defined? Encoding may not work since Gherkin as an Encoding
- class.
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744807
-Bug: https://github.com/cucumber/gherkin/issues/305
-Forwarded: https://github.com/cucumber/gherkin/pull/306
-Origin: vendor
-Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2014-04-25
-
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -6,7 +6,7 @@
- result
- end
-
--if RUBY_VERSION =~ /1\.9|2\.0/
-+if RUBY_VERSION =~ /^(1\.9|2\.)/
- silence_warnings do
- Encoding.default_external = Encoding::UTF_8
- Encoding.default_internal = Encoding::UTF_8
---- a/ragel/lexer.rb.rl.erb
-+++ b/ragel/lexer.rb.rl.erb
-@@ -165,7 +165,7 @@
- utf8_pack(rest[0..rest.index(10)||-1]).strip # 10 is \n
- end
-
-- if (RUBY_VERSION =~ /^1\.9|2\.0/)
-+ if (RUBY_VERSION =~ /^(1\.9|2\.)/)
- def utf8_pack(array)
- array.pack("c*").force_encoding("UTF-8")
- end
---- a/lib/gherkin/formatter/pretty_formatter.rb
-+++ b/lib/gherkin/formatter/pretty_formatter.rb
-@@ -199,7 +199,7 @@
- end
- end
-
-- if(RUBY_VERSION =~ /^1\.9|2\.0/)
-+ if(RUBY_VERSION =~ /^(1\.9|2\.)/)
- START = /#{'^'.encode('UTF-8')}/
- TRIPLE_QUOTES = /#{'"""'.encode('UTF-8')}/
- else
diff --git a/debian/patches/fix_path_ragel_task.patch b/debian/patches/fix_path_ragel_task.patch
deleted file mode 100644
index ca8c9cd..0000000
--- a/debian/patches/fix_path_ragel_task.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: fix path to be replaced by sed in ragel_task.rb
- Since ragel is called from debian/ instead of tasks/, paths to be replaced
- should be adapted.
-Author: Cédric Boutillier <boutil at debian.org>
-Origin: vendor
-Forwarded: not-needed
-Last-Update: 2013-08-12
-
---- a/tasks/ragel_task.rb
-+++ b/tasks/ragel_task.rb
-@@ -30,7 +30,7 @@
- ragel = @lang == 'js' ? 'js/ragel-osx' : 'ragel'
- sh "#{ragel} #{flags} #{lang_ragel} -o #{target}"
- # Remove absolute paths from ragel-generated sources
-- sh %{#{sed} "s|#{Dir.pwd}/tasks/../||" #{target}}
-+ sh %{#{sed} "s|#{File.dirname __FILE__}/../||" #{target}}
- if(@lang == 'js')
- # Ragel chokes if we put the escaped triple quotes in .rl, so we'll do the replace with sed after the fact. Lots of backslashes!!
- sh %{#{sed} 's/ESCAPED_TRIPLE_QUOTE/\\\\\\\\\\\\"\\\\\\\\\\\\"\\\\\\\\\\\\"/' #{target}}
diff --git a/debian/patches/remove_bundler_rubygems_stuff.patch b/debian/patches/remove_bundler_rubygems_stuff.patch
deleted file mode 100644
index d1ed22e..0000000
--- a/debian/patches/remove_bundler_rubygems_stuff.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Remove bundler and rubygems stuff from spec_helper.rb
- These lines are not needed on Debian systems since dependencies are available
- as Debian packages.
-Origin: vendor
-Last-Update: 2013-11-28
-
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -17,10 +17,6 @@
- ArrayList.__persistent__ = true
- end
-
--require 'rubygems'
--require 'bundler'
--Bundler.setup
--
- require 'rspec'
- require 'gherkin'
- require 'stringio'
diff --git a/debian/patches/same_sed_all_arches.patch b/debian/patches/same_sed_all_arches.patch
deleted file mode 100644
index 6aed729..0000000
--- a/debian/patches/same_sed_all_arches.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Use same sed command on all arches
- since all arches work with the same GNU userspace, there is no need to
- distinguish linux from other flavors
-Author: Cédric Boutillier <boutil at debian.org>
-Origin: vendor
-Forwarded: not-needed
-Last-Update: 2013-09-02
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/tasks/ragel_task.rb
-+++ b/tasks/ragel_task.rb
-@@ -22,7 +22,7 @@
- def define_tasks
- deps = [lang_ragel, common_ragel]
- deps.unshift(UGLIFYJS) if(@lang == 'js')
-- sed = RbConfig::CONFIG['host_os'] =~ /linux/i ? "sed -i" : "sed -i ''"
-+ sed = "sed -i"
-
- min_target = target.gsub(/\.js$/, '.min.js')
- file target => deps do
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index bca75a1..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,6 +0,0 @@
-remove_bundler_rubygems_stuff.patch
-fix_path_ragel_task.patch
-same_sed_all_arches.patch
-skip_beautify_ragel_task.patch
-skip_encoding_lexer.patch
-encoding_ruby21.patch
diff --git a/debian/patches/skip_beautify_ragel_task.patch b/debian/patches/skip_beautify_ragel_task.patch
deleted file mode 100644
index 8627d68..0000000
--- a/debian/patches/skip_beautify_ragel_task.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: drop beautification of generated Ruby code
- This depends on ruby-beautify, which is not packaged (#730712).
- See debian/TODO
-Author: Cédric Boutillier <boutil at debian.org>
-Forwarded: not-needed
-Last-Update: 2013-11-28
-
---- a/tasks/ragel_task.rb
-+++ b/tasks/ragel_task.rb
-@@ -40,13 +40,13 @@
- sh %{node #{UGLIFYJS} #{target} > #{min_target}}
- end
-
-- if(@lang == 'rb')
-- # Prettify the code so we don't get indentation warnings
-- sh %{rbeautify #{target} > tmp.rb}
-- sh %{mv tmp.rb #{target}}
-- # rbeautify has a bug with class << self ... end alignment. Fix it.
-- sh %{perl -i -0pe 's/ end\n self._/ end\n self._/g' #{target}}
-- end
-+ #if(@lang == 'rb')
-+ # # Prettify the code so we don't get indentation warnings
-+ # sh %{rbeautify #{target} > tmp.rb}
-+ # sh %{mv tmp.rb #{target}}
-+ # # rbeautify has a bug with class << self ... end alignment. Fix it.
-+ # sh %{perl -i -0pe 's/ end\n self._/ end\n self._/g' #{target}}
-+ #end
- end
-
- if(@lang != 'java')
diff --git a/debian/patches/skip_encoding_lexer.patch b/debian/patches/skip_encoding_lexer.patch
deleted file mode 100644
index 7391ce3..0000000
--- a/debian/patches/skip_encoding_lexer.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: skip specs from encoding_group.rb for C and native lexers
- On powerpc,
- - the first one fails with the C lexer
- - the second one fail with the C and the Native lexers
-Author: Cédric Boutillier <boutil at debian.org>
-Origin: vendor
-Last-Update: 2013-11-28
-
---- a/spec/gherkin/shared/encoding_group.rb
-+++ b/spec/gherkin/shared/encoding_group.rb
-@@ -3,7 +3,7 @@
- module Lexer
- shared_examples_for "encoding" do
- describe "with BOM" do
-- it "should work just fine" do
-+ xit "should work just fine" do
- scan_file("with_bom.feature")
- @listener.to_sexp.should == [
- [:feature, "Feature", "Feature Text", "", 1],
-@@ -14,7 +14,7 @@
- end
-
- describe "and language specification" do
-- it "should work just fine" do
-+ xit "should work just fine" do
- @lexer = Gherkin::Lexer::I18nLexer.new(@listener)
- scan_file("with_bom_and_language_spec.feature")
- @listener.to_sexp.should == [
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-gherkin.git
More information about the Pkg-ruby-extras-commits
mailing list