[DRE-commits] [ruby-kramdown-rfc2629] 02/04: Split out and extend kramdown-version.patch to remove strict version dependency on kramdown

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-kramdown-rfc2629.

commit 8502cdd3f385a04d1d75490e91ad5e0b98144eef
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon Nov 27 14:41:29 2017 +0100

    Split out and extend kramdown-version.patch to remove strict version dependency on kramdown
---
 debian/patches/fix-path.patch                      |  4 +--
 ...-certified-gem.patch => kramdown-version.patch} | 29 ++++++++++------------
 debian/patches/no-certified-gem.patch              | 20 +++++----------
 debian/patches/series                              |  1 +
 4 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/debian/patches/fix-path.patch b/debian/patches/fix-path.patch
index cab5762..e8be110 100644
--- a/debian/patches/fix-path.patch
+++ b/debian/patches/fix-path.patch
@@ -7,7 +7,7 @@ Last-Update: 2017-09-12
 
 --- a/bin/kramdown-rfc2629
 +++ b/bin/kramdown-rfc2629
-@@ -183,7 +183,7 @@
+@@ -191,7 +191,7 @@
      end
    end
  
@@ -16,7 +16,7 @@ Last-Update: 2017-09-12
    erbfile = File.read(erbfilename, coding: "UTF-8")
    erb = ERB.new(erbfile, nil, '-')
    # remove redundant nomarkdown pop outs/pop ins as they confuse kramdown
-@@ -225,7 +225,7 @@
+@@ -233,7 +233,7 @@
  end
  
  def read_encodings
diff --git a/debian/patches/no-certified-gem.patch b/debian/patches/kramdown-version.patch
similarity index 55%
copy from debian/patches/no-certified-gem.patch
copy to debian/patches/kramdown-version.patch
index dc622c0..20c01db 100644
--- a/debian/patches/no-certified-gem.patch
+++ b/debian/patches/kramdown-version.patch
@@ -1,22 +1,8 @@
-Description: relax kramdown version and do not use the certified gem
- to manually maintain a certificate bundle
- and update warning to indicate the user that this workaround is disabled on Debian
+Description: relax strict dependency on a version of kramdown
 Author: Cédric Boutillier <boutil at debian.org>
 Forwarded: not-needed
-Last-Update: 2017-09-12
+Last-Update: 2017-11-28
 
---- a/bin/kramdown-rfc2629
-+++ b/bin/kramdown-rfc2629
-@@ -15,8 +15,7 @@
-     File.open(OpenSSL::X509::DEFAULT_CERT_FILE) do end
-   rescue
-     warn "** Configuration problem with OpenSSL certificate store at #{OpenSSL::X509::DEFAULT_CERT_FILE}."
--    warn "**   Activating workaround.  Occasionally run `certified-update`."
--    require 'certified'
-+    warn "**   workaround using 'certified' gem disabled on Debian."
-   end
- end
- 
 --- a/kramdown-rfc2629.gemspec
 +++ b/kramdown-rfc2629.gemspec
 @@ -4,8 +4,7 @@
@@ -29,3 +15,14 @@ Last-Update: 2017-09-12
    s.files = Dir['lib/**/*.rb'] + %w(README.md LICENSE kramdown-rfc2629.gemspec bin/kdrfc bin/kramdown-rfc2629 bin/doilit bin/kramdown-rfc-extract-markdown data/kramdown-rfc2629.erb data/encoding-fallbacks.txt)
    s.require_path = 'lib'
    s.executables = ['kramdown-rfc2629', 'doilit', 'kramdown-rfc-extract-markdown', 'kdrfc']
+--- a/lib/kramdown-rfc2629.rb
++++ b/lib/kramdown-rfc2629.rb
+@@ -11,7 +11,7 @@
+ 
+ raise "sorry, 1.8 was last decade" unless RUBY_VERSION >= '1.9'
+ 
+-gem 'kramdown', '~> 1.14.0'
++#gem 'kramdown', '~> 1.14.0'
+ require 'kramdown'
+ my_span_elements =  %w{list figure xref eref iref cref spanx vspace}
+ Kramdown::Parser::Html::Constants::HTML_SPAN_ELEMENTS.concat my_span_elements
diff --git a/debian/patches/no-certified-gem.patch b/debian/patches/no-certified-gem.patch
index dc622c0..88e4b80 100644
--- a/debian/patches/no-certified-gem.patch
+++ b/debian/patches/no-certified-gem.patch
@@ -7,8 +7,12 @@ Last-Update: 2017-09-12
 
 --- a/bin/kramdown-rfc2629
 +++ b/bin/kramdown-rfc2629
-@@ -15,8 +15,7 @@
-     File.open(OpenSSL::X509::DEFAULT_CERT_FILE) do end
+@@ -12,11 +12,10 @@
+ def do_the_tls_dance
+   begin
+     require 'openssl'
+-    File.open(OpenSSL::X509::DEFAULT_CERT_FILE) do end
++    #File.open(OpenSSL::X509::DEFAULT_CERT_FILE) do end
    rescue
      warn "** Configuration problem with OpenSSL certificate store at #{OpenSSL::X509::DEFAULT_CERT_FILE}."
 -    warn "**   Activating workaround.  Occasionally run `certified-update`."
@@ -17,15 +21,3 @@ Last-Update: 2017-09-12
    end
  end
  
---- a/kramdown-rfc2629.gemspec
-+++ b/kramdown-rfc2629.gemspec
-@@ -4,8 +4,7 @@
-   s.summary = "Kramdown extension for generating RFC 7749 XML."
-   s.description = %{An RFC7749 (XML2RFC) generating backend for Thomas Leitner's
- "kramdown" markdown parser.  Mostly useful for RFC writers.}
--  s.add_dependency('kramdown', '~> 1.14.0')
--  s.add_dependency('certified', '~> 1.0')
-+  s.add_dependency('kramdown', '~> 1.14')
-   s.files = Dir['lib/**/*.rb'] + %w(README.md LICENSE kramdown-rfc2629.gemspec bin/kdrfc bin/kramdown-rfc2629 bin/doilit bin/kramdown-rfc-extract-markdown data/kramdown-rfc2629.erb data/encoding-fallbacks.txt)
-   s.require_path = 'lib'
-   s.executables = ['kramdown-rfc2629', 'doilit', 'kramdown-rfc-extract-markdown', 'kdrfc']
diff --git a/debian/patches/series b/debian/patches/series
index aa31882..f1e3fa5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix-path.patch
 no-certified-gem.patch
+kramdown-version.patch

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