[DRE-commits] [asciidoctor] 01/02: Remove obsolete patches and update the manpage patch
Guillaume Grossetie
ggrossetie-guest at moszumanska.debian.org
Fri May 29 19:14:31 UTC 2015
This is an automated email from the git hooks/post-receive script.
ggrossetie-guest pushed a commit to branch master
in repository asciidoctor.
commit dad0db20db5c70e5e6d26b1b6a58737557fe7de3
Author: Guillaume Grossetie <ggrossetie at gmail.com>
Date: Fri May 29 20:35:51 2015 +0200
Remove obsolete patches and update the manpage patch
---
debian/patches/load_erb_directly.patch | 15 --
.../prune_tests_requiring_network_access.patch | 27 ---
debian/patches/series | 1 +
debian/patches/update-asciidoctor.1-manpage.patch | 195 ++-------------------
4 files changed, 18 insertions(+), 220 deletions(-)
diff --git a/debian/patches/load_erb_directly.patch b/debian/patches/load_erb_directly.patch
deleted file mode 100644
index 7e20323..0000000
--- a/debian/patches/load_erb_directly.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Jérémy Bobbio <lunar at debian.org>
-Date: Thu, 11 Apr 2014 10:26:00 +0200
-Subject: Update asciidoctor.1 manpage
-
---- a/lib/asciidoctor/renderer.rb
-+++ b/lib/asciidoctor/renderer.rb
-@@ -159,7 +159,7 @@ class Renderer
- end
-
- if name == 'erb'
-- Helpers.require_library 'erb'
-+ require 'erb'
- ::ERB
- elsif name == 'erubis'
- Helpers.require_library 'erubis', true
diff --git a/debian/patches/prune_tests_requiring_network_access.patch b/debian/patches/prune_tests_requiring_network_access.patch
deleted file mode 100644
index 784a9c3..0000000
--- a/debian/patches/prune_tests_requiring_network_access.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: remove tests requiring network access
-Author: Jérémy Bobbio <lunar at debian.org>
-Origin: vendor
-Forwarded: not-needed
-
-diff --git a/test/reader_test.rb b/test/reader_test.rb
-index abc708a..5750437 100644
---- a/test/reader_test.rb
-+++ b/test/reader_test.rb
-@@ -499,17 +499,6 @@ include::fixtures/no-such-file.ad[]
- end
- end
-
-- test 'include macro can retrieve data from uri' do
-- input = <<-EOS
--....
--include::https://raw.github.com/asciidoctor/asciidoctor/master/LICENSE[]
--....
-- EOS
--
-- output = render_embedded_string input, :safe => :safe, :attributes => {'allow-uri-read' => ''}
-- assert_match(/MIT/, output)
-- end
--
- test 'inaccessible uri referenced by include macro does not crash processor' do
- input = <<-EOS
- ....
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..d4b3bf7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+update-asciidoctor.1-manpage.patch
diff --git a/debian/patches/update-asciidoctor.1-manpage.patch b/debian/patches/update-asciidoctor.1-manpage.patch
index df6d77e..ebdd848 100644
--- a/debian/patches/update-asciidoctor.1-manpage.patch
+++ b/debian/patches/update-asciidoctor.1-manpage.patch
@@ -1,190 +1,29 @@
-From: Per Andersson <avtobiff at gmail.com>
-Date: Thu, 10 Apr 2014 10:25:31 +0200
-Subeject: Update asciidoctor.1 manpage
----
---- a/man/asciidoctor.1
-+++ b/man/asciidoctor.1
-@@ -1,17 +1,34 @@
- '\" t
+From: Guillaume Grossetie <ggrossetie at gmail.com>
+Subject: Update asciidoctor.1 manpage
+ * Format date dd/MM/yyyy
+ * Add "NAME" section
+Index: asciidoctor/man/asciidoctor.1
+===================================================================
+--- asciidoctor.orig/man/asciidoctor.1 2015-05-29 20:26:13.404432130 +0200
++++ asciidoctor/man/asciidoctor.1 2015-05-29 20:29:27.112435262 +0200
+@@ -2,16 +2,18 @@
.\" Title: asciidoctor
--.\" Author: Dan Allen
--.\" Generator: Asciidoctor 0.1.4
--.\" Date: 2013-09-05
-+.\" Author: Dan Allen; Ryan Waldron
-+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-+.\" Date: 04/10/2014
+ .\" Author: Dan Allen
+ .\" Generator: Asciidoctor 1.5.2
+-.\" Date: 2014-11-27
++.\" Date: 27/11/2014
.\" Manual: Asciidoctor Manual
- .\" Source: Asciidoctor 0.1.4
+ .\" Source: Asciidoctor 1.5.2
.\" Language: English
.\"
--.TH "ASCIIDOCTOR" "1" "2013-09-05" "Asciidoctor 0\&.1\&.4" "Asciidoctor Manual"
-+.TH "ASCIIDOCTOR" "1" "04/10/2014" "Asciidoctor 0\&.1\&.4" "Asciidoctor Manual"
-+.\" -----------------------------------------------------------------
-+.\" * Define some portability stuff
-+.\" -----------------------------------------------------------------
-+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+.\" http://bugs.debian.org/507673
-+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.TH "ASCIIDOCTOR" "1" "2014-11-27" "Asciidoctor 1\&.5\&.2" "Asciidoctor Manual"
++.TH "ASCIIDOCTOR" "1" "27/11/2014" "Asciidoctor 1\&.5\&.2" "Asciidoctor Manual"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
-+.\" -----------------------------------------------------------------
-+.\" * set default formatting
-+.\" -----------------------------------------------------------------
-+.\" disable hyphenation
.nh
-+.\" disable justification (adjust text to left margin only)
.ad l
-+.\" -----------------------------------------------------------------
-+.\" * MAIN CONTENT STARTS HERE *
-+.\" -----------------------------------------------------------------
+.SH "NAME"
+asciidoctor \- converts AsciiDoc source files to HTML, DocBook and other formats
.SH "SYNOPSIS"
.sp
- \fBasciidoctor\fR [\fIOPTION\fR]\&... \fIFILE\fR\&...
-@@ -30,12 +47,22 @@
- .PP
- \fB\-S, \-\-safe\-mode\fR=\fISAFE_MODE\fR
- .RS 4
--Set safe mode level: \fIunsafe\fR, \fIsafe\fR, \fIserver\fR or \fIsecure\fR\&. Disables potentially dangerous macros in source files, such as include::[]\&. If not set, the safe mode level defaults to \fIunsafe\fR when Asciidoctor is invoked using this script\&.
-+Set safe mode level:
-+\fIunsafe\fR,
-+\fIsafe\fR,
-+\fIserver\fR
-+or
-+\fIsecure\fR\&. Disables potentially dangerous macros in source files, such as include::[]\&. If not set, the safe mode level defaults to
-+\fIunsafe\fR
-+when Asciidoctor is invoked using this script\&.
- .RE
- .PP
- \fB\-\-safe\fR
- .RS 4
--Set safe mode level to \fIsafe\fR\&. Enables include macros, but restricts access to ancestor paths of source file\&. Provided for compatibility with the asciidoc command\&. If not set, the safe mode level defaults to \fIunsafe\fR when Asciidoctor is invoked using this script\&.
-+Set safe mode level to
-+\fIsafe\fR\&. Enables include macros, but restricts access to ancestor paths of source file\&. Provided for compatibility with the asciidoc command\&. If not set, the safe mode level defaults to
-+\fIunsafe\fR
-+when Asciidoctor is invoked using this script\&.
- .RE
- .SS "Document Settings"
- .PP
-@@ -43,19 +70,63 @@
- .RS 4
- Define, override or delete a document attribute\&. Command\-line attributes take precedence over attributes defined in the source file\&.
- .sp
--\fIATTRIBUTE\fR is normally formatted as a key\-value pair, in the form \fINAME=VALUE\fR\&. Alternate acceptable forms are \fINAME\fR (where the \fIVALUE\fR defaults to an empty string), \fINAME!\fR (unassigns the \fINAME\fR attribute) and \fINAME=VALUE@\fR (where \fIVALUE\fR does not override value of \fINAME\fR attribute if it\(cqs already defined in the source document)\&. Values containing spaces should be enclosed in quotes\&.
-+\fIATTRIBUTE\fR
-+is normally formatted as a key\-value pair, in the form
-+\fINAME=VALUE\fR\&. Alternate acceptable forms are
-+\fINAME\fR
-+(where the
-+\fIVALUE\fR
-+defaults to an empty string),
-+\fINAME!\fR
-+(unassigns the
-+\fINAME\fR
-+attribute) and
-+\fINAME=VALUE@\fR
-+(where
-+\fIVALUE\fR
-+does not override value of
-+\fINAME\fR
-+attribute if it\(cqs already defined in the source document)\&. Values containing spaces should be enclosed in quotes\&.
- .sp
- This option may be specified more than once\&.
- .RE
- .PP
- \fB\-b, \-\-backend\fR=\fIBACKEND\fR
- .RS 4
--Backend output file format: \fIhtml5\fR, \fIdocbook45\fR and \fIdocbook5\fR supported out of the box\&. You can also use the backend alias names \fIhtml\fR (aliased to \fIhtml5\fR) or \fIdocbook\fR (aliased to \fIdocbook45\fR)\&. Defaults to \fIhtml5\fR\&. Other options can be passed, but if Asciidoctor cannot find the backend, it will fail during rendering\&.
-+Backend output file format:
-+\fIhtml5\fR,
-+\fIdocbook45\fR
-+and
-+\fIdocbook5\fR
-+supported out of the box\&. You can also use the backend alias names
-+\fIhtml\fR
-+(aliased to
-+\fIhtml5\fR) or
-+\fIdocbook\fR
-+(aliased to
-+\fIdocbook45\fR)\&. Defaults to
-+\fIhtml5\fR\&. Other options can be passed, but if Asciidoctor cannot find the backend, it will fail during rendering\&.
- .RE
- .PP
- \fB\-d, \-\-doctype\fR=\fIDOCTYPE\fR
- .RS 4
--Document type: \fIarticle\fR, \fIbook\fR, \fImanpage\fR or \fIinline\fR\&. Sets the root element when using the \fIdocbook\fR backend and the style class on the HTML body element when using the \fIhtml\fR backend\&. The \fIbook\fR document type allows multiple level\-0 section titles in a single document\&. The \fImanpage\fR document type enables parsing of metadata necessary to produce a manpage\&. The \fIinline\fR document type allows the content of a single paragraph to be formatted [...]
-+Document type:
-+\fIarticle\fR,
-+\fIbook\fR,
-+\fImanpage\fR
-+or
-+\fIinline\fR\&. Sets the root element when using the
-+\fIdocbook\fR
-+backend and the style class on the HTML body element when using the
-+\fIhtml\fR
-+backend\&. The
-+\fIbook\fR
-+document type allows multiple level\-0 section titles in a single document\&. The
-+\fImanpage\fR
-+document type enables parsing of metadata necessary to produce a manpage\&. The
-+\fIinline\fR
-+document type allows the content of a single paragraph to be formatted and returned without wrapping it in a containing element\&. Defaults to
-+\fIarticle\fR\&.
- .RE
- .SS "Rendering Control"
- .PP
-@@ -76,17 +147,29 @@
- .PP
- \fB\-e, \-\-eruby\fR
- .RS 4
--Specifies the eRuby implementation to use for rendering the built\-in templates\&. Supported values are \fIerb\fR and \fIerubis\fR\&. Defaults to \fIerb\fR\&.
-+Specifies the eRuby implementation to use for rendering the built\-in templates\&. Supported values are
-+\fIerb\fR
-+and
-+\fIerubis\fR\&. Defaults to
-+\fIerb\fR\&.
- .RE
- .PP
- \fB\-n, \-\-section\-numbers\fR
- .RS 4
--Auto\-number section titles\&. Synonym for \fB\-\-attribute numbered\fR\&.
-+Auto\-number section titles\&. Synonym for
-+\fB\-\-attribute numbered\fR\&.
- .RE
- .PP
- \fB\-o, \-\-out\-file\fR=\fIOUT_FILE\fR
- .RS 4
--Write output to file \fIOUT_FILE\fR\&. Defaults to the base name of the input file suffixed with \fIbackend\fR extension\&. If the input is read from standard input, then the output file defaults to stdout\&. If \fIOUT_FILE\fR is \fI\-\fR then the standard output is also used\&. If specified, the file is resolved relative to the working directory\&.
-+Write output to file
-+\fIOUT_FILE\fR\&. Defaults to the base name of the input file suffixed with
-+\fIbackend\fR
-+extension\&. If the input is read from standard input, then the output file defaults to stdout\&. If
-+\fIOUT_FILE\fR
-+is
-+\fI\-\fR
-+then the standard output is also used\&. If specified, the file is resolved relative to the working directory\&.
- .RE
- .PP
- \fB\-s, \-\-no\-header\-footer\fR
-@@ -96,7 +179,9 @@
- .PP
- \fB\-T, \-\-template\-dir\fR=\fIDIR\fR
- .RS 4
--A directory containing custom render templates that override one or more templates from the built\-in set\&. (requires \fItilt\fR gem)
-+A directory containing custom render templates that override one or more templates from the built\-in set\&. (requires
-+\fItilt\fR
-+gem)
- .sp
- If there is a subfolder that matches the engine name (if specified), that folder is appended to the template directory path\&. Similarly, if there is a subfolder in the resulting template directory that matches the name of the backend, that folder is appended to the template directory path\&.
- .sp
-@@ -157,7 +242,7 @@
- Copyright (C) 2012\-2013 Dan Allen and Ryan Waldron\&. Free use of this software is granted under the terms of the MIT License\&.
- .SH "AUTHOR"
- .PP
--\fBDan Allen\fR
-+\fBDan Allen; Ryan Waldron\fR
- .RS 4
- Author.
- .RE
+ \fBasciidoctor\fR [\fIOPTION\fR]... \fIFILE\fR...
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/asciidoctor.git
More information about the Pkg-ruby-extras-commits
mailing list