[DRE-commits] r3168 - in packages-wip/thin/trunk: . debian debian/patches
ryan52-guest at alioth.debian.org
ryan52-guest at alioth.debian.org
Tue Dec 23 06:45:00 UTC 2008
Author: ryan52-guest
Date: 2008-12-23 06:45:00 +0000 (Tue, 23 Dec 2008)
New Revision: 3168
Added:
packages-wip/thin/trunk/debian/
packages-wip/thin/trunk/debian/changelog
packages-wip/thin/trunk/debian/clean
packages-wip/thin/trunk/debian/compat
packages-wip/thin/trunk/debian/control
packages-wip/thin/trunk/debian/copyright
packages-wip/thin/trunk/debian/dirs
packages-wip/thin/trunk/debian/docs
packages-wip/thin/trunk/debian/gen_init.rb
packages-wip/thin/trunk/debian/manpages
packages-wip/thin/trunk/debian/patches/
packages-wip/thin/trunk/debian/patches/dont-allow-install
packages-wip/thin/trunk/debian/patches/fix-init-script
packages-wip/thin/trunk/debian/patches/fix-path
packages-wip/thin/trunk/debian/patches/remove-gems-dependancy
packages-wip/thin/trunk/debian/patches/series
packages-wip/thin/trunk/debian/rules
packages-wip/thin/trunk/debian/thin.install
packages-wip/thin/trunk/debian/watch
Log:
[svn-inject] Applying Debian modifications to trunk
Property changes on: packages-wip/thin/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: packages-wip/thin/trunk/debian/changelog
===================================================================
--- packages-wip/thin/trunk/debian/changelog (rev 0)
+++ packages-wip/thin/trunk/debian/changelog 2008-12-23 06:45:00 UTC (rev 3168)
@@ -0,0 +1,8 @@
+thin (1.0.0-1) UNRELEASED; urgency=low
+
+ NOTE: can't be uploaded until libeventmachine-ruby is uploaded
+
+ * Initial release (Closes: #504966)
+
+ -- Ryan Niebur <ryanryan52 at gmail.com> Sat, 01 Nov 2008 14:20:56 -0700
+
Added: packages-wip/thin/trunk/debian/clean
===================================================================
--- packages-wip/thin/trunk/debian/clean (rev 0)
+++ packages-wip/thin/trunk/debian/clean 2008-12-23 06:45:00 UTC (rev 3168)
@@ -0,0 +1,2 @@
+debian/thin.1
+debian/thin.init
Added: packages-wip/thin/trunk/debian/compat
===================================================================
--- packages-wip/thin/trunk/debian/compat (rev 0)
+++ packages-wip/thin/trunk/debian/compat 2008-12-23 06:45:00 UTC (rev 3168)
@@ -0,0 +1 @@
+7
Added: packages-wip/thin/trunk/debian/control
===================================================================
--- packages-wip/thin/trunk/debian/control (rev 0)
+++ packages-wip/thin/trunk/debian/control 2008-12-23 06:45:00 UTC (rev 3168)
@@ -0,0 +1,22 @@
+Source: thin
+Section: web
+Priority: optional
+Maintainer: Ryan Niebur <ryanryan52 at gmail.com>
+Build-Depends: debhelper (>= 7), quilt, ruby-pkg-tools, cdbs, ruby1.8, ruby1.8-dev, help2man, libeventmachine-ruby1.8, libdaemons-ruby1.8, librack-ruby1.8
+Standards-Version: 3.8.0
+Homepage: http://code.macournoyer.com/thin/
+
+Package: thin
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, librack-ruby1.8, ruby1.8, libeventmachine-ruby1.8, libdaemons-ruby1.8
+Description: fast and very simple Ruby web server
+ Thin is a Ruby web server that glues together 3 of the best Ruby
+ libraries in web history:
+ * the Mongrel parser, the root of Mongrel's speed and security
+ * Event Machine, a network I/O library with extremely high
+ scalability, performance and stability
+ * Rack, a minimal interface between webservers and Ruby frameworks
+ .
+ Which makes it, with all humility, the most secure, stable, fast and
+ extensible Ruby web server bundled in an easy to use package for your own
+ pleasure.
Added: packages-wip/thin/trunk/debian/copyright
===================================================================
--- packages-wip/thin/trunk/debian/copyright (rev 0)
+++ packages-wip/thin/trunk/debian/copyright 2008-12-23 06:45:00 UTC (rev 3168)
@@ -0,0 +1,42 @@
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=420
+Upstream-Name: thin
+Upstream-Maintainer: Marc-Andre Cournoyer <macournoyer at gmail.com>
+Upstream-Source: http://code.macournoyer.com/thin/download/
+
+Files: *
+Copyright: Copyright 2007-2008, Marc-Andre Cournoyer <macournoyer at gmail.com>
+Copyright: Copyright 2008, Kevin Williams <kevwil at gmail.com>
+Copyright: Copyright 2008, James Golick
+License: other
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to
+ deal in the Software without restriction, including without limitation the
+ rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ sell copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+Files: ext/thin_parser/*
+Copyright: Copyright (c) 2005, Zed A. Shaw
+Copyright: Copyright (c) 2008, Marc-Andre Cournoyer
+License: GPL
+ Mongrel Web Server (Mongrel) is copyrighted free software by Zed A. Shaw
+ <zedshaw at zedshaw dot com> You can redistribute it and/or modify it under
+ either the terms of the GPL.
+
+Files: debian/*
+Copyright: Copyright 2008, Ryan Niebur <ryanryan52 at gmail.com>
+License: GPL-2+
+
+On Debian systems the full text of the GNU General Public License can
+be found in `/usr/share/common-licenses/GPL'.
Added: packages-wip/thin/trunk/debian/dirs
===================================================================
--- packages-wip/thin/trunk/debian/dirs (rev 0)
+++ packages-wip/thin/trunk/debian/dirs 2008-12-23 06:45:00 UTC (rev 3168)
@@ -0,0 +1 @@
+etc/thin/
Added: packages-wip/thin/trunk/debian/docs
===================================================================
--- packages-wip/thin/trunk/debian/docs (rev 0)
+++ packages-wip/thin/trunk/debian/docs 2008-12-23 06:45:00 UTC (rev 3168)
@@ -0,0 +1 @@
+README
Added: packages-wip/thin/trunk/debian/gen_init.rb
===================================================================
--- packages-wip/thin/trunk/debian/gen_init.rb (rev 0)
+++ packages-wip/thin/trunk/debian/gen_init.rb 2008-12-23 06:45:00 UTC (rev 3168)
@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require 'erb'
+
+class Command
+ def self.script
+ "/usr/bin/thin"
+ end
+end
+INITD_PATH="/etc/init.d/thin"
+config_files_path="/etc/thin"
+File.open(File.dirname(__FILE__) + '/thin.init', 'w') do |f|
+ f << ERB.new(File.read("lib/thin/controllers/service.sh.erb")).result(binding)
+end
Added: packages-wip/thin/trunk/debian/manpages
===================================================================
--- packages-wip/thin/trunk/debian/manpages (rev 0)
+++ packages-wip/thin/trunk/debian/manpages 2008-12-23 06:45:00 UTC (rev 3168)
@@ -0,0 +1 @@
+debian/thin.1
Added: packages-wip/thin/trunk/debian/patches/dont-allow-install
===================================================================
--- packages-wip/thin/trunk/debian/patches/dont-allow-install (rev 0)
+++ packages-wip/thin/trunk/debian/patches/dont-allow-install 2008-12-23 06:45:00 UTC (rev 3168)
@@ -0,0 +1,43 @@
+# remove the code to install thin's init script ("thin install"), the Debian package does that.
+
+--- a/lib/thin/controllers/service.rb
++++ b/lib/thin/controllers/service.rb
+@@ -32,30 +32,7 @@
+ end
+
+ def install(config_files_path=DEFAULT_CONFIG_PATH)
+- if File.exist?(INITD_PATH)
+- log ">> Thin service already installed at #{INITD_PATH}"
+- else
+- log ">> Installing thin service at #{INITD_PATH} ..."
+- sh "mkdir -p #{File.dirname(INITD_PATH)}"
+- log "writing #{INITD_PATH}"
+- File.open(INITD_PATH, 'w') do |f|
+- f << ERB.new(File.read(TEMPLATE)).result(binding)
+- end
+- sh "chmod +x #{INITD_PATH}" # Make executable
+- end
+-
+- sh "mkdir -p #{config_files_path}"
+-
+- log ''
+- log "To configure thin to start at system boot:"
+- log "on RedHat like systems:"
+- log " sudo /sbin/chkconfig --level 345 #{NAME} on"
+- log "on Debian-like systems (Ubuntu):"
+- log " sudo /usr/sbin/update-rc.d -f #{NAME} defaults"
+- log "on Gentoo:"
+- log " sudo rc-update add #{NAME} default"
+- log ''
+- log "Then put your config files in #{config_files_path}"
++ log ">> Thin service is already installed at #{INITD_PATH} by the debian package"
+ end
+
+ private
+@@ -72,4 +49,4 @@
+ end
+ end
+ end
+-end
+\ No newline at end of file
++end
Added: packages-wip/thin/trunk/debian/patches/fix-init-script
===================================================================
--- packages-wip/thin/trunk/debian/patches/fix-init-script (rev 0)
+++ packages-wip/thin/trunk/debian/patches/fix-init-script 2008-12-23 06:45:00 UTC (rev 3168)
@@ -0,0 +1,22 @@
+# (better) lsb compliance
+
+--- a/lib/thin/controllers/service.sh.erb
++++ b/lib/thin/controllers/service.sh.erb
+@@ -4,7 +4,7 @@
+ # Required-Start: $local_fs $remote_fs
+ # Required-Stop: $local_fs $remote_fs
+ # Default-Start: 2 3 4 5
+-# Default-Stop: S 0 1 6
++# Default-Stop: 0 1 6
+ # Short-Description: thin initscript
+ # Description: thin
+ ### END INIT INFO
+@@ -27,7 +27,7 @@
+ stop)
+ $DAEMON stop --all $CONFIG_PATH
+ ;;
+- restart)
++ restart|force-reload|reload)
+ $DAEMON restart --all $CONFIG_PATH
+ ;;
+ *)
Added: packages-wip/thin/trunk/debian/patches/fix-path
===================================================================
--- packages-wip/thin/trunk/debian/patches/fix-path (rev 0)
+++ packages-wip/thin/trunk/debian/patches/fix-path 2008-12-23 06:45:00 UTC (rev 3168)
@@ -0,0 +1,19 @@
+# fix the paths of ruby and the installation place of thin's library code
+
+--- a/bin/thin
++++ b/bin/thin
+@@ -1,6 +1,10 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/ruby1.8
+ # Thin command line interface script.
+ # Run <tt>thin -h</tt> to get more usage.
+-require File.dirname(__FILE__) + '/../lib/thin'
++begin
++ require File.dirname(__FILE__) + '/../lib/thin.rb'
++rescue LoadError
++ require '/usr/lib/ruby/1.8/thin.rb'
++end
+
+-Thin::Runner.new(ARGV).run!
+\ No newline at end of file
++Thin::Runner.new(ARGV).run!
Added: packages-wip/thin/trunk/debian/patches/remove-gems-dependancy
===================================================================
--- packages-wip/thin/trunk/debian/patches/remove-gems-dependancy (rev 0)
+++ packages-wip/thin/trunk/debian/patches/remove-gems-dependancy 2008-12-23 06:45:00 UTC (rev 3168)
@@ -0,0 +1,12 @@
+# gems aren't needed, so remove the require
+
+--- a/lib/thin.rb
++++ b/lib/thin.rb
+@@ -5,7 +5,6 @@
+ require 'stringio'
+ require 'time'
+
+-require 'rubygems'
+ require 'eventmachine'
+
+ require 'thin/version'
Added: packages-wip/thin/trunk/debian/patches/series
===================================================================
--- packages-wip/thin/trunk/debian/patches/series (rev 0)
+++ packages-wip/thin/trunk/debian/patches/series 2008-12-23 06:45:00 UTC (rev 3168)
@@ -0,0 +1,4 @@
+fix-path
+fix-init-script
+dont-allow-install
+remove-gems-dependancy
Added: packages-wip/thin/trunk/debian/rules
===================================================================
--- packages-wip/thin/trunk/debian/rules (rev 0)
+++ packages-wip/thin/trunk/debian/rules 2008-12-23 06:45:00 UTC (rev 3168)
@@ -0,0 +1,20 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/ruby-pkg-tools/1/class/ruby-extconf-rb.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+DEB_RUBY_SETUP_CMD=./ext/thin_parser/extconf.rb
+
+build/thin::
+ ruby ./debian/gen_init.rb
+ help2man -n "fast and very simple Ruby web server" ./bin/thin >debian/thin.1
+
+# we don't want to install this file, but we do want to use it
+
+install/thin::
+ [ -f ./service.sh.erb ] || mv ./lib/thin/controllers/service.sh.erb ./service.sh.erb
+
+binary/thin::
+ [ -f ./lib/thin/controllers/service.sh.erb ] || mv ./service.sh.erb ./lib/thin/controllers/service.sh.erb
Property changes on: packages-wip/thin/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: packages-wip/thin/trunk/debian/thin.install
===================================================================
--- packages-wip/thin/trunk/debian/thin.install (rev 0)
+++ packages-wip/thin/trunk/debian/thin.install 2008-12-23 06:45:00 UTC (rev 3168)
@@ -0,0 +1,2 @@
+lib/* usr/lib/ruby/1.8/
+bin/* usr/bin/
Added: packages-wip/thin/trunk/debian/watch
===================================================================
--- packages-wip/thin/trunk/debian/watch (rev 0)
+++ packages-wip/thin/trunk/debian/watch 2008-12-23 06:45:00 UTC (rev 3168)
@@ -0,0 +1,2 @@
+version=3
+http://githubredir.debian.net/github/macournoyer/thin/ (.*).tar.gz
More information about the Pkg-ruby-extras-commits
mailing list