Bug#691787: unblock: unicorn/4.3.1-4
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package unicorn.
This version has proper postinstall and prerm hooks (version in testing has an
unfiled RC bug).
unblock unicorn/4.3.1-4
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (50, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.2.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=be_BY.UTF-8, LC_CTYPE=be_BY.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
diff -Nru unicorn-4.3.1/debian/changelog unicorn-4.3.1/debian/changelog
--- unicorn-4.3.1/debian/changelog 2012-05-13 14:38:29.000000000 +0300
+++ unicorn-4.3.1/debian/changelog 2012-10-08 01:15:42.000000000 +0300
@@ -1,3 +1,24 @@
+unicorn (4.3.1-4) unstable; urgency=low
+
+ * Remove unicorn logs on package purge.
+ * Add patch to explicitly use escaped minus in man pages.
+
+ -- Hleb Valoshka <375gnu@gmail.com> Mon, 08 Oct 2012 00:15:04 +0300
+
+unicorn (4.3.1-3) unstable; urgency=low
+
+ * Team upload.
+ * Bump build dependency on gem2deb to >= 0.3.0~.
+
+ -- Paul van Tilburg <paulvt@debian.org> Wed, 27 Jun 2012 21:06:17 +0200
+
+unicorn (4.3.1-2) unstable; urgency=low
+
+ * Add prerm hook which stops unicorn on remove and deconfigure
+ * Suppress output of 'invoke-rc.d unicorn status' in postinstall hook
+
+ -- Hleb Valoshka <375gnu@gmail.com> Sun, 24 Jun 2012 10:43:08 +0300
+
unicorn (4.3.1-1) unstable; urgency=low
* New upstream version
diff -Nru unicorn-4.3.1/debian/control unicorn-4.3.1/debian/control
--- unicorn-4.3.1/debian/control 2012-05-13 14:38:29.000000000 +0300
+++ unicorn-4.3.1/debian/control 2012-06-28 11:35:34.000000000 +0300
@@ -4,7 +4,7 @@
Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers@lists.alioth.debian.org>
Uploaders: Hleb Valoshka <375gnu@gmail.com>
DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.11~), ruby-raindrops (>= 0.7), ruby-kgio (>= 2.6), ruby-rack
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), ruby-raindrops (>= 0.7), ruby-kgio (>= 2.6), ruby-rack
Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/pkg-ruby-extras/unicorn.git
Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/unicorn.git;a=summary
diff -Nru unicorn-4.3.1/debian/patches/0001-explicitly-use-escaped-minus-in-man-pages.patch unicorn-4.3.1/debian/patches/0001-explicitly-use-escaped-minus-in-man-pages.patch
--- unicorn-4.3.1/debian/patches/0001-explicitly-use-escaped-minus-in-man-pages.patch 1970-01-01 03:00:00.000000000 +0300
+++ unicorn-4.3.1/debian/patches/0001-explicitly-use-escaped-minus-in-man-pages.patch 2012-10-08 01:05:06.000000000 +0300
@@ -0,0 +1,269 @@
+From: Hleb Valoshka <375GNU@Gmail.COM>
+Date: Thu, 27 Sep 2012 22:40:49 +0300
+Subject: explicitly use escaped minus in man pages
+
+---
+ man/man1/unicorn.1 | 32 ++++++++++++++++----------------
+ man/man1/unicorn_rails.1 | 34 +++++++++++++++++-----------------
+ 2 files changed, 33 insertions(+), 33 deletions(-)
+
+diff --git a/man/man1/unicorn.1 b/man/man1/unicorn.1
+index 0b496af..749272a 100644
+--- a/man/man1/unicorn.1
++++ b/man/man1/unicorn.1
+@@ -4,7 +4,7 @@
+ unicorn - a rackup-like command to launch the Unicorn HTTP server
+ .SH SYNOPSIS
+ .PP
+-unicorn [-c CONFIG_FILE] [-E RACK_ENV] [-D] [RACKUP_FILE]
++unicorn [\-c CONFIG_FILE] [\-E RACK_ENV] [\-D] [RACKUP_FILE]
+ .SH DESCRIPTION
+ .PP
+ A rackup(1)-like command to launch Rack applications using Unicorn.
+@@ -26,7 +26,7 @@ Embedded command-line options are mostly parsed for compatibility
+ with rackup(1) but strongly discouraged.
+ .SH UNICORN OPTIONS
+ .TP
+-.B -c, --config-file CONFIG_FILE
++.B \-c, \-\-config\-file CONFIG_FILE
+ Path to the Unicorn-specific config file.
+ The config file is implemented as a Ruby DSL, so Ruby code may
+ executed.
+@@ -38,7 +38,7 @@ viewing ps(1) output.
+ .RS
+ .RE
+ .TP
+-.B -D, --daemonize
++.B \-D, \-\-daemonize
+ Run daemonized in the background.
+ The process is detached from the controlling terminal and stdin is
+ redirected to \[lq]/dev/null\[rq].
+@@ -50,13 +50,13 @@ redirected to \[lq]/dev/null\[rq].
+ .RS
+ .RE
+ .TP
+-.B -E, --env RACK_ENV
++.B \-E, \-\-env RACK_ENV
+ Run under the given RACK_ENV.
+ See the RACK ENVIRONMENT section for more details.
+ .RS
+ .RE
+ .TP
+-.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
+@@ -69,51 +69,51 @@ socket options.
+ .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
+@@ -124,7 +124,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.
+@@ -185,7 +185,7 @@ If needed, they should 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
+ HTTP server
+ .SH SYNOPSIS
+ .PP
+-unicorn_rails [-c CONFIG_FILE] [-E RAILS_ENV] [-D] [RACKUP_FILE]
++unicorn_rails [\-c CONFIG_FILE] [\-E RAILS_ENV] [\-D] [RACKUP_FILE]
+ .SH DESCRIPTION
+ .PP
+ A rackup(1)-like command to launch Rails applications using
+@@ -31,7 +31,7 @@ stick to the few command-line options specified in the SYNOPSIS and
+ use the CONFIG_FILE as much as possible.
+ .SH UNICORN OPTIONS
+ .TP
+-.B -c, --config-file CONFIG_FILE
++.B \-c, \-\-config-file CONFIG_FILE
+ Path to the Unicorn-specific config file.
+ The config file is implemented as a Ruby DSL, so Ruby code may
+ executed.
+@@ -43,7 +43,7 @@ viewing ps(1) output.
+ .RS
+ .RE
+ .TP
+-.B -D, --daemonize
++.B \-D, \-\-daemonize
+ Run daemonized in the background.
+ The process is detached from the controlling terminal and stdin is
+ redirected to \[lq]/dev/null\[rq].
+@@ -61,7 +61,7 @@ override this Unicorn config file.
+ .RS
+ .RE
+ .TP
+-.B -E, --env RAILS_ENV
++.B \-E, \-\-env RAILS_ENV
+ Run under the given RAILS_ENV.
+ This sets the RAILS_ENV environment variable.
+ Acceptable values are exactly those you expect in your Rails
+@@ -70,7 +70,7 @@ application, typically \[lq]development\[rq] or
+ .RS
+ .RE
+ .TP
+-.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
+@@ -84,28 +84,28 @@ socket options.
+ .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 --path PATH
++.B \-\-path PATH
+ Mounts the Rails application at the given PATH (instead of
+ \[lq]/\[rq]).
+ This is equivalent to setting the RAILS_RELATIVE_URL_ROOT
+@@ -115,26 +115,26 @@ This is only supported under Rails 2.3 or later at the moment.
+ .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.
+ For Rails >= 2.3.x, this loads the \f[I]Rails::Rack::Debugger\f[]
+ middleware.
+ .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
+@@ -145,7 +145,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.
+@@ -164,8 +164,8 @@ Embedded command-line options are mostly parsed for compatibility
+ with rackup(1) but strongly discouraged.
+ .SH ENVIRONMENT VARIABLES
+ .PP
+-The RAILS_ENV variable is set by the aforementioned -E switch.
+-The RAILS_RELATIVE_URL_ROOT is set by the aforementioned --path
++The RAILS_ENV variable is set by the aforementioned \-E switch.
++The RAILS_RELATIVE_URL_ROOT is set by the aforementioned \-\-path
+ switch.
+ Either of these variables may also be set in the shell or the
+ Unicorn CONFIG_FILE.
diff -Nru unicorn-4.3.1/debian/patches/series unicorn-4.3.1/debian/patches/series
--- unicorn-4.3.1/debian/patches/series 1970-01-01 03:00:00.000000000 +0300
+++ unicorn-4.3.1/debian/patches/series 2012-10-08 01:05:06.000000000 +0300
@@ -0,0 +1 @@
+0001-explicitly-use-escaped-minus-in-man-pages.patch
diff -Nru unicorn-4.3.1/debian/unicorn.postinst unicorn-4.3.1/debian/unicorn.postinst
--- unicorn-4.3.1/debian/unicorn.postinst 2012-05-13 14:38:29.000000000 +0300
+++ unicorn-4.3.1/debian/unicorn.postinst 2012-06-25 10:00:27.000000000 +0300
@@ -23,7 +23,7 @@
}
running() {
- invoke $1 status
+ invoke $1 status >/dev/null 2>&1
}
sig() {
diff -Nru unicorn-4.3.1/debian/unicorn.postrm unicorn-4.3.1/debian/unicorn.postrm
--- unicorn-4.3.1/debian/unicorn.postrm 1970-01-01 03:00:00.000000000 +0300
+++ unicorn-4.3.1/debian/unicorn.postrm 2012-09-25 01:41:19.000000000 +0300
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+[ "$1" = "purge" ] && rm -rf /var/log/unicorn
+
+#DEBHELPER#
+
+exit 0
diff -Nru unicorn-4.3.1/debian/unicorn.prerm unicorn-4.3.1/debian/unicorn.prerm
--- unicorn-4.3.1/debian/unicorn.prerm 1970-01-01 03:00:00.000000000 +0300
+++ unicorn-4.3.1/debian/unicorn.prerm 2012-06-25 10:00:27.000000000 +0300
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+ remove|deconfigure)
+ if [ -x /etc/init.d/unicorn ]; then
+ if [ -x /usr/sbin/invoke-rc.d ]; then
+ invoke-rc.d unicorn stop
+ else
+ /etc/init.d/unicorn stop
+ fi
+ fi
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Reply to: