[DRE-commits] [ruby-github-markup] 05/07: drop existing patches
Cédric Boutillier
boutil at moszumanska.debian.org
Fri Mar 28 13:21:49 UTC 2014
This is an automated email from the git hooks/post-receive script.
boutil pushed a commit to branch master
in repository ruby-github-markup.
commit e24beb697f61d0e54ba277dab66ca94a1209dcab
Author: Cédric Boutillier <boutil at debian.org>
Date: Thu Mar 27 13:38:31 2014 +0100
drop existing patches
---
.../0001-Update-asciidoc-markup-test-output.patch | 34 ---
.../0002-Update-org-markup-test-output.patch | 228 ---------------------
debian/patches/0003-Remove-failing-test-case.patch | 88 --------
...tch-Errno-ENOENT-exception-when-executing.patch | 23 ---
debian/patches/series | 4 -
5 files changed, 377 deletions(-)
diff --git a/debian/patches/0001-Update-asciidoc-markup-test-output.patch b/debian/patches/0001-Update-asciidoc-markup-test-output.patch
deleted file mode 100644
index c559a14..0000000
--- a/debian/patches/0001-Update-asciidoc-markup-test-output.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Per Andersson <avtobiff at gmail.com>
-Date: Sat, 8 Jun 2013 18:13:19 +0200
-Subject: Update asciidoc markup test output
-
----
- test/markups/README.asciidoc.html | 17 +++++++++--------
- 1 file changed, 9 insertions(+), 8 deletions(-)
-
-diff --git a/test/markups/README.asciidoc.html b/test/markups/README.asciidoc.html
-index 1995173..38ac4d9 100644
---- a/test/markups/README.asciidoc.html
-+++ b/test/markups/README.asciidoc.html
-@@ -1,12 +1,13 @@
--<div class="ulist"><ul>
-+<div class="ulist">
-+
-+<ul>
- <li>
--<p>
--One
--</p>
-+<p>One</p>
- </li>
- <li>
--<p>
--Two
--</p>
-+<p>Two</p>
- </li>
--</ul></div>
-+</ul>
-+</div>
-+
-+
diff --git a/debian/patches/0002-Update-org-markup-test-output.patch b/debian/patches/0002-Update-org-markup-test-output.patch
deleted file mode 100644
index bac0464..0000000
--- a/debian/patches/0002-Update-org-markup-test-output.patch
+++ /dev/null
@@ -1,228 +0,0 @@
-From: Per Andersson <avtobiff at gmail.com>
-Date: Sat, 8 Jun 2013 18:17:20 +0200
-Subject: Update org markup test output
-
----
- test/markups/README.org.html | 185 +++++++++++++++++++-----------------------
- 1 file changed, 82 insertions(+), 103 deletions(-)
-
-diff --git a/test/markups/README.org.html b/test/markups/README.org.html
-index 2438fe7..2d1708b 100644
---- a/test/markups/README.org.html
-+++ b/test/markups/README.org.html
-@@ -4,133 +4,112 @@
- <tr><td>Location:</td><td><a href="http://github.com/bdewey/org-ruby">http://github.com/bdewey/org-ruby</a></td></tr>
- <tr><td>Version:</td><td>0.5.1</td></tr>
- </table>
--<h1><span class="heading-number heading-number-1">1 </span>Description</h1>
--<p>Helpful Ruby routines for parsing orgmode files. The most significant thing this library does today is convert orgmode files to textile. Currently, you cannot do much to customize the conversion. The supplied textile conversion is optimized for extracting “content” from the orgfile as opposed to “metadata.”</p>
--<h1><span class="heading-number heading-number-1">2 </span>History</h1>
--<h2><span class="heading-number heading-number-2">2.1 </span>2009-12-30: Version 0.5.1</h2>
-+<h1><span class="heading-number heading-number-1">1</span> Description</h1>
-+<p>Helpful Ruby routines for parsing orgmode files. The most
-+ significant thing this library does today is convert orgmode files
-+ to textile. Currently, you cannot do much to customize the
-+ conversion. The supplied textile conversion is optimized for
-+ extracting “content” from the orgfile as opposed to “metadata.”</p>
-+<h1><span class="heading-number heading-number-1">2</span> History</h1>
-+<h2><span class="heading-number heading-number-2">2.1</span> 2009-12-30: Version 0.5.1</h2>
- <ul>
-- <li>Minor enhancement: Recognize lines starting with “:” as examples.
-- </li>
-- <li>Minor enhancement: Recognize #+BEGIN_SRC as source blocks
-- </li>
-- <li>Minor enhancement: Add “src” and “example” classes to <pre> blocks.
-- </li>
-+ <li>Minor enhancement: Recognize lines starting with “:” as examples.</li>
-+ <li>Minor enhancement: Recognize #+BEGIN_SRC as source blocks</li>
-+ <li>Minor enhancement: Add “src” and “example” classes to <pre> blocks.</li>
- </ul>
--<h2><span class="heading-number heading-number-2">2.2 </span>2009-12-30: Version 0.5.0</h2>
-+<h2><span class="heading-number heading-number-2">2.2</span> 2009-12-30: Version 0.5.0</h2>
- <ul>
-- <li>Parse (but not necessarily <b>use</b>) in-buffer settings. The following in-buffer settings <b>are</b> used:
-- <ul>
-- <li>Understand the #+TITLE: directive.
-- </li>
-- <li>Exporting todo keywords (option todo:t)
-- </li>
-- <li>Numbering headlines (option num:t)
-- </li>
-- <li>Skipping text before the first headline (option skip:t)
-- </li>
-- <li>Skipping tables (option |:nil)
-- </li>
-- <li>Custom todo keywords
-- </li>
-- <li>EXPORT_SELECT_TAGS and EXPORT_EXLUDE_TAGS for controlling parts of the tree to export
-- </li>
-- </ul>
-- </li>
-- <li>Rewrite “file:(blah).org” links to “http:(blah).html” links. This makes the inter-links to other org-mode files work.
-- </li>
-- <li>Uses <th> tags inside table rows that precede table separators.
-- </li>
-+ <li>Parse (but not necessarily <b>use</b>) in-buffer settings. The following
-+ in-buffer settings <b>are</b> used:
-+ <ul>
-+ <li>Understand the #+TITLE: directive.</li>
-+ <li>Exporting todo keywords (option todo:t)</li>
-+ <li>Numbering headlines (option num:t)</li>
-+ <li>Skipping text before the first headline (option skip:t)</li>
-+ <li>Skipping tables (option |:nil)</li>
-+ <li>Custom todo keywords</li>
-+ <li>EXPORT_SELECT_TAGS and EXPORT_EXLUDE_TAGS for controlling parts of
-+ the tree to export</li>
-+ </ul>
-+ </li>
-+ <li>Rewrite “file:(blah).org” links to “http:(blah).html” links. This
-+ makes the inter-links to other org-mode files work.</li>
-+ <li>Uses <th> tags inside table rows that precede table separators.</li>
- <li>Bugfixes:
-- <ul>
-- <li>Headings now have HTML escaped.
-- </li>
-- </ul>
-+ <ul>
-+ <li>Headings now have HTML escaped.</li>
-+ </ul>
- </li>
- </ul>
--<h2><span class="heading-number heading-number-2">2.3 </span>2009-12-29: Version 0.4.2</h2>
-+<h2><span class="heading-number heading-number-2">2.3</span> 2009-12-29: Version 0.4.2</h2>
- <ul>
-- <li>Got rid of the extraneous newline at the start of code blocks.
-- </li>
-- <li>Everything now shows up in code blocks, even org-mode metadata.
-- </li>
-+ <li>Got rid of the extraneous newline at the start of code blocks.</li>
-+ <li>Everything now shows up in code blocks, even org-mode metadata.</li>
- <li>Fixed bugs:
-- <ul>
-- <li>Regressed smart double quotes with HTML escaping. Added a test case and fixed the regression.
-- </li>
-- </ul>
-+ <ul>
-+ <li>Regressed smart double quotes with HTML escaping. Added a test
-+ case and fixed the regression.</li>
-+ </ul>
- </li>
- </ul>
--<h2><span class="heading-number heading-number-2">2.4 </span>2009-12-29: Version 0.4.1</h2>
-+<h2><span class="heading-number heading-number-2">2.4</span> 2009-12-29: Version 0.4.1</h2>
- <ul>
-- <li>HTML is now escaped by default
-- </li>
-- <li>org-mode comments will show up in a code block.
-- </li>
-+ <li>HTML is now escaped by default</li>
-+ <li>org-mode comments will show up in a code block.</li>
- </ul>
--<h2><span class="heading-number heading-number-2">2.5 </span>2009-12-29: Version 0.4</h2>
-+<h2><span class="heading-number heading-number-2">2.5</span> 2009-12-29: Version 0.4</h2>
- <ul>
-- <li>The first thing output in HTML gets the class “title”
-- </li>
-- <li>HTML output is now indented
-- </li>
-+ <li>The first thing output in HTML gets the class “title”</li>
-+ <li>HTML output is now indented</li>
- <li>Proper support for multi-paragraph list items.
-- <p>See? This paragraph is part of the last bullet.</p>
-+ <p>See? This paragraph is part of the last bullet.</p>
- </li>
- <li>Fixed bugs:
-- <ul>
-- <li>“rake spec” wouldn’t work on Linux. Needed “require ‘rubygems’”.
-- </li>
-- </ul>
-+ <ul>
-+ <li>“rake spec” wouldn’t work on Linux. Needed “require ‘rubygems’”.</li>
-+ </ul>
- </li>
- </ul>
--<h2><span class="heading-number heading-number-2">2.6 </span>2009-12-27: Version 0.3</h2>
-+<h2><span class="heading-number heading-number-2">2.6</span> 2009-12-27: Version 0.3</h2>
- <ul>
-- <li>Uses rubypants to get better typography (smart quotes, elipses, etc…).
-- </li>
-+ <li>Uses rubypants to get better typography (smart quotes, elipses, etc…).</li>
- <li>Fixed bugs:
-- <ul>
-- <li>Tables and lists did not get properly closed at the end of file
-- </li>
-- <li>You couldn’t do inline formatting inside table cells
-- </li>
-- <li>Characters in PRE blocks were not HTML escaped.
-- </li>
-- </ul>
-+ <ul>
-+ <li>Tables and lists did not get properly closed at the end of file</li>
-+ <li>You couldn’t do inline formatting inside table cells</li>
-+ <li>Characters in PRE blocks were not HTML escaped.</li>
-+ </ul>
- </li>
- </ul>
--<h2><span class="heading-number heading-number-2">2.7 </span>2009-12-26: Version 0.2</h2>
-+<h2><span class="heading-number heading-number-2">2.7</span> 2009-12-26: Version 0.2</h2>
- <ul>
-- <li>Added <code>to_html</code> output on the parser.
-- </li>
-- <li>Added support for the full range of inline markup: <b>bold</b>, <i>italic</i>, <code>code</code>, <code>verbatim</code>, <span style="text-decoration:underline;">underline</span>, <del>strikethrough</del>.
-- </li>
-- <li>Lots of refactoring to make the code more maintainable.
-- </li>
-+ <li>Added <code>to_html</code> output on the parser.</li>
-+ <li>Added support for the full range of inline markup: <b>bold</b>,
-+ <i>italic</i>, <code>code</code>, <code>verbatim</code>, <span style="text-decoration:underline;">underline</span>, <del>strikethrough</del>.</li>
-+ <li>Lots of refactoring to make the code more maintainable.</li>
- </ul>
--<h2><span class="heading-number heading-number-2">2.8 </span>2009-12-23: Version 0.1</h2>
-+<h2><span class="heading-number heading-number-2">2.8</span> 2009-12-23: Version 0.1</h2>
- <ul>
- <li>Added support for block code, like this:
-- <pre class="example">
-- def flush!
-- @logger.debug "FLUSH ==========> #{@output_type}"
-- if (@output_type == :blank) then
-- @output << "\n"
-- elsif (@buffer.length > 0) then
-- if @cancel_modifier then
-- @output << "p. " if @output_type == :paragraph
-- @cancel_modifier = false
-- end
-- @output << @paragraph_modifier if (@paragraph_modifier and not sticky_modifier?)
-- @output << @buffer.textile_substitution << "\n"
-- end
-- @buffer = ""
-- end
-- </pre>
-- </li>
-- <ul>
-- <li>Major code cleanup: Created the <code>OutputBuffer</code> class that greatly simplified a lot of the messiness of <code>textile</code> conversion.
-- </li>
-- <li>Added support for line breaks within list items.
-- </li>
-- </ul>
-+ <pre class="example">
-+ def flush!
-+ @logger.debug "FLUSH ==========> #{@output_type}"
-+ if (@output_type == :blank) then
-+ @output << "\n"
-+ elsif (@buffer.length > 0) then
-+ if @cancel_modifier then
-+ @output << "p. " if @output_type == :paragraph
-+ @cancel_modifier = false
-+ end
-+ @output << @paragraph_modifier if (@paragraph_modifier and not sticky_modifier?)
-+ @output << @buffer.textile_substitution << "\n"
-+ end
-+ @buffer = ""
-+end
-+ </pre>
-+ </li>
-+ <li>Major code cleanup: Created the <code>OutputBuffer</code> class that
-+ greatly simplified a lot of the messiness of <code>textile</code>
-+ conversion.</li>
-+ <li>Added support for line breaks within list items.</li>
- </ul>
diff --git a/debian/patches/0003-Remove-failing-test-case.patch b/debian/patches/0003-Remove-failing-test-case.patch
deleted file mode 100644
index b6ab580..0000000
--- a/debian/patches/0003-Remove-failing-test-case.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From: Per Andersson <avtobiff at gmail.com>
-Date: Sat, 8 Jun 2013 21:11:33 +0200
-Subject: Remove failing test case
-
-The gem ruby-wikicloth does not render table of contents (__TOC__) as it
-should.
-
-See http://github.com/nricciar/wikicloth/issues/60
----
- test/markups/README.mediawiki | 24 ------------------------
- test/markups/README.mediawiki.html | 35 -----------------------------------
- 2 files changed, 59 deletions(-)
- delete mode 100644 test/markups/README.mediawiki
- delete mode 100644 test/markups/README.mediawiki.html
-
-diff --git a/test/markups/README.mediawiki b/test/markups/README.mediawiki
-deleted file mode 100644
-index f7c394c..0000000
---- a/test/markups/README.mediawiki
-+++ /dev/null
-@@ -1,24 +0,0 @@
--[[Home|» JRuby Project Wiki Home Page]]
--<h1>Embedding JRuby</h1>
--Using Java from Ruby is JRuby's best-known feature---but you can also go in the other direction, and use Ruby from Java. There are several different ways to do this. You can execute entire Ruby scripts, call individual Ruby methods, or even implement a Java interface in Ruby (thus allowing you to treat Ruby objects like Java ones). We refer to all these techniques generically as "embedding." This section will explain how to embed JRuby in your Java project.
--
--__TOC__
--
--= Red Bridge (JRuby Embed) =
--
--JRuby has long had a private embedding API, which was closely tied to the runtime's internals and therefore changed frequently as JRuby evolved. Since version 1.4, however, we have also provided a more stable public API, known as Red Bridge or JRuby Embed. Existing Java programs written to the [[DirectJRubyEmbedding|legacy API]] should still work, but we strongly recommend Red Bridge for all new projects.
--
--== Features of Red Bridge ==
--Red Bridge consists of two layers: Embed Core on the bottom, and implementations of [http://www.jcp.org/en/jsr/detail?id=223 JSR223] and [http://jakarta.apache.org/bsf/ BSF] on top. Embed Core is JRuby-specific, and can take advantage of much of JRuby's power. JSR223 and BSF are more general interfaces that provide a common ground across scripting languages.
--
--Which API should you use? For projects where Ruby is the only scripting language involved, we recommend Embed Core for the following reasons:
--
--# With Embed Core, you can create several Ruby environments in one JVM, and configure them individually (via <code>org.jruby.RubyInstanceConfig</code>. With the other APIs, configuration options can only be set globally, via the <code>System</code> properties.
--# Embed Core offers several shortcuts, such as loading scripts from a <code>java.io.InputStream</code>, or returning Java-friendly objects from Ruby code. These allow you to skip a lot of boilerplate.
--
--For projects requiring multiple scripting languages, JSR223 is a good fit. Though the API is language-independent, JRuby's implementation of it allows you to set some Ruby-specific options. In particular, you can control the threading model of the scripting engine, the lifetime of local variables, compilation mode, and how line numbers are displayed.
--
--The full [http://jruby-embed.kenai.com/docs/ API documentation] has all the gory details. It's worth talking about a couple of the finer points here.
--
--= Previous Embedding JRuby Page=
--We recommend using Embed Core; however, if you're maintaining code that uses the old API, you can find its documentation on the [[JavaIntegration|legacy embedding]] page.
-\ No newline at end of file
-diff --git a/test/markups/README.mediawiki.html b/test/markups/README.mediawiki.html
-deleted file mode 100644
-index 5e6454b..0000000
---- a/test/markups/README.mediawiki.html
-+++ /dev/null
-@@ -1,35 +0,0 @@
--<p>
--<a href="javascript:void(0)">» JRuby Project Wiki Home Page</a>
--
--<h1>Embedding JRuby</h1>
--
--Using Java from Ruby is JRuby's best-known feature---but you can also go in the other direction, and use Ruby from Java. There are several different ways to do this. You can execute entire Ruby scripts, call individual Ruby methods, or even implement a Java interface in Ruby (thus allowing you to treat Ruby objects like Java ones). We refer to all these techniques generically as "embedding." This section will explain how to embed JRuby in your Java project.
--
--</p><p>
--<table id="toc" class="toc" summary="Contents"><tr><td><div style="font-weight:bold">Table of Contents</div><ul></ul></td></tr></table>
--
--</p><p>
--<h1> <span class="mw-headline" id="Red_Bridge_JRuby_Embed">Red Bridge (JRuby Embed)</span></h1>
--
--JRuby has long had a private embedding API, which was closely tied to the runtime's internals and therefore changed frequently as JRuby evolved. Since version 1.4, however, we have also provided a more stable public API, known as Red Bridge or JRuby Embed. Existing Java programs written to the <a href="javascript:void(0)">legacy API</a> should still work, but we strongly recommend Red Bridge for all new projects.
--
--</p><p>
--<h2> <span class="mw-headline" id="Features_of_Red_Bridge">Features of Red Bridge</span></h2>Red Bridge consists of two layers: Embed Core on the bottom, and implementations of <a href="http://www.jcp.org/en/jsr/detail?id=223">JSR223</a> and <a href="http://jakarta.apache.org/bsf/">BSF</a> on top. Embed Core is JRuby-specific, and can take advantage of much of JRuby's power. JSR223 and BSF are more general interfaces that provide a common ground across scripting languages.
--
--</p><p>
--Which API should you use? For projects where Ruby is the only scripting language involved, we recommend Embed Core for the following reasons:
--
--</p><p>
--<ol><li> With Embed Core, you can create several Ruby environments in one JVM, and configure them individually (via <code>org.jruby.RubyInstanceConfig</code>. With the other APIs, configuration options can only be set globally, via the <code>System</code> properties.
--
--</li><li> Embed Core offers several shortcuts, such as loading scripts from a <code>java.io.InputStream</code>, or returning Java-friendly objects from Ruby code. These allow you to skip a lot of boilerplate.
--
--</p><p>
--</li></ol> For projects requiring multiple scripting languages, JSR223 is a good fit. Though the API is language-independent, JRuby's implementation of it allows you to set some Ruby-specific options. In particular, you can control the threading model of the scripting engine, the lifetime of local variables, compilation mode, and how line numbers are displayed.
--
--</p><p>
--The full <a href="http://jruby-embed.kenai.com/docs/">API documentation</a> has all the gory details. It's worth talking about a couple of the finer points here.
--
--</p><p>
--<h1> <span class="mw-headline" id="Previous_Embedding_JRuby_Page">Previous Embedding JRuby Page</span></h1>We recommend using Embed Core; however, if you're maintaining code that uses the old API, you can find its documentation on the <a href="javascript:void(0)">legacy embedding</a> page.
--</p>
-\ No newline at end of file
diff --git a/debian/patches/0004-Catch-Errno-ENOENT-exception-when-executing.patch b/debian/patches/0004-Catch-Errno-ENOENT-exception-when-executing.patch
deleted file mode 100644
index e780626..0000000
--- a/debian/patches/0004-Catch-Errno-ENOENT-exception-when-executing.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Per Andersson <avtobiff at gmail.com>
-Date: Sat, 8 Jun 2013 21:30:32 +0200
-Subject: Catch Errno::ENOENT exception when executing
-
-If a supplied command (file) does not exist, Errno::ENOENT is thrown. In
-order to exit gracefully, catch this.
----
- lib/github/markup.rb | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/lib/github/markup.rb b/lib/github/markup.rb
-index d8638c2..387847a 100644
---- a/lib/github/markup.rb
-+++ b/lib/github/markup.rb
-@@ -86,6 +86,8 @@ module GitHub
- out = stdout.read
- end
- out.gsub("\r", '')
-+ rescue Errno::ENOENT
-+ ""
- rescue Errno::EPIPE
- ""
- end
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index bd3758e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-0001-Update-asciidoc-markup-test-output.patch
-0002-Update-org-markup-test-output.patch
-0003-Remove-failing-test-case.patch
-0004-Catch-Errno-ENOENT-exception-when-executing.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-github-markup.git
More information about the Pkg-ruby-extras-commits
mailing list