[DRE-commits] [unicorn] 03/05: fix gemspec
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Thu Nov 3 15:46:26 UTC 2016
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master
in repository unicorn.
commit 105faffa541905deab1b63926c4ca17865ec33cf
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Thu Nov 3 20:49:25 2016 +0530
fix gemspec
---
debian/changelog | 5 +-
...explicitly-use-escaped-minus-in-man-pages.patch | 180 ---------------------
debian/patches/fix-gemspec.patch | 43 +++++
debian/patches/series | 2 +-
debian/rules | 1 +
5 files changed, 49 insertions(+), 182 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4c7cf55..f6072ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
unicorn (5.2.0-1) unstable; urgency=medium
- * New upstream release
+ * New upstream release
+ * Remove 0001-explicitly-use-escaped-minus-in-man-pages.patch
+ (applied upstream)
+ * Fix gemspec file (remove olddoc usage)
-- Pirate Praveen <praveen at debian.org> Sun, 18 Sep 2016 09:52:09 +0530
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
deleted file mode 100644
index b5af8bc..0000000
--- a/debian/patches/0001-explicitly-use-escaped-minus-in-man-pages.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-From: Hleb Valoshka <375GNU at Gmail.COM>
-Date: Thu, 27 Sep 2012 22:40:49 +0300
-Subject: explicitly use escaped minus in man pages
-
----
- man/man1/unicorn.1 | 34 +++++++++++++++++-----------------
- man/man1/unicorn_rails.1 | 34 +++++++++++++++++-----------------
- 2 files changed, 34 insertions(+), 34 deletions(-)
-
-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
- .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.
-@@ -25,7 +25,7 @@ Embedded command-line options are mostly
- 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.
- See the RDoc/ri for the \f[I]Unicorn::Configurator\f[] class for the
-@@ -36,7 +36,7 @@ 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 "/dev/null".
-@@ -47,7 +47,7 @@ redirected to "/dev/null".
- .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
-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
--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 Unicorn.
-@@ -30,7 +30,7 @@ command-line options specified in the SY
- 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.
- See the RDoc/ri for the \f[I]Unicorn::Configurator\f[] class for the
-@@ -41,7 +41,7 @@ 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 "/dev/null".
-@@ -58,7 +58,7 @@ 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
-@@ -66,7 +66,7 @@ application, typically "development" 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 domain
-@@ -78,26 +78,26 @@ CONFIG_FILE is recommended as it allows
- .RE
- .SH RACKUP COMPATIBILITY OPTIONS
- .TP
--.B -o, --host HOST
-+.B \-o, \-\-host HOST
- Listen on a TCP socket belonging to HOST, default is "0.0.0.0" (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 "-l"/"--listen" switch is recommended instead.
-+use of "\-l"/"\-\-listen" 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 "-l"/"--listen" switch is recommended instead.
-+use of "\-l"/"\-\-listen" switch is recommended instead.
- .RS
- .RE
- .TP
--.B --path PATH
-+.B \-\-path PATH
- 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 o
- .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 directories.
-@@ -134,7 +134,7 @@ 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.
-@@ -153,8 +153,8 @@ Embedded command-line options are mostly
- 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 switch.
-+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.
- All application or library-specific environment variables (e.g.
diff --git a/debian/patches/fix-gemspec.patch b/debian/patches/fix-gemspec.patch
new file mode 100644
index 0000000..fd31699
--- /dev/null
+++ b/debian/patches/fix-gemspec.patch
@@ -0,0 +1,43 @@
+Index: unicorn/unicorn.gemspec
+===================================================================
+--- unicorn.orig/unicorn.gemspec
++++ unicorn/unicorn.gemspec
+@@ -1,9 +1,13 @@
+ # -*- encoding: binary -*-
+ ENV["VERSION"] or abort "VERSION= must be specified"
+ manifest = File.readlines('.manifest').map! { |x| x.chomp! }
+-require 'olddoc'
+-extend Olddoc::Gemspec
+-name, summary, title = readme_metadata
++#require 'olddoc'
++#extend Olddoc::Gemspec
++name='unicorn', summary='unicorn: Rack HTTP server for fast clients and Unix', title = 'unicorn is an HTTP server for Rack applications designed to only serve
++fast clients on low-latency, high-bandwidth connections and take
++advantage of features in Unix/Unix-like kernels. Slow clients should
++only be served by placing a reverse proxy capable of fully buffering
++both the the request and response in between unicorn and slow clients.'
+
+ # don't bother with tests that fork, not worth our time to get working
+ # with `gem check -t` ... (of course we care for them when testing with
+@@ -14,16 +18,16 @@ end.compact
+
+ Gem::Specification.new do |s|
+ s.name = %q{unicorn}
+- s.version = ENV["VERSION"].dup
++ s.version = `./GIT-VERSION-GEN`
+ s.authors = ["#{name} hackers"]
+ s.summary = summary
+- s.description = readme_description
+- s.email = %q{unicorn-public at bogomips.org}
++ s.description = title
++ s.email = 'unicorn-public at bogomips.org'
+ s.executables = %w(unicorn unicorn_rails)
+ s.extensions = %w(ext/unicorn_http/extconf.rb)
+- s.extra_rdoc_files = extra_rdoc_files(manifest)
++# s.extra_rdoc_files = extra_rdoc_files(manifest)
+ s.files = manifest
+- s.homepage = Olddoc.config['rdoc_url']
++ s.homepage = 'http://bogomips.org/unicorn/'
+ s.test_files = test_files
+
+ # technically we need ">= 1.9.3", too, but avoid the array here since
diff --git a/debian/patches/series b/debian/patches/series
index dd6652b..4c9142a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-0001-explicitly-use-escaped-minus-in-man-pages.patch
+fix-gemspec.patch
diff --git a/debian/rules b/debian/rules
index 25899fd..25a91ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
#!/usr/bin/make -f
export GEM2DEB_TEST_RUNNER = --check-dependencies
+export VERSION=$(./GIT-VERSION-GEN)
%:
dh $@ --buildsystem=ruby --with ruby,systemd
--
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