[DRE-commits] r1799 - packages-wip/mongrel/trunk/debian

filipe-guest at alioth.debian.org filipe-guest at alioth.debian.org
Thu Jul 26 01:14:41 UTC 2007 

Author: filipe-guest
Date: 2007-07-26 01:14:40 +0000 (Thu, 26 Jul 2007)
New Revision: 1799

Added:
   packages-wip/mongrel/trunk/debian/mongrel-doc.docs
   packages-wip/mongrel/trunk/debian/mongrel.docs
Removed:
   packages-wip/mongrel/trunk/debian/docs
Modified:
   packages-wip/mongrel/trunk/debian/changelog
   packages-wip/mongrel/trunk/debian/control
   packages-wip/mongrel/trunk/debian/copyright
   packages-wip/mongrel/trunk/debian/mongrel_rails.1
   packages-wip/mongrel/trunk/debian/rules
Log:
* Created mongrel-doc package
* Changed some "tags" at mongrel_rails man page
* Changed rules file to work with new package
* Added file setup.rb to copyright file.
* Added mongrel-doc.docs files and renamed docs to mongrel.docs



Modified: packages-wip/mongrel/trunk/debian/changelog
===================================================================
--- packages-wip/mongrel/trunk/debian/changelog	2007-07-25 16:41:10 UTC (rev 1798)
+++ packages-wip/mongrel/trunk/debian/changelog	2007-07-26 01:14:40 UTC (rev 1799)
@@ -1,8 +1,11 @@
 mongrel (1.0.1-1) UNRELEASED; urgency=low
 
   * First Mongrel stable release. (Closes: #399145)
+  * Created mongrel-doc package.
+  * Corrected copyright file (added entry for setup.rb).
+  * Finished documentation.
 
- -- Filipe Lautert <filipe at icewall.org>  Mon, 29 Jan 2007 11:21:23 -0200
+ -- Filipe Lautert <filipe at icewall.org>  Wed, 25 Jul 2007 22:06:15 -0300
 
 mongrel (1.0~rc1-1) experimental; urgency=low
 

Modified: packages-wip/mongrel/trunk/debian/control
===================================================================
--- packages-wip/mongrel/trunk/debian/control	2007-07-25 16:41:10 UTC (rev 1798)
+++ packages-wip/mongrel/trunk/debian/control	2007-07-26 01:14:40 UTC (rev 1799)
@@ -7,10 +7,20 @@
 Build-Conflicts: gcc-3.3 (<< 1:3.3.2-0pre1)
 Standards-Version: 3.7.2
 
+Package: mongrel-doc
+Architecture: all
+Recommends: w3m | www-browser
+Suggests: mongrel, rdoc
+Description: Documentation and examples for mongrel.
+ This package contains examples and the rdoc for mongrel,
+ a fast HTTP library and server for Ruby that is intended
+ for hosting Ruby web applications of any kind using plain HTTP rather
+ than FastCGI or SCGI. 
+
 Package: mongrel
 Architecture: any
 Depends: ${shlibs:Depends}, ruby1.8 (>=1.8.4), libgems-ruby1.8, libgemplugin-ruby (>=0.2.2), libdaemons-ruby
-Recommends: mongrel-cluster, rails
+Recommends: rails, mongrel-doc
 Description: A small fast HTTP library and server that runs Rails, Camping, and Nitro apps
  Mongrel is a fast HTTP library and server for Ruby that is intended
  for hosting Ruby web applications of any kind using plain HTTP rather

Modified: packages-wip/mongrel/trunk/debian/copyright
===================================================================
--- packages-wip/mongrel/trunk/debian/copyright	2007-07-25 16:41:10 UTC (rev 1798)
+++ packages-wip/mongrel/trunk/debian/copyright	2007-07-26 01:14:40 UTC (rev 1799)
@@ -7,8 +7,7 @@
 
 Upstream Author: Zed Shaw <zedshaw at zedshaw.com>
 
-On Debian systems, the full text of the GNU General Public License can be
-found at /usr/share/common-licenses/GPL.
+Licenses:
 
 Copyright (c) 2006-2007 Zed Shaw <zedshaw at zedshaw.com>
 
@@ -65,3 +64,25 @@
    IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
    PURPOSE.
+
+On Debian systems, the full text of the GNU General Public License can be
+found at /usr/share/common-licenses/GPL.
+
+---
+File setup.rb:
+
+Copyright (c) 2000-2005 Minero Aoki
+
+You can distribute/modify this program under the terms of the GNU LGPL,
+Lesser General Public License version 2.1.
+
+On Debian systems, the full text of the GNU General Public License can be
+found at /usr/share/common-licenses/LGPL.
+
+---
+Debian package:
+
+Copyright (C) 2007 Filipe Lautert <filipe at icewall.org>
+
+This package is licensed under the same terms of the upstream sources
+(see above).

Deleted: packages-wip/mongrel/trunk/debian/docs
===================================================================
--- packages-wip/mongrel/trunk/debian/docs	2007-07-25 16:41:10 UTC (rev 1798)
+++ packages-wip/mongrel/trunk/debian/docs	2007-07-26 01:14:40 UTC (rev 1799)
@@ -1 +0,0 @@
-README

Added: packages-wip/mongrel/trunk/debian/mongrel-doc.docs
===================================================================
--- packages-wip/mongrel/trunk/debian/mongrel-doc.docs	                        (rev 0)
+++ packages-wip/mongrel/trunk/debian/mongrel-doc.docs	2007-07-26 01:14:40 UTC (rev 1799)
@@ -0,0 +1,2 @@
+examples/
+doc/rdoc/

Copied: packages-wip/mongrel/trunk/debian/mongrel.docs (from rev 1716, packages-wip/mongrel/trunk/debian/docs)
===================================================================
--- packages-wip/mongrel/trunk/debian/mongrel.docs	                        (rev 0)
+++ packages-wip/mongrel/trunk/debian/mongrel.docs	2007-07-26 01:14:40 UTC (rev 1799)
@@ -0,0 +1 @@
+README

Modified: packages-wip/mongrel/trunk/debian/mongrel_rails.1
===================================================================
--- packages-wip/mongrel/trunk/debian/mongrel_rails.1	2007-07-25 16:41:10 UTC (rev 1798)
+++ packages-wip/mongrel/trunk/debian/mongrel_rails.1	2007-07-26 01:14:40 UTC (rev 1799)
@@ -3,28 +3,29 @@
 mongrel_rails \- Ruby Web Server
 .
 .SH SYNOPSIS
-.B mongrel_rails 
-.RI <command> 
-[options]
+.TP
+mongrel_rails <command> [options]
 .
 .SH DESCRIPTION
 Mongrel is a fast HTTP library and server for Ruby that is intended for hosting Ruby web applications of any kind using plain HTTP rather than FastCGI or SCGI. It is framework agnostic and already supports Ruby On Rails, Og+Nitro, Camping, and IOWA frameworks.
 .PP
 Mongrel turns out to be really nice for development since it serves files much faster than WEBrick. For example, to use it in development with Ruby on Rails is easy as this:
-.PP
+.TP
 $ mongrel_rails start
 .PP
 Mongrel is a self-documenting program by giving you an extensive help listing for each command. If you think that this manual page is outdated, simply running 
-.B mongrel_rails start -h
+.TP
+mongrel_rails start -h
+.PP
 will print out each possible option and what it does.
 .PP
 These options are also used in the 
 .B -C config_file
 option to set them without using the command line. The name used in the config file is slightly different since it's a YAML file. .br
 Mongrel has a -G (generate) feature that will take any command line options you give it, generate the YAML file to replicate those options, and then exit. For example, you could make a config file like this:
+.TP
+mongrel_rails start -G mongrel_8080.yml -e production -p 8080
 .PP
-.B mongrel_rails start -G mongrel_8080.yml -e production -p 8080
-.PP
 And it'll write all the options possible to mongrel_8080.yml, but with your specific changed for environment (-e production) and port (-p 8080). When you run a configuration file with -C, don't pass other options. Rather than have complex rules about whether a configuration file or command line option wins, mongrel_rails just uses configuration file and defaults, or command line options and defaults. Basically don't mix, it won't work.
 .
 .SH COMMANDS

Modified: packages-wip/mongrel/trunk/debian/rules
===================================================================
--- packages-wip/mongrel/trunk/debian/rules	2007-07-25 16:41:10 UTC (rev 1798)
+++ packages-wip/mongrel/trunk/debian/rules	2007-07-26 01:14:40 UTC (rev 1799)
@@ -1,21 +1,30 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/dpatch/dpatch.make
-include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
-#include /usr/share/ruby-pkg-tools/1/rules/uploaders.mk
+include /usr/share/ruby-pkg-tools/1/class/ruby-common.mk
+#include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
 
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 DEB_RUBY_CONFIG_ARGS = --installdirs=std --shebang=all
+DEB_RUBY_INSTALL_ARGS = --prefix=debian/$(cdbs_curpkg)
 
+configure/mongrel::
+	/usr/bin/ruby$(cdbs_ruby_ver) setup.rb config $(DEB_RUBY_CONFIG_ARGS)
+
+build/mongrel::
+	/usr/bin/ruby$(cdbs_ruby_ver) setup.rb setup
+
 install/mongrel::
+	/usr/bin/ruby$(cdbs_ruby_ver) setup.rb install $(DEB_RUBY_INSTALL_ARGS)
 	-ln -sf ../../../bin/mongrel_rails debian/mongrel/usr/lib/ruby/1.8/mongrel_rails 
+	-dh_installman --package=mongrel debian/mongrel_rails.1
 	-find $(CURDIR)/debian -type d | xargs \
 		rmdir -p --ignore-fail-on-non-empty
 
-build/mongrel::
-	dh_installman debian/mongrel_rails.1
+clean/mongrel::
+	$(MAKE) distclean

More information about the Pkg-ruby-extras-commits mailing list