[DRE-commits] [SCM] ruby-thin.git branch, master, updated. upstream/1.2.11-35-gb94d088

Tue Jan 17 18:19:02 UTC 2012

The following commit has been merged in the master branch:
commit 33f3dd65b8b2b18f9326a5f874c3fd44cc803027
Author: Ryan Niebur <ryanryan52 at gmail.com>
Date:   Mon Jan 16 23:07:15 2012 -0800

    switch back to using help2man to generate manpage

diff --git a/debian/changelog b/debian/changelog
index 75fa70c..d0d0658 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,6 @@ thin (1.3.1-1) UNRELEASED; urgency=low
   TODO:
    - rename the git repository
    - document ruby -S in README.Debian ?
-   - revert 1bbeda9aa53f07882bd0f67e475ce826a8bead2a ?
-     (or update the manpage, if the result is not comparable)
    - upload
 
   [ Laurent Arnoud ]
@@ -19,6 +17,7 @@ thin (1.3.1-1) UNRELEASED; urgency=low
   * Updated to newer upstream release (Closes: #653332)
   * convert to include only one thin script, which can ran under
     different interpreters using the -S flag: ruby1.9.1 -S thin start
+  * switch back to using help2man to generate manpage
 
  -- Ryan Niebur <ryan at debian.org>  Tue, 10 Jan 2012 01:23:44 -0800
 
diff --git a/debian/clean b/debian/clean
index 0bbc2f8..489cf1c 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1 +1,2 @@
 debian/thin.init
+debian/thin.manpage
diff --git a/debian/rules b/debian/rules
index 212a84d..ccfb38c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,3 +17,7 @@
 override_dh_install:
 	ruby ./debian/gen_init.rb
 	dh_install
+
+override_dh_installman:
+	RUBYLIB=./debian/thin/usr/lib/ruby/vendor_ruby/ help2man -n "fast and very simple Ruby web server" ./bin/thin > debian/thin.manpage
+	dh_installman
diff --git a/debian/thin.manpage b/debian/thin.manpage
deleted file mode 100644
index 54e8d39..0000000
--- a/debian/thin.manpage
+++ /dev/null
@@ -1,144 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.39.4.
-.TH THIN "1" "May 2011" "thin 1.2.11 codename Bat-Shit Crazy" "User Commands"
-.SH NAME
-thin \- fast and very simple Ruby web server
-.SH SYNOPSIS
-.B thin
-[\fIoptions\fR] \fIstart|stop|restart|config|install\fR
-.SH DESCRIPTION
-.SS "Server options:"
-.TP
-\fB\-a\fR, \fB\-\-address\fR HOST
-bind to HOST address (default: 0.0.0.0)
-.TP
-\fB\-p\fR, \fB\-\-port\fR PORT
-use PORT (default: 3000)
-.TP
-\fB\-S\fR, \fB\-\-socket\fR FILE
-bind to unix domain socket
-.TP
-\fB\-y\fR, \fB\-\-swiftiply\fR [KEY]
-Run using swiftiply
-.TP
-\fB\-A\fR, \fB\-\-adapter\fR NAME
-Rack adapter to use (default: autodetect)
-(rack, rails, ramaze, halcyon, merb, mack, mack, file)
-.TP
-\fB\-R\fR, \fB\-\-rackup\fR FILE
-Load a Rack config file instead of Rack adapter
-.TP
-\fB\-c\fR, \fB\-\-chdir\fR DIR
-Change to dir before starting
-.TP
-\fB\-\-stats\fR PATH
-Mount the Stats adapter under PATH
-.SS "SSL options:"
-.TP
-\fB\-\-ssl\fR
-Enables SSL
-.TP
-\fB\-\-ssl\-key\-file\fR PATH
-Path to private key
-.TP
-\fB\-\-ssl\-cert\-file\fR PATH
-Path to certificate
-.TP
-\fB\-\-ssl\-verify\fR
-Enables SSL certificate verification
-.SS "Adapter options:"
-.TP
-\fB\-e\fR, \fB\-\-environment\fR ENV
-Framework environment (default: development)
-.TP
-\fB\-\-prefix\fR PATH
-Mount the app under PATH (start with /)
-.SS "Daemon options:"
-.TP
-\fB\-d\fR, \fB\-\-daemonize\fR
-Run daemonized in the background
-.TP
-\fB\-l\fR, \fB\-\-log\fR FILE
-File to redirect output (default: log/thin.log)
-.TP
-\fB\-P\fR, \fB\-\-pid\fR FILE
-File to store PID (default: tmp/pids/thin.pid)
-.TP
-\fB\-u\fR, \fB\-\-user\fR NAME
-User to run daemon as (use with \fB\-g\fR)
-.TP
-\fB\-g\fR, \fB\-\-group\fR NAME
-Group to run daemon as (use with \fB\-u\fR)
-.TP
-\fB\-\-tag\fR NAME
-Additional text to display in process listing
-.SS "Cluster options:"
-.TP
-\fB\-s\fR, \fB\-\-servers\fR NUM
-Number of servers to start
-.TP
-\fB\-o\fR, \fB\-\-only\fR NUM
-Send command to only one server of the cluster
-.TP
-\fB\-C\fR, \fB\-\-config\fR FILE
-Load options from config file
-.TP
-\fB\-\-all\fR [DIR]
-Send command to each config files in DIR
-.TP
-\fB\-O\fR, \fB\-\-onebyone\fR
-Restart the cluster one by one (only works with restart command)
-.TP
-\fB\-w\fR, \fB\-\-wait\fR NUM
-Maximum wait time for server to be started in seconds (use with \fB\-O\fR)
-.SS "Tuning options:"
-.TP
-\fB\-b\fR, \fB\-\-backend\fR CLASS
-Backend to use, full classname
-.TP
-\fB\-t\fR, \fB\-\-timeout\fR SEC
-Request or command timeout in sec (default: 30)
-.TP
-\fB\-f\fR, \fB\-\-force\fR
-Force the execution of the command
-.TP
-\fB\-\-max\-conns\fR NUM
-Maximum number of open file descriptors (default: 1024)
-Might require sudo to set higher then 1024
-.TP
-\fB\-\-max\-persistent\-conns\fR NUM
-Maximum number of persistent connections
-(default: 512)
-.TP
-\fB\-\-threaded\fR
-Call the Rack application in threads [experimental]
-.TP
-\fB\-\-no\-epoll\fR
-Disable the use of epoll
-.SS "Common options:"
-.TP
-\fB\-r\fR, \fB\-\-require\fR FILE
-require the library
-.TP
-\fB\-D\fR, \fB\-\-debug\fR
-Set debugging on
-.TP
-\fB\-V\fR, \fB\-\-trace\fR
-Set tracing on (log raw request/response)
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Show this message
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version
-.SH "SEE ALSO"
-The full documentation for
-.B thin
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B thin
-programs are properly installed at your site, the command
-.IP
-.B info thin
-.PP
-should give you access to the complete manual.

-- 
ruby-thin.git

