[DRE-commits] r5818 - in trunk/mongrel-cluster/debian: . patches

[Gunnar Wolf]

Author: gwolf
Date: 2010-08-31 04:48:28 +0000 (Tue, 31 Aug 2010)
New Revision: 5818

Added:
   trunk/mongrel-cluster/debian/patches/fix_config_dir_in_bin
Modified:
   trunk/mongrel-cluster/debian/changelog
   trunk/mongrel-cluster/debian/control
   trunk/mongrel-cluster/debian/mongrel_cluster_ctl.1
   trunk/mongrel-cluster/debian/patches/series
Log:
Added missing switches to manpage; fix wrong conffile path; still waiting for bug # to show up at BTS :-P

Modified: trunk/mongrel-cluster/debian/changelog
===================================================================
--- trunk/mongrel-cluster/debian/changelog	2010-08-30 09:16:16 UTC (rev 5817)
+++ trunk/mongrel-cluster/debian/changelog	2010-08-31 04:48:28 UTC (rev 5818)
@@ -1,8 +1,12 @@
-mongrel-cluster (1.0.5-5) UNRELEASED; urgency=low
+mongrel-cluster (1.0.5-5) unstable; urgency=low
 
   * Move from section: web to section: httpd (following reality)
+  * Standards-version 3.8.4→3.9.1.0 (no changes needed)
+  * Document functions in mongrel_cluster_ctl which had not made it to the
+    manpage
+  * Patch the default config directory to what we ship
 
- -- Gunnar Wolf <gwolf at debian.org>  Thu, 18 Feb 2010 16:45:23 -0600
+ -- Gunnar Wolf <gwolf at debian.org>  Mon, 30 Aug 2010 23:38:55 -0500
 
 mongrel-cluster (1.0.5-4) unstable; urgency=low
 

Modified: trunk/mongrel-cluster/debian/control
===================================================================
--- trunk/mongrel-cluster/debian/control	2010-08-30 09:16:16 UTC (rev 5817)
+++ trunk/mongrel-cluster/debian/control	2010-08-31 04:48:28 UTC (rev 5818)
@@ -4,7 +4,7 @@
 Maintainer: Jeremy Lainé <jeremy.laine at m4x.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, Gunnar Wolf <gwolf at debian.org>
 Build-Depends: cdbs, debhelper (>= 5)
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1.0
 Homepage: http://mongrel.rubyforge.org/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/mongrel-cluster/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/mongrel-cluster/

Modified: trunk/mongrel-cluster/debian/mongrel_cluster_ctl.1
===================================================================
--- trunk/mongrel-cluster/debian/mongrel_cluster_ctl.1	2010-08-30 09:16:16 UTC (rev 5817)
+++ trunk/mongrel-cluster/debian/mongrel_cluster_ctl.1	2010-08-31 04:48:28 UTC (rev 5818)
@@ -12,6 +12,9 @@
 .SH OPTIONS
 \fB-c, --conf_path PATH\fP  Path to mongrel_cluster configuration files
 \fB-v, --verbose\fP         Print all called commands and output
+\fB--clean\fP		    Remove pid files if needed beforehand
+\fB--user USER\fP	    Default user to run process as, if not specified in configuration files
+\fB--group GROUP\fP	    Default group to run process as, if not specified in configuration files
 .PP
 .SH SEE ALSO
 .BR mongrel-cluster (1), mongrel_rails (1), rails (1)

Added: trunk/mongrel-cluster/debian/patches/fix_config_dir_in_bin
===================================================================
--- trunk/mongrel-cluster/debian/patches/fix_config_dir_in_bin	                        (rev 0)
+++ trunk/mongrel-cluster/debian/patches/fix_config_dir_in_bin	2010-08-31 04:48:28 UTC (rev 5818)
@@ -0,0 +1,13 @@
+Index: mongrel-cluster-1.0.5/bin/mongrel_cluster_ctl
+===================================================================
+--- mongrel-cluster-1.0.5.orig/bin/mongrel_cluster_ctl	2010-08-30 23:01:31.000000000 -0500
++++ mongrel-cluster-1.0.5/bin/mongrel_cluster_ctl	2010-08-30 23:02:02.000000000 -0500
+@@ -22,7 +22,7 @@
+ end
+ 
+ @options = {}
+- at options[:conf_path] = "/etc/mongrel_cluster"
++ at options[:conf_path] = "/etc/mongrel-cluster/sites-enabled"
+ @options[:verbose] = false
+ @options[:clean] = false
+ 

Modified: trunk/mongrel-cluster/debian/patches/series
===================================================================
--- trunk/mongrel-cluster/debian/patches/series	2010-08-30 09:16:16 UTC (rev 5817)
+++ trunk/mongrel-cluster/debian/patches/series	2010-08-31 04:48:28 UTC (rev 5818)
@@ -1 +1,2 @@
 default_user_and_group
+fix_config_dir_in_bin