[DRE-commits] [unicorn] 01/01: Refresh patch
Christian Hofstaedtler
zeha at moszumanska.debian.org
Mon Jun 9 18:43:28 UTC 2014
This is an automated email from the git hooks/post-receive script.
zeha pushed a commit to branch master
in repository unicorn.
commit 75da6cbc881352b36b61e75527bf8639d0e2cc46
Author: Christian Hofstaedtler <zeha at debian.org>
Date: Mon Jun 9 20:39:52 2014 +0200
Refresh patch
Git-Dch: ignore
---
...explicitly-use-escaped-minus-in-man-pages.patch | 133 ++++-----------------
1 file changed, 20 insertions(+), 113 deletions(-)
diff --git a/debian/patches/0001-explicitly-use-escaped-minus-in-man-pages.patch b/debian/patches/0001-explicitly-use-escaped-minus-in-man-pages.patch
index 2d3c032..b5af8bc 100644
--- a/debian/patches/0001-explicitly-use-escaped-minus-in-man-pages.patch
+++ b/debian/patches/0001-explicitly-use-escaped-minus-in-man-pages.patch
@@ -7,10 +7,10 @@ Subject: explicitly use escaped minus in man pages
man/man1/unicorn_rails.1 | 34 +++++++++++++++++-----------------
2 files changed, 34 insertions(+), 34 deletions(-)
-diff --git a/man/man1/unicorn.1 b/man/man1/unicorn.1
-index 2401be4..b4d22de 100644
---- a/man/man1/unicorn.1
-+++ b/man/man1/unicorn.1
+Index: unicorn/man/man1/unicorn.1
+===================================================================
+--- unicorn.orig/man/man1/unicorn.1 2014-06-09 20:38:32.006682605 +0200
++++ unicorn/man/man1/unicorn.1 2014-06-09 20:38:32.002682613 +0200
@@ -4,7 +4,7 @@
unicorn - a rackup-like command to launch the Unicorn HTTP server
.SH SYNOPSIS
@@ -20,7 +20,7 @@ index 2401be4..b4d22de 100644
.SH DESCRIPTION
.PP
A rackup(1)-like command to launch Rack applications using Unicorn.
-@@ -25,7 +25,7 @@ Embedded command-line options are mostly parsed for compatibility
+@@ -25,7 +25,7 @@ Embedded command-line options are mostly
rackup(1) but strongly discouraged.
.SH UNICORN OPTIONS
.TP
@@ -29,7 +29,7 @@ index 2401be4..b4d22de 100644
Path to the Unicorn-specific config file.
The config file is implemented as a Ruby DSL, so Ruby code may executed.
See the RDoc/ri for the \f[I]Unicorn::Configurator\f[] class for the
-@@ -36,7 +36,7 @@ viewing ps(1) output.
+@@ -36,7 +36,7 @@ output.
.RS
.RE
.TP
@@ -38,7 +38,7 @@ index 2401be4..b4d22de 100644
Run daemonized in the background.
The process is detached from the controlling terminal and stdin is
redirected to "/dev/null".
-@@ -47,7 +47,7 @@ redirected to \[lq]/dev/null\[rq].
+@@ -47,7 +47,7 @@ redirected to "/dev/null".
.RS
.RE
.TP
@@ -47,104 +47,11 @@ index 2401be4..b4d22de 100644
Run under the given RACK_ENV.
See the RACK ENVIRONMENT section for more details.
.RS
--.B -l, --listen ADDRESS
-+.B \-l, \-\-listen ADDRESS
- Listens on a given ADDRESS.
- ADDRESS may be in the form of HOST:PORT or PATH, HOST:PORT is taken
- to mean a TCP socket and PATH is meant to be a path to a UNIX
-@@ -64,7 +64,7 @@ socket options.
- .RS
- .RE
- .TP
--.B -N, --no-default-middleware
-+.B \-N, \-\-no\-default\-middleware
- Disables loading middleware implied by RACK_ENV.
- This bypasses the configuration documented in the RACK ENVIRONMENT
- section, but still allows RACK_ENV to be used for
-@@ -77,51 +77,51 @@ application/framework-specific purposes.
- .RE
- .SH RACKUP COMPATIBILITY OPTIONS
- .TP
--.B -o, --host HOST
-+.B \-o, \-\-host HOST
- Listen on a TCP socket belonging to HOST, default is
- \[lq]0.0.0.0\[rq] (all addresses).
- If specified multiple times on the command-line, only the
- last-specified value takes effect.
- This option only exists for compatibility with the rackup(1)
--command, use of \[lq]-l\[rq]/\[lq]--listen\[rq] switch is
-+command, use of \[lq]\-l\[rq]/\[lq]\-\-listen\[rq] switch is
- recommended instead.
- .RS
- .RE
- .TP
--.B -p, --port PORT
-+.B \-p, \-\-port PORT
- Listen on the specified TCP PORT, default is 8080.
- If specified multiple times on the command-line, only the
- last-specified value takes effect.
- This option only exists for compatibility with the rackup(1)
--command, use of \[lq]-l\[rq]/\[lq]--listen\[rq] switch is
-+command, use of \[lq]\-l\[rq]/\[lq]\-\-listen\[rq] switch is
- recommended instead.
- .RS
- .RE
- .TP
--.B -s, --server SERVER
-+.B \-s, \-\-server SERVER
- No-op, this exists only for compatibility with rackup(1).
- .RS
- .RE
- .SH RUBY OPTIONS
- .TP
--.B -e, --eval LINE
-+.B \-e, \-\-eval LINE
- Evaluate a LINE of Ruby code.
- This evaluation happens immediately as the command-line is being
- parsed.
- .RS
- .RE
- .TP
--.B -d, --debug
-+.B \-d, \-\-debug
- Turn on debug mode, the $DEBUG variable is set to true.
- .RS
- .RE
- .TP
--.B -w, --warn
-+.B \-w, \-\-warn
- Turn on verbose warnings, the $VERBOSE variable is set to true.
- .RS
- .RE
- .TP
--.B -I, --include PATH
-+.B \-I, \-\-include PATH
- specify $LOAD_PATH.
- PATH will be prepended to $LOAD_PATH.
- The \[aq]:\[aq] character may be used to delimit multiple
-@@ -132,7 +132,7 @@ they were specified on the command-line.
- .RS
- .RE
- .TP
--.B -r, --require LIBRARY
-+.B \-r, \-\-require LIBRARY
- require a specified LIBRARY before executing the application.
- The "require" statement will be executed immediately and in the
- order they were specified on the command-line.
-@@ -194,7 +194,7 @@ If needed, they must be individually specified in the RACKUP_FILE,
- some frameworks do not require them.
- .SH ENVIRONMENT VARIABLES
- .PP
--The RACK_ENV variable is set by the aforementioned -E switch.
-+The RACK_ENV variable is set by the aforementioned \-E switch.
- All application or library-specific environment variables (e.g.
- TMPDIR) may always be set in the Unicorn CONFIG_FILE in addition to
- the spawning shell.
-diff --git a/man/man1/unicorn_rails.1 b/man/man1/unicorn_rails.1
-index a593acb..c644d03 100644
---- a/man/man1/unicorn_rails.1
-+++ b/man/man1/unicorn_rails.1
-@@ -5,7 +5,7 @@ unicorn_rails - a script/server-like command to launch the Unicorn
+Index: unicorn/man/man1/unicorn_rails.1
+===================================================================
+--- unicorn.orig/man/man1/unicorn_rails.1 2014-06-09 20:38:32.006682605 +0200
++++ unicorn/man/man1/unicorn_rails.1 2014-06-09 20:38:32.002682613 +0200
+@@ -5,7 +5,7 @@ unicorn_rails - a script/server-like com
server
.SH SYNOPSIS
.PP
@@ -153,7 +60,7 @@ index a593acb..c644d03 100644
.SH DESCRIPTION
.PP
A rackup(1)-like command to launch Rails applications using Unicorn.
-@@ -30,7 +30,7 @@ stick to the few command-line options specified in the SYNOPSIS and
+@@ -30,7 +30,7 @@ command-line options specified in the SY
as much as possible.
.SH UNICORN OPTIONS
.TP
@@ -162,7 +69,7 @@ index a593acb..c644d03 100644
Path to the Unicorn-specific config file.
The config file is implemented as a Ruby DSL, so Ruby code may executed.
See the RDoc/ri for the \f[I]Unicorn::Configurator\f[] class for the
-@@ -41,7 +41,7 @@ viewing ps(1) output.
+@@ -41,7 +41,7 @@ output.
.RS
.RE
.TP
@@ -171,7 +78,7 @@ index a593acb..c644d03 100644
Run daemonized in the background.
The process is detached from the controlling terminal and stdin is
redirected to "/dev/null".
-@@ -58,7 +58,7 @@ override this Unicorn config file.
+@@ -58,7 +58,7 @@ Unicorn config file.
.RS
.RE
.TP
@@ -180,7 +87,7 @@ index a593acb..c644d03 100644
Run under the given RAILS_ENV.
This sets the RAILS_ENV environment variable.
Acceptable values are exactly those you expect in your Rails
-@@ -66,7 +66,7 @@ application, typically \[lq]development\[rq] or
+@@ -66,7 +66,7 @@ application, typically "development" or
.RS
.RE
.TP
@@ -189,7 +96,7 @@ index a593acb..c644d03 100644
Listens on a given ADDRESS.
ADDRESS may be in the form of HOST:PORT or PATH, HOST:PORT is taken to
mean a TCP socket and PATH is meant to be a path to a UNIX domain
-@@ -78,26 +78,26 @@ socket options.
+@@ -78,26 +78,26 @@ CONFIG_FILE is recommended as it allows
.RE
.SH RACKUP COMPATIBILITY OPTIONS
.TP
@@ -221,7 +128,7 @@ index a593acb..c644d03 100644
Mounts the Rails application at the given PATH (instead of "/").
This is equivalent to setting the RAILS_RELATIVE_URL_ROOT environment
variable.
-@@ -106,25 +106,25 @@ This is only supported under Rails 2.3 or later at the moment.
+@@ -106,25 +106,25 @@ This is only supported under Rails 2.3 o
.RE
.SH RUBY OPTIONS
.TP
@@ -251,7 +158,7 @@ index a593acb..c644d03 100644
specify $LOAD_PATH.
PATH will be prepended to $LOAD_PATH.
The \[aq]:\[aq] character may be used to delimit multiple directories.
-@@ -134,7 +134,7 @@ they were specified on the command-line.
+@@ -134,7 +134,7 @@ were specified on the command-line.
.RS
.RE
.TP
@@ -260,7 +167,7 @@ index a593acb..c644d03 100644
require a specified LIBRARY before executing the application.
The "require" statement will be executed immediately and in the order
they were specified on the command-line.
-@@ -153,8 +153,8 @@ Embedded command-line options are mostly parsed for compatibility
+@@ -153,8 +153,8 @@ Embedded command-line options are mostly
rackup(1) but strongly discouraged.
.SH ENVIRONMENT VARIABLES
.PP
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/unicorn.git
More information about the Pkg-ruby-extras-commits
mailing list