--- Begin Message ---
Package: ruby-ronn
Version: 0.8.0-3
Severity: normal
Tags: patch
Dear Maintainer,
There's a new version of ronn-ng available (0.9.0), which fixes #928627.
I tagged this bugreport patch, because during the course of my testing,
and in hopes of simplifying the update on your part,
I have updated the package, as available on Salsa, to that version --
https://github.com/nabijaczleweli/ronn.deb.
In particular, I am attaching the two patches after the import --
a rebase of the existing patches, and specifying the move to kramdown.
If there's a better channel for this or a more convenient way for you to
receive the patches, I'll of course be more than happy to utilise them.
Best regards,
nabijaczleweli
-- System Information:
Debian Release: bullseye/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 5.4.0-4-686-pae (SMP w/2 CPU cores)
Kernel taint flags: TAINT_WARN
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8),
LANGUAGE=en_GB:en (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Versions of packages ruby-ronn depends on:
ii groff 1.22.4-4
ii ruby 1:2.5.7.1
ii ruby-mustache 1.0.2-1
ii ruby-nokogiri 1.10.7+dfsg1-2+b1
ii ruby-rdiscount 2.1.8-1+b6
ruby-ronn recommends no packages.
ruby-ronn suggests no packages.
-- no debconf information
From bcd8104331e0887d56c33bd889686ac533f98f1e Mon Sep 17 00:00:00 2001
From: nabijaczleweli <[email protected]>
Date: Thu, 5 Mar 2020 13:43:44 +0000
Subject: [PATCH 1/2] Rebase patches, dropping ones marked already upstream
---
debian/patches/fix-ordered-lists.patch | 168 -----------------------
debian/patches/fix-url-hyphenation.patch | 102 --------------
debian/patches/relax-dependencies.patch | 7 +-
debian/patches/rename-to-ronn.patch | 4 +-
debian/patches/series | 2 -
5 files changed, 5 insertions(+), 278 deletions(-)
delete mode 100644 debian/patches/fix-ordered-lists.patch
delete mode 100644 debian/patches/fix-url-hyphenation.patch
diff --git a/debian/patches/fix-ordered-lists.patch b/debian/patches/fix-ordered-lists.patch
deleted file mode 100644
index 06df193..0000000
--- a/debian/patches/fix-ordered-lists.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-Description: Fix ordered lists. This fixes #921637 and is already
- applied upstream
-Origin: https://github.com/apjanke/ronn-ng/commit/e91949f866b338fa223126a570ae81276405fa12
-Last-Update: 2019-02-23
-
-From e91949f866b338fa223126a570ae81276405fa12 Mon Sep 17 00:00:00 2001
-From: Andrew Janke <[email protected]>
-Date: Sat, 16 Feb 2019 20:07:53 -0500
-Subject: [PATCH] Fix for basic ordered lists
-
----
- .idea/ronn-ng.iml | 28 +++++-----------------------
- lib/ronn/roff.rb | 2 +-
- test/ordered_list.html | 30 ++++++++++++++++++++++++++++++
- test/ordered_list.roff | 25 +++++++++++++++++++++++++
- test/ordered_list.ronn | 21 +++++++++++++++++++++
- 5 files changed, 82 insertions(+), 24 deletions(-)
- create mode 100644 test/ordered_list.html
- create mode 100644 test/ordered_list.roff
- create mode 100644 test/ordered_list.ronn
-
-diff --git a/.idea/ronn-ng.iml b/.idea/ronn-ng.iml
-index cabcd31..a85f561 100644
---- a/.idea/ronn-ng.iml
-+++ b/.idea/ronn-ng.iml
-@@ -5,29 +5,11 @@
- </component>
- <component name="NewModuleRootManager">
- <content url="file://$MODULE_DIR$" />
-- <orderEntry type="jdk" jdkName="ruby-2.5.3-p105" jdkType="RUBY_SDK" />
-+ <orderEntry type="jdk" jdkName="ruby-2.3.7-p456" jdkType="RUBY_SDK" />
- <orderEntry type="sourceFolder" forTests="false" />
-- <orderEntry type="library" scope="PROVIDED" name="ast (v2.4.0, ruby-2.5.3-p105) [gem]" level="application" />
-- <orderEntry type="library" scope="PROVIDED" name="bundler (v1.17.1, ruby-2.5.3-p105) [gem]" level="application" />
-- <orderEntry type="library" scope="PROVIDED" name="jaro_winkler (v1.5.1, ruby-2.5.3-p105) [gem]" level="application" />
-- <orderEntry type="library" scope="PROVIDED" name="mini_portile2 (v2.4.0, ruby-2.5.3-p105) [gem]" level="application" />
-- <orderEntry type="library" scope="PROVIDED" name="mustache (v0.99.8, ruby-2.5.3-p105) [gem]" level="application" />
-- <orderEntry type="library" scope="PROVIDED" name="mustermann (v1.0.3, ruby-2.5.3-p105) [gem]" level="application" />
-- <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.9.1, ruby-2.5.3-p105) [gem]" level="application" />
-- <orderEntry type="library" scope="PROVIDED" name="parallel (v1.12.1, ruby-2.5.3-p105) [gem]" level="application" />
-- <orderEntry type="library" scope="PROVIDED" name="parser (v2.5.3.0, ruby-2.5.3-p105) [gem]" level="application" />
-- <orderEntry type="library" scope="PROVIDED" name="power_assert (v1.1.3, ruby-2.5.3-p105) [gem]" level="application" />
-- <orderEntry type="library" scope="PROVIDED" name="powerpack (v0.1.2, ruby-2.5.3-p105) [gem]" level="application" />
-- <orderEntry type="library" scope="PROVIDED" name="rack (v2.0.6, ruby-2.5.3-p105) [gem]" level="application" />
-- <orderEntry type="library" scope="PROVIDED" name="rack-protection (v2.0.5, ruby-2.5.3-p105) [gem]" level="application" />
-- <orderEntry type="library" scope="PROVIDED" name="rainbow (v3.0.0, ruby-2.5.3-p105) [gem]" level="application" />
-- <orderEntry type="library" scope="PROVIDED" name="rake (v12.3.2, ruby-2.5.3-p105) [gem]" level="application" />
-- <orderEntry type="library" scope="PROVIDED" name="rdiscount (v2.2.0.1, ruby-2.5.3-p105) [gem]" level="application" />
-- <orderEntry type="library" scope="PROVIDED" name="rubocop (v0.61.1, ruby-2.5.3-p105) [gem]" level="application" />
-- <orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.10.0, ruby-2.5.3-p105) [gem]" level="application" />
-- <orderEntry type="library" scope="PROVIDED" name="sinatra (v2.0.5, ruby-2.5.3-p105) [gem]" level="application" />
-- <orderEntry type="library" scope="PROVIDED" name="test-unit (v3.2.9, ruby-2.5.3-p105) [gem]" level="application" />
-- <orderEntry type="library" scope="PROVIDED" name="tilt (v2.0.9, ruby-2.5.3-p105) [gem]" level="application" />
-- <orderEntry type="library" scope="PROVIDED" name="unicode-display_width (v1.4.1, ruby-2.5.3-p105) [gem]" level="application" />
-+ <orderEntry type="library" scope="PROVIDED" name="ast (v2.4.0, ruby-2.3.7-p456) [gem]" level="application" />
-+ <orderEntry type="library" scope="PROVIDED" name="bundler (v1.16.2, ruby-2.3.7-p456) [gem]" level="application" />
-+ <orderEntry type="library" scope="PROVIDED" name="parallel (v1.12.1, ruby-2.3.7-p456) [gem]" level="application" />
-+ <orderEntry type="library" scope="PROVIDED" name="rainbow (v3.0.0, ruby-2.3.7-p456) [gem]" level="application" />
- </component>
- </module>
-\ No newline at end of file
-diff --git a/lib/ronn/roff.rb b/lib/ronn/roff.rb
-index f008f67..7c56d2c 100644
---- a/lib/ronn/roff.rb
-+++ b/lib/ronn/roff.rb
-@@ -162,7 +162,7 @@ def block_filter(node)
- when 'li'
- case node.parent.name
- when 'ol'
-- macro 'IP', %W["#{node.position + 1}." 4]
-+ macro 'IP', %W["#{node.parent.children.index(node) + 1}." 4]
- when 'ul'
- macro 'IP', ['"\\[ci]"', '4']
- else
-diff --git a/test/ordered_list.html b/test/ordered_list.html
-new file mode 100644
-index 0000000..0824d84
---- /dev/null
-+++ b/test/ordered_list.html
-@@ -0,0 +1,30 @@
-+<div class='mp'>
-+
-+<h1 id="Ordered-Lists">Ordered Lists</h1>
-+<h2 id="Simple-ordered-lists">Simple ordered lists</h2>
-+
-+<h3 id="One-item-list">One-item list</h3>
-+
-+<ol>
-+<li>Hello, world!</li>
-+</ol>
-+
-+
-+<h3 id="Three-item-list">Three-item list</h3>
-+
-+<ol>
-+<li>Hello, world!</li>
-+<li>Item 2</li>
-+<li>Item 3</li>
-+</ol>
-+
-+
-+<h3 id="Four-item-list-with-all-1s">Four-item list with all 1s</h3>
-+
-+<ol>
-+<li>Item 1</li>
-+<li>Item 2</li>
-+<li>Item 3</li>
-+<li>Item 4</li>
-+</ol>
-+</div>
-diff --git a/test/ordered_list.roff b/test/ordered_list.roff
-new file mode 100644
-index 0000000..46cd54f
---- /dev/null
-+++ b/test/ordered_list.roff
-@@ -0,0 +1,25 @@
-+.TH "ORDERED_LIST" "" "January 1979" "" ""
-+.SH "Simple ordered lists"
-+.SS "One\-item list"
-+.IP "1." 4
-+Hello, world!
-+.IP "" 0
-+.SS "Three\-item list"
-+.IP "1." 4
-+Hello, world!
-+.IP "2." 4
-+Item 2
-+.IP "3." 4
-+Item 3
-+.IP "" 0
-+.SS "Four\-item list with all 1s"
-+.IP "1." 4
-+Item 1
-+.IP "2." 4
-+Item 2
-+.IP "3." 4
-+Item 3
-+.IP "4." 4
-+Item 4
-+.IP "" 0
-+
-diff --git a/test/ordered_list.ronn b/test/ordered_list.ronn
-new file mode 100644
-index 0000000..752127a
---- /dev/null
-+++ b/test/ordered_list.ronn
-@@ -0,0 +1,21 @@
-+Ordered Lists
-+=============
-+
-+## Simple ordered lists
-+
-+### One-item list
-+
-+1. Hello, world!
-+
-+### Three-item list
-+
-+1. Hello, world!
-+2. Item 2
-+3. Item 3
-+
-+### Four-item list with all 1s
-+
-+1. Item 1
-+1. Item 2
-+1. Item 3
-+1. Item 4
diff --git a/debian/patches/fix-url-hyphenation.patch b/debian/patches/fix-url-hyphenation.patch
deleted file mode 100644
index a49c611..0000000
--- a/debian/patches/fix-url-hyphenation.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-Description: Fix url hyphenation. This is already applied upstream
-Origin: https://github.com/apjanke/ronn-ng/commit/74a1321f619bb7962c3e36c2071406fe85625dbc
-Last-Update: 2019-02-23
-
-From 74a1321f619bb7962c3e36c2071406fe85625dbc Mon Sep 17 00:00:00 2001
-From: Andrew Janke <[email protected]>
-Date: Mon, 7 Jan 2019 22:30:48 -0500
-Subject: [PATCH] Don't allow URLs to be hyphenated
-
----
- lib/ronn/roff.rb | 4 ++--
- test/markdown_syntax.roff | 12 ++++++------
- test/section_reference_links.roff | 2 +-
- test/url_formatting.ronn | 3 +++
- 4 files changed, 12 insertions(+), 9 deletions(-)
- create mode 100644 test/url_formatting.ronn
-
-diff --git a/lib/ronn/roff.rb b/lib/ronn/roff.rb
-index 5425ca8..f008f67 100644
---- a/lib/ronn/roff.rb
-+++ b/lib/ronn/roff.rb
-@@ -277,13 +277,13 @@ def inline_filter(node)
- inline_filter(node.children)
- elsif node.has_attribute?('data-bare-link')
- write '\fI'
-- inline_filter(node.children)
-+ write '\%' + escape(node.attributes['href'].content)
- write '\fR'
- else
- inline_filter(node.children)
- write ' '
- write '\fI'
-- write escape(node.attributes['href'].content)
-+ write '\%' + escape(node.attributes['href'].content)
- write '\fR'
- end
-
-diff --git a/test/markdown_syntax.roff b/test/markdown_syntax.roff
-index 96fe57b..8ec6576 100644
---- a/test/markdown_syntax.roff
-+++ b/test/markdown_syntax.roff
-@@ -37,7 +37,7 @@ Inline markup like _italics_, **bold**, and `code()`\.
- .SS "Philosophy"
- Markdown is intended to be as easy\-to\-read and easy\-to\-write as is feasible\.
- .P
--Readability, however, is emphasized above all else\. A Markdown\-formatted document should be publishable as\-is, as plain text, without looking like it\'s been marked up with tags or formatting instructions\. While Markdown\'s syntax has been influenced by several existing text\-to\-HTML filters \-\- including Setext \fIhttp://docutils\.sourceforge\.net/mirror/setext\.html\fR, atx \fIhttp://www\.aaronsw\.com/2002/atx/\fR, Textile \fIhttp://textism\.com/tools/textile/\fR, reStructuredText \fIhttp://docutils\.sourceforge\.net/rst\.html\fR, Grutatext \fIhttp://www\.triptico\.com/software/grutatxt\.html\fR, and EtText \fIhttp://ettext\.taint\.org/doc/\fR \-\- the single biggest source of inspiration for Markdown\'s syntax is the format of plain text email\.
-+Readability, however, is emphasized above all else\. A Markdown\-formatted document should be publishable as\-is, as plain text, without looking like it\'s been marked up with tags or formatting instructions\. While Markdown\'s syntax has been influenced by several existing text\-to\-HTML filters \-\- including Setext \fI\%http://docutils\.sourceforge\.net/mirror/setext\.html\fR, atx \fI\%http://www\.aaronsw\.com/2002/atx/\fR, Textile \fI\%http://textism\.com/tools/textile/\fR, reStructuredText \fI\%http://docutils\.sourceforge\.net/rst\.html\fR, Grutatext \fI\%http://www\.triptico\.com/software/grutatxt\.html\fR, and EtText \fI\%http://ettext\.taint\.org/doc/\fR \-\- the single biggest source of inspiration for Markdown\'s syntax is the format of plain text email\.
- .P
- To this end, Markdown\'s syntax is comprised entirely of punctuation characters, which punctuation characters have been carefully chosen so as to look like what they mean\. E\.g\., asterisks around a word actually look like *emphasis*\. Markdown lists look like, well, lists\. Even blockquotes look like quoted passages of text, assuming you\'ve ever used email\.
- .SS "Inline HTML"
-@@ -111,7 +111,7 @@ AT&T
- .fi
- .IP "" 0
- .P
--Similarly, because Markdown supports \fIinline HTML\fR, if you use angle brackets as delimiters for HTML tags, Markdown will treat them as such\. But if you write:
-+Similarly, because Markdown supports \fI\%#html\fR, if you use angle brackets as delimiters for HTML tags, Markdown will treat them as such\. But if you write:
- .IP "" 4
- .nf
- 4 < 5
-@@ -134,9 +134,9 @@ The implication of the "one or more consecutive lines of text" rule is that Mark
- .P
- When you \fIdo\fR want to insert a \fB<br />\fR break tag using Markdown, you end a line with two or more spaces, then type return\.
- .P
--Yes, this takes a tad more effort to create a \fB<br />\fR, but a simplistic "every line break is a \fB<br />\fR" rule wouldn\'t work for Markdown\. Markdown\'s email\-style \fIblockquoting\fR and multi\-paragraph \fIlist items\fR work best \-\- and look better \-\- when you format them with hard breaks\.
-+Yes, this takes a tad more effort to create a \fB<br />\fR, but a simplistic "every line break is a \fB<br />\fR" rule wouldn\'t work for Markdown\. Markdown\'s email\-style \fI\%#blockquote\fR and multi\-paragraph \fI\%#list\fR work best \-\- and look better \-\- when you format them with hard breaks\.
- .SS "Headers"
--Markdown supports two styles of headers, Setext \fIhttp://docutils\.sourceforge\.net/mirror/setext\.html\fR and atx \fIhttp://www\.aaronsw\.com/2002/atx/\fR\.
-+Markdown supports two styles of headers, Setext \fI\%http://docutils\.sourceforge\.net/mirror/setext\.html\fR and atx \fI\%http://www\.aaronsw\.com/2002/atx/\fR\.
- .P
- Setext\-style headers are "underlined" using equal signs (for first\-level headers) and dashes (for second\-level headers)\. For example:
- .IP "" 4
-@@ -900,8 +900,8 @@ _ underscore
- .SH "AUTHOR"
- Markdown was created by John Gruber\.
- .P
--Manual page by Ryan Tomayko\. It\'s pretty much a direct copy of the Markdown Syntax Reference \fIhttp://daringfireball\.net/projects/markdown/syntax\fR, also by John Gruber\.
-+Manual page by Ryan Tomayko\. It\'s pretty much a direct copy of the Markdown Syntax Reference \fI\%http://daringfireball\.net/projects/markdown/syntax\fR, also by John Gruber\.
- .SH "SEE ALSO"
- ronn(5)
- .br
--\fIhttp://daringfireball\.net/projects/markdown/\fR
-+\fI\%http://daringfireball\.net/projects/markdown/\fR
-diff --git a/test/section_reference_links.roff b/test/section_reference_links.roff
-index 243c93a..2f1222b 100644
---- a/test/section_reference_links.roff
-+++ b/test/section_reference_links.roff
-@@ -4,4 +4,4 @@
- .SH "SECTION 1"
- See the following section\.
- .SH "SECTION 2"
--See \fISECTION 1\fR or \fIto put it another way\fR or even \fIlike this\fR
-+See \fI\%#SECTION\-1\fR or \fI\%#SECTION\-1\fR or even \fI\%#SECTION\-1\fR
-diff --git a/test/url_formatting.ronn b/test/url_formatting.ronn
-new file mode 100644
-index 0000000..6b029d6
---- /dev/null
-+++ b/test/url_formatting.ronn
-@@ -0,0 +1,3 @@
-+# URL formatting
-+
-+Documentation of the Emily programming language can be found at <http://emilylang.org> or <http://bitbucket.org/runhello/emily>.
-\ No newline at end of file
diff --git a/debian/patches/relax-dependencies.patch b/debian/patches/relax-dependencies.patch
index 9e00fbf..b006074 100644
--- a/debian/patches/relax-dependencies.patch
+++ b/debian/patches/relax-dependencies.patch
@@ -7,16 +7,15 @@ Forwarded: not-needed
--- a/ronn-ng.gemspec
+++ b/ronn-ng.gemspec
-@@ -107,9 +107,9 @@
+@@ -112,8 +112,8 @@
s.test_files = s.files.select { |path| path =~ /^test\/.*_test.rb/ }
-
+
s.extra_rdoc_files = %w[LICENSE.txt AUTHORS]
+ s.add_dependency 'kramdown', '~> 2.1'
- s.add_dependency 'mustache', '~> 0.7', '>= 0.7.0'
- s.add_dependency 'nokogiri', '~> 1.9', '>= 1.9.0'
-- s.add_dependency 'rdiscount', '~> 2.0', '>= 2.0.7'
+ s.add_dependency 'mustache', '>= 0.7.0'
+ s.add_dependency 'nokogiri', '>= 1.9.0'
-+ s.add_dependency 'rdiscount', '>= 2.0.7'
s.add_development_dependency 'rack', '~> 2.0', '>= 2.0.6'
s.add_development_dependency 'rake', '~> 12.3', '>= 12.3.0'
s.add_development_dependency 'rubocop', '~> 0.60', '>= 0.57.1'
diff --git a/debian/patches/rename-to-ronn.patch b/debian/patches/rename-to-ronn.patch
index cd069db..4bc8151 100644
--- a/debian/patches/rename-to-ronn.patch
+++ b/debian/patches/rename-to-ronn.patch
@@ -9,6 +9,6 @@ Last-Update: 2019-02-06
Gem::Specification.new do |s|
- s.name = 'ronn-ng'
+ s.name = 'ronn'
- s.version = '0.8.0'
- s.date = '2018-12-25'
+ s.version = '0.9.0'
+ s.date = '2019-12-21'
diff --git a/debian/patches/series b/debian/patches/series
index df47e25..4fbbfbf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
make-output-reproducible.patch
relax-dependencies.patch
rename-to-ronn.patch
-fix-ordered-lists.patch
-fix-url-hyphenation.patch
use-correct-ruby-version-in-tests.patch
--
2.20.1
From 0b3a6905df348ab2f6a43b04fe07a2b52e673334 Mon Sep 17 00:00:00 2001
From: nabijaczleweli <[email protected]>
Date: Thu, 5 Mar 2020 13:46:39 +0000
Subject: [PATCH 2/2] Spec move to kramdown
---
debian/control | 4 ++--
debian/patches/relax-dependencies.patch | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/debian/control b/debian/control
index ce860c6..10d7163 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 11~),
ruby-json,
ruby-nokogiri (>= 1.9.0),
ruby-mustache (>= 0.7.0),
- ruby-rdiscount (>= 2.0.7),
+ ruby-kramdown (>= 1.17.0),
ruby-test-unit
Standards-Version: 4.5.0
Homepage: https://github.com/apjanke/ronn-ng
@@ -26,7 +26,7 @@ Depends: ruby | ruby-interpreter,
groff,
ruby-nokogiri (>= 1.9.0),
ruby-mustache (>= 0.7.0),
- ruby-rdiscount (>= 2.0.7),
+ ruby-kramdown (>= 1.17.0),
${misc:Depends}
Description: library to build manuals from Markdown
Ronn builds manuals. It converts simple, human readable textfiles to roff for
diff --git a/debian/patches/relax-dependencies.patch b/debian/patches/relax-dependencies.patch
index b006074..bf1d2e6 100644
--- a/debian/patches/relax-dependencies.patch
+++ b/debian/patches/relax-dependencies.patch
@@ -7,13 +7,14 @@ Forwarded: not-needed
--- a/ronn-ng.gemspec
+++ b/ronn-ng.gemspec
-@@ -112,8 +112,8 @@
+@@ -111,9 +111,9 @@
s.test_files = s.files.select { |path| path =~ /^test\/.*_test.rb/ }
s.extra_rdoc_files = %w[LICENSE.txt AUTHORS]
- s.add_dependency 'kramdown', '~> 2.1'
+- s.add_dependency 'kramdown', '~> 2.1'
- s.add_dependency 'mustache', '~> 0.7', '>= 0.7.0'
- s.add_dependency 'nokogiri', '~> 1.9', '>= 1.9.0'
++ s.add_dependency 'kramdown', '>= 1.17.0'
+ s.add_dependency 'mustache', '>= 0.7.0'
+ s.add_dependency 'nokogiri', '>= 1.9.0'
s.add_development_dependency 'rack', '~> 2.0', '>= 2.0.6'
--
2.20.1
signature.asc
Description: PGP signature
--- End Message ---
