On Fri 2019-10-18 09:56:31 -0400, Daniel Kahn Gillmor wrote: > https://github.com/cabo/kramdown-rfc2629 suggests that version 1.2.12 > is available now, but debian unstable only has 1.2.9.
I've just uploaded 1.2.12-0.1 as an NMU to DELAYED/7. I've also opened https://salsa.debian.org/ruby-team/ruby-kramdown-rfc2629/merge_requests/3 and https://salsa.debian.org/ruby-team/ruby-kramdown-rfc2629/merge_requests/2 to track the changes that i did. If you would prefer a full debdiff, i'm providing it here. Thanks for maintaining kramdown-rfc2629 in debian! --dkg
diff --git ruby-kramdown-rfc2629_1.2.9-2/README.md ruby-kramdown-rfc2629_1.2.12-0.1/README.md index fefe1cb..5c5259d 100644 --- ruby-kramdown-rfc2629_1.2.9-2/README.md +++ ruby-kramdown-rfc2629_1.2.12-0.1/README.md @@ -552,7 +552,12 @@ the markdown document. He also uses a slightly different referencing syntax, which is closer to what markdown does elsewhere but more verbose (this syntax is now also supported in kramdown-rfc2629). (Miek now also has a new thing going on with mostly different syntax, -see [mmark][].) +see [mmark][] and its [github repository][mmark-git].) + +Other human-oriented markup input languages that are being used for authoring RFCXML include: + +* [asciidoc][], with the [asciidoctor-rfc][] tool, as documented in [draft-ribose-asciirfc][]. +* [orgmode][] (please help supply a more specific link here). # License @@ -571,5 +576,10 @@ made it possible to license kramdown-rfc2629 under the same license. [pandoc2rfc]: https://github.com/miekg/pandoc2rfc/ [XML2RFC]: http://xml.resource.org [RFC 7328]: http://tools.ietf.org/html/rfc7328 -[mmark]: https://github.com/miekg/mmark +[mmark-git]: https://github.com/miekg/mmark +[mmark]: https://mmark.nl [YAML]: http://www.yaml.org/spec/1.2/spec.html +[draft-ribose-asciirfc]: https://tools.ietf.org/html/draft-ribose-asciirfc +[asciidoctor-rfc]: https://github.com/metanorma/asciidoctor-rfc +[asciidoc]: http://www.methods.co.nz/asciidoc/ +[orgmode]: http://orgmode.org diff --git ruby-kramdown-rfc2629_1.2.9-2/bin/doilit ruby-kramdown-rfc2629_1.2.12-0.1/bin/doilit index 4b7b6ec..c158558 100755 --- ruby-kramdown-rfc2629_1.2.9-2/bin/doilit +++ ruby-kramdown-rfc2629_1.2.12-0.1/bin/doilit @@ -47,9 +47,14 @@ ARGV.each do |doi| if authors = cite["author"] lit["author"] = authors.map do |au| lau = {} - if (g = au["given"]) && (f = au["family"]) - lau["name"] = "#{g} #{f}" - lau["ins"] = "#{g[0]}. #{f}" + if (f = au["family"]) + if (g = au["given"]) + lau["name"] = "#{g} #{f}" + lau["ins"] = "#{g[0]}. #{f}" + else + lau["name"] = "#{f}" +# lau["ins"] = "#{g[0]}. #{f}" + end end lau end diff --git ruby-kramdown-rfc2629_1.2.9-2/debian/changelog ruby-kramdown-rfc2629_1.2.12-0.1/debian/changelog index a3437bf..a235ab5 100644 --- ruby-kramdown-rfc2629_1.2.9-2/debian/changelog +++ ruby-kramdown-rfc2629_1.2.12-0.1/debian/changelog @@ -1,3 +1,21 @@ +ruby-kramdown-rfc2629 (1.2.12-0.1) unstable; urgency=medium + + * Non-maintainer upload. + + [ Utkarsh Gupta ] + * Add salsa-ci.yml + + [ Daniel Kahn Gillmor ] + * New upstream release (Closes: #942581) + * Use secure copyright file specification URI. + * Use secure URI in Homepage field. + * Bump debhelper from old 11 to 12. + * Set upstream metadata fields: Repository. + * refresh patches + * Rules-Requires-Root: no + + -- Daniel Kahn Gillmor <d...@fifthhorseman.net> Sun, 20 Oct 2019 14:11:16 -0400 + ruby-kramdown-rfc2629 (1.2.9-2) unstable; urgency=medium * Fix typo s/xlm2rfc/xml2rfc/ in control file and manpage. Thanks dkg for diff --git ruby-kramdown-rfc2629_1.2.9-2/debian/compat ruby-kramdown-rfc2629_1.2.12-0.1/debian/compat deleted file mode 100644 index b4de394..0000000 --- ruby-kramdown-rfc2629_1.2.9-2/debian/compat +++ /dev/null @@ -1 +0,0 @@ -11 diff --git ruby-kramdown-rfc2629_1.2.9-2/debian/control ruby-kramdown-rfc2629_1.2.12-0.1/debian/control index 886b98c..161826a 100644 --- ruby-kramdown-rfc2629_1.2.9-2/debian/control +++ ruby-kramdown-rfc2629_1.2.12-0.1/debian/control @@ -3,21 +3,22 @@ Section: ruby Priority: optional Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintain...@lists.alioth.debian.org> Uploaders: Cédric Boutillier <bou...@debian.org> -Build-Depends: debhelper (>= 11~), +Build-Depends: debhelper-compat (= 12), gem2deb, - ruby-kramdown (>= 1.16) -Standards-Version: 4.2.0 + ruby-kramdown (>= 1.17) +Standards-Version: 4.4.1 Vcs-Git: https://salsa.debian.org/ruby-team/ruby-kramdown-rfc2629.git Vcs-Browser: https://salsa.debian.org/ruby-team/ruby-kramdown-rfc2629 -Homepage: http://github.com/cabo/kramdown-rfc2629 +Homepage: https://github.com/cabo/kramdown-rfc2629 Testsuite: autopkgtest-pkg-ruby XS-Ruby-Versions: all +Rules-Requires-Root: no Package: ruby-kramdown-rfc2629 Architecture: all XB-Ruby-Versions: ${ruby:Versions} Depends: ruby | ruby-interpreter, - ruby-kramdown (>= 1.16), + ruby-kramdown (>= 1.17), ${misc:Depends}, ${shlibs:Depends} Suggests: xml2rfc diff --git ruby-kramdown-rfc2629_1.2.9-2/debian/copyright ruby-kramdown-rfc2629_1.2.12-0.1/debian/copyright index 5ebe4ce..e20c4d5 100644 --- ruby-kramdown-rfc2629_1.2.9-2/debian/copyright +++ ruby-kramdown-rfc2629_1.2.12-0.1/debian/copyright @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: kramdown-rfc2629 Source: https://github.com/cabo/kramdown-rfc2629 diff --git ruby-kramdown-rfc2629_1.2.9-2/debian/patches/kramdown-version.patch ruby-kramdown-rfc2629_1.2.12-0.1/debian/patches/kramdown-version.patch index a41a801..87e31f7 100644 --- ruby-kramdown-rfc2629_1.2.9-2/debian/patches/kramdown-version.patch +++ ruby-kramdown-rfc2629_1.2.12-0.1/debian/patches/kramdown-version.patch @@ -9,9 +9,9 @@ Last-Update: 2018-08-19 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.16.0') +- s.add_dependency('kramdown', '~> 1.17.0') - s.add_dependency('certified', '~> 1.0') -+ s.add_dependency('kramdown', '~> 1.16') ++ s.add_dependency('kramdown', '~> 1.17') 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'] @@ -21,7 +21,7 @@ Last-Update: 2018-08-19 raise "sorry, 1.8 was last decade" unless RUBY_VERSION >= '1.9' --gem 'kramdown', '~> 1.16.0' +-gem 'kramdown', '~> 1.17.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 ruby-kramdown-rfc2629_1.2.9-2/debian/salsa-ci.yml ruby-kramdown-rfc2629_1.2.12-0.1/debian/salsa-ci.yml new file mode 100644 index 0000000..33c3a64 --- /dev/null +++ ruby-kramdown-rfc2629_1.2.12-0.1/debian/salsa-ci.yml @@ -0,0 +1,4 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml diff --git ruby-kramdown-rfc2629_1.2.9-2/debian/upstream/metadata ruby-kramdown-rfc2629_1.2.12-0.1/debian/upstream/metadata new file mode 100644 index 0000000..6a05755 --- /dev/null +++ ruby-kramdown-rfc2629_1.2.12-0.1/debian/upstream/metadata @@ -0,0 +1 @@ +Repository: https://github.com/cabo/kramdown-rfc2629 diff --git ruby-kramdown-rfc2629_1.2.9-2/kramdown-rfc2629.gemspec ruby-kramdown-rfc2629_1.2.12-0.1/kramdown-rfc2629.gemspec index 5860ec2..b3736e8 100644 --- ruby-kramdown-rfc2629_1.2.9-2/kramdown-rfc2629.gemspec +++ ruby-kramdown-rfc2629_1.2.12-0.1/kramdown-rfc2629.gemspec @@ -1,10 +1,10 @@ spec = Gem::Specification.new do |s| s.name = 'kramdown-rfc2629' - s.version = '1.2.9' + s.version = '1.2.12' 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.16.0') + s.add_dependency('kramdown', '~> 1.17.0') s.add_dependency('certified', '~> 1.0') 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' diff --git ruby-kramdown-rfc2629_1.2.9-2/lib/kramdown-rfc2629.rb ruby-kramdown-rfc2629_1.2.12-0.1/lib/kramdown-rfc2629.rb index 28f77ca..5a8cb91 100644 --- ruby-kramdown-rfc2629_1.2.9-2/lib/kramdown-rfc2629.rb +++ ruby-kramdown-rfc2629_1.2.12-0.1/lib/kramdown-rfc2629.rb @@ -11,7 +11,7 @@ raise "sorry, 1.8 was last decade" unless RUBY_VERSION >= '1.9' -gem 'kramdown', '~> 1.16.0' +gem 'kramdown', '~> 1.17.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 @@ -483,7 +483,7 @@ module Kramdown "CCITT" => "bibxml2", "FIPS" => "bibxml2", # "IANA" => "bibxml2", overtaken by bibxml8 - "IEEE" => "bibxml2", # now, how about bibxml6? + "IEEE" => "bibxml6", # copied over to bibxml6 2019-02-27 "ISO" => "bibxml2", "ITU" => "bibxml2", "NIST" => "bibxml2", @@ -519,10 +519,14 @@ module Kramdown to_insert = "" src.scan(/(W3C|3GPP|[A-Z-]+)[.]?([A-Za-z_0-9.\/\+-]+)/) do |t, n| fn = "reference.#{t}.#{n}.xml" - sub, ttl = XML_RESOURCE_ORG_MAP[t] + sub, ttl, can_anchor = XML_RESOURCE_ORG_MAP[t] ttl ||= KRAMDOWN_REFCACHETTL # everything but RFCs might change a lot puts "Huh: ${fn}" unless sub url = "#{XML_RESOURCE_ORG_PREFIX}/#{sub}/#{fn}" + if can_anchor # create anchor server-side for stand_alone: false + url << "?anchor=#{anchor}" + fn[/.xml$/] = "--anchor=#{anchor}.xml" + end to_insert = get_and_cache_resource(url, fn.gsub('/', '_'), ttl) to_insert.scrub! rescue nil # only do this for Ruby >= 2.1 # this may be a bit controversial: Don't break the build if reference is broken
signature.asc
Description: PGP signature
