supervisor.patch

--- supervisor-3.0a8.orig/setup.py
+++ supervisor-3.0a8/setup.py
@@ -12,7 +12,7 @@
 #
 ##############################################################################
 
-__revision__ = '$Id: setup.py 910 2009-11-01 19:27:10Z Mike Naberezny <[email protected]> $'
+__revision__ = '$Id: setup.py 2118 2010-01-26 12:33:46Z iko $'
 
 import urllib
 import urllib2
@@ -85,9 +85,10 @@
     install_requires = requires,
     extras_require = {'iterparse':['cElementTree >= 1.0.2']},
     tests_require = requires + ['mock >= 0.5.0'],
-    include_package_data = True,
+    package_data = {
+    '' : [ 'ui/*.html', 'ui/images/*', 'ui/stylesheets/*', 'version.txt' ],
+    },
     zip_safe = False,
-    namespace_packages = ['supervisor'],
     test_suite = "supervisor.tests",
     entry_points = {
      'supervisor_rpc':['main = supervisor.rpcinterface:make_main_rpcinterface'],
--- supervisor-3.0a8.orig/PKG-INFO
+++ supervisor-3.0a8/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: supervisor
-Version: 3.0a8
+Version: 3.0a6
 Summary: A system for controlling process state under UNIX
 Home-page: http://supervisord.org/
 Author: Chris McDonough
--- supervisor-3.0a8.orig/setup.cfg
+++ supervisor-3.0a8/setup.cfg
@@ -1,14 +1,14 @@
-[easy_install]
-zip_ok = false
-
-[nosetests]
-cover-package = supervisor
-nocapture = 1
-with-coverage = 1
-cover-erase = 1
-
 [egg_info]
 tag_build = 
 tag_date = 0
 tag_svn_revision = 0
 
+[easy_install]
+zip_ok = false
+
+[nosetests]
+nocapture=1
+cover-package=supervisor
+with-coverage=1
+cover-erase=1
+
--- supervisor-3.0a8.orig/debian/supervisor.install
+++ supervisor-3.0a8/debian/supervisor.install
@@ -0,0 +1,3 @@
+etc
+usr/bin
+usr/lib
--- supervisor-3.0a8.orig/debian/rules
+++ supervisor-3.0a8/debian/rules
@@ -0,0 +1,109 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+PYDEF=$(shell pyversions -d)
+PYVERS=$(shell pyversions -r)
+
+-include /usr/share/python/python.mk
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	# Add here commands to configure the package.
+
+	touch configure-stamp
+
+
+build: build-stamp
+
+build-stamp: configure-stamp  
+	dh_testdir
+
+	# Add here commands to compile the package.
+	for python in $(PYVERS); do \
+		python=$$(echo $$python | sed "s/$(PYDEF)/python/"); \
+		$$python setup.py build; \
+	done
+	touch $@
+
+clean: 
+	dh_testdir
+	dh_testroot
+	for python in $(PYVERS); do \
+		python=$$(echo $$python | sed "s/$(PYDEF)/python/"); \
+		$$python setup.py clean; \
+	done
+	rm -f *.pyc build-stamp configure-stamp src/supervisor.egg-info/SOURCES.txt
+
+	# Add here commands to clean up after the build process.
+	rm -rf build/
+
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_prep
+	dh_installdirs
+
+	# Add here commands to install the package into debian/supervisor.
+	set -e; \
+	for python in $(PYVERS); do \
+		pydir=$$python \
+		python=$$(echo $$python | sed "s/$(PYDEF)/python/"); \
+		$$python setup.py install --single-version-externally-managed --root=debian/tmp --no-compile $(py_setup_install_args); \
+	done
+	rm -f debian/tmp/usr/lib/python*/*-packages/supervisor*.egg-info/requires.txt
+
+	: # Replace all '#!' calls to python with /usr/bin/python
+	: # and make them executable
+	for i in `find debian -mindepth 3 -type f`; do \
+		sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \
+			$$i > $$i.temp; \
+		if cmp --quiet $$i $$i.temp; then \
+	    		rm -f $$i.temp; \
+		else \
+			mv -f $$i.temp $$i; \
+			chmod 755 $$i; \
+			echo "fixed interpreter: $$i"; \
+		fi; \
+	done
+
+	# Configuration
+	install -d debian/tmp/etc/supervisor/conf.d
+	install -m 644 debian/README.conf debian/tmp/etc/supervisor/conf.d/README
+	install -m 644 debian/supervisord.conf debian/tmp/etc/supervisor/supervisord.conf
+
+# Build architecture-independent files here.
+binary-arch: build install
+# We have nothing to do.
+
+# Build architecture-dependent files here.
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs CHANGES.txt
+	dh_installdocs
+	dh_installexamples
+	dh_install --sourcedir=debian/tmp --exclude=test
+	dh_pysupport
+	dh_installinit
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
--- supervisor-3.0a8.orig/debian/compat
+++ supervisor-3.0a8/debian/compat
@@ -0,0 +1 @@
+7
--- supervisor-3.0a8.orig/debian/README.Debian
+++ supervisor-3.0a8/debian/README.Debian
@@ -0,0 +1,14 @@
+supervisor for Debian
+---------------------
+
+The Debian package for supervisor installs a standardised config file
+in /etc/supervisor/supervisord.conf. If the only thing you want to do
+is add configuration for programs and groups, you should create
+config files in /etc/supervisor/conf.d/*.conf, these will be read by
+the default config.
+
+There is an init.d script that will start a single instance of
+supervisord as root. If you intend to use supervisor only as another
+user, you may want to disable the init.d startup.
+
+ -- Anders Hammarquist <[email protected]>  Wed, 16 Jul 2008 10:36:09 +0200
--- supervisor-3.0a8.orig/debian/supervisor.docs
+++ supervisor-3.0a8/debian/supervisor.docs
@@ -0,0 +1,2 @@
+README.txt
+TODO.txt
--- supervisor-3.0a8.orig/debian/copyright
+++ supervisor-3.0a8/debian/copyright
@@ -0,0 +1,181 @@
+Downloaded from <http://svn.supervisord.org/supervisor/>
+
+Upstream Author:
+
+  Chris McDonough ([email protected])
+  "Agendaless Consulting":http://www.agendaless.com
+
+  Mike Naberezny ([email protected])
+  "Maintainable Software":http://www.maintainable.com
+
+Copyright:
+
+    Copyright (c) 2007 Agendaless Consulting and Contributors.
+
+License:
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are
+    met:
+
+    1.  Redistributions in source code must retain the accompanying
+	copyright notice, this list of conditions, and the following
+	disclaimer.
+
+    2.  Redistributions in binary form must reproduce the accompanying
+	copyright notice, this list of conditions, and the following
+	disclaimer in the documentation and/or other materials provided
+	with the distribution.
+
+    3.  Names of the copyright holders must not be used to endorse or
+	promote products derived from this software without prior
+	written permission from the copyright holders.
+
+    4.  If any files are modified, you must cause the modified files to
+	carry prominent notices stating that you changed the files and
+	the date of any change.
+
+    Disclaimer
+
+      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND
+      ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+      TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+      PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+      HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+      EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+      TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+      DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+      ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+      TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+      THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+      SUCH DAMAGE.
+
+  http_client.py code is based on code by Daniel Krech, which was
+  released under this license:
+
+    LICENSE AGREEMENT FOR RDFLIB 0.9.0 THROUGH 2.3.1
+    ------------------------------------------------
+    Copyright (c) 2002-2005, Daniel Krech, http://eikeon.com/
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are
+    met:
+
+      * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+      * Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+
+      * Neither the name of Daniel Krech nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+    OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+  Part of the testing framework in this distribution is released under
+  the Zope Public License (as marked in its file header):
+
+    Zope Public License (ZPL) Version 2.1
+    -------------------------------------
+
+    A copyright notice accompanies this license document that
+    identifies the copyright holders.
+
+    This license has been certified as open source. It has also
+    been designated as GPL compatible by the Free Software
+    Foundation (FSF).
+
+    Redistribution and use in source and binary forms, with or
+    without modification, are permitted provided that the
+    following conditions are met:
+
+    1. Redistributions in source code must retain the
+       accompanying copyright notice, this list of conditions,
+       and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the accompanying
+       copyright notice, this list of conditions, and the
+       following disclaimer in the documentation and/or other
+       materials provided with the distribution.
+
+    3. Names of the copyright holders must not be used to
+       endorse or promote products derived from this software
+       without prior written permission from the copyright
+       holders.
+
+    4. The right to distribute this software or to use it for
+       any purpose does not give you the right to use
+       Servicemarks (sm) or Trademarks (tm) of the copyright
+       holders. Use of them is covered by separate agreement
+       with the copyright holders.
+
+    5. If any files are modified, you must cause the modified
+       files to carry prominent notices stating that you changed
+       the files and the date of any change.
+
+    Disclaimer
+
+      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS''
+      AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+      NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+      AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+      NO EVENT SHALL THE COPYRIGHT HOLDERS BE
+      LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+      EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+      LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+      LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+      HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+      CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+      OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+      SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+      DAMAGE.
+
+Supervisor uses a patched version of medusa which has the following license:
+
+      Medusa was once distributed under a 'free for non-commercial use'
+      license, but in May of 2000 Sam Rushing changed the license to be
+      identical to the standard Python license at the time.  The standard
+      Python license has always applied to the core components of Medusa,
+      this change just frees up the rest of the system, including the http
+      server, ftp server, utilities, etc.  Medusa is therefore under the
+      following license:
+
+      ==============================
+      Permission to use, copy, modify, and distribute this software and
+      its documentation for any purpose and without fee is hereby granted,
+      provided that the above copyright notice appear in all copies and
+      that both that copyright notice and this permission notice appear in
+      supporting documentation, and that the name of Sam Rushing not be
+      used in advertising or publicity pertaining to distribution of the
+      software without specific, written prior permission.
+
+      SAM RUSHING DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+      INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+      NO EVENT SHALL SAM RUSHING BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+      CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+      OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+      NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+      WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+      ==============================
+
+      Sam would like to take this opportunity to thank all of the folks who
+      supported Medusa over the years by purchasing commercial licenses.
+
+
+The Debian packaging is (C) 2009, Anders Hammarquist <[email protected]> and
+is licensed under the GPL, version 2 or later,
+see `/usr/share/common-licenses/GPL-2'.
--- supervisor-3.0a8.orig/debian/supervisor.default
+++ supervisor-3.0a8/debian/supervisor.default
@@ -0,0 +1,10 @@
+# Defaults for supervisor initscript
+# sourced by /etc/init.d/supervisor
+# installed at /etc/default/supervisor by the maintainer scripts
+
+#
+# This is a POSIX shell fragment
+#
+
+# Additional options that are passed to the Daemon.
+DAEMON_OPTS=""
--- supervisor-3.0a8.orig/debian/supervisord.conf
+++ supervisor-3.0a8/debian/supervisord.conf
@@ -0,0 +1,28 @@
+; supervisor config file
+
+[unix_http_server]
+file=/var/run//supervisor.sock   ; (the path to the socket file)
+chmod=0700                       ; sockef file mode (default 0700)
+
+[supervisord]
+logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log)
+pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
+childlogdir=/var/log/supervisor            ; ('AUTO' child log dir, default $TEMP)
+
+; the below section must remain in the config file for RPC
+; (supervisorctl/web interface) to work, additional interfaces may be
+; added by defining them in separate rpcinterface: sections
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl=unix:///var/run//supervisor.sock ; use a unix:// URL  for a unix socket
+
+; The [include] section can just contain the "files" setting.  This
+; setting can list multiple files (separated by whitespace or
+; newlines).  It can also contain wildcards.  The filenames are
+; interpreted as relative to this file.  Included files *cannot*
+; include files themselves.
+
+[include]
+files = /etc/supervisor/conf.d/*.conf
--- supervisor-3.0a8.orig/debian/supervisor.dirs
+++ supervisor-3.0a8/debian/supervisor.dirs
@@ -0,0 +1,2 @@
+var/log/supervisor
+
--- supervisor-3.0a8.orig/debian/supervisor.init
+++ supervisor-3.0a8/debian/supervisor.init
@@ -0,0 +1,166 @@
+#! /bin/sh
+#
+# skeleton	example file to build /etc/init.d/ scripts.
+#		This file should be used to construct scripts for /etc/init.d.
+#
+#		Written by Miquel van Smoorenburg <[email protected]>.
+#		Modified for Debian
+#		by Ian Murdock <[email protected]>.
+#               Further changes by Javier Fernandez-Sanguino <[email protected]>
+#
+# Version:	@(#)skeleton  1.9  26-Feb-2001  [email protected]
+#
+### BEGIN INIT INFO
+# Provides:          supervisor
+# Required-Start:    $remote_fs $network $named
+# Required-Stop:     $remote_fs $network $named
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start/stop supervisor
+# Description:       Start/stop supervisor daemon and its configured
+#                    subprocesses.
+### END INIT INFO
+
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/bin/supervisord
+NAME=supervisord
+DESC=supervisor
+
+test -x $DAEMON || exit 0
+
+LOGDIR=/var/log/supervisor
+PIDFILE=/var/run/$NAME.pid
+DODTIME=5                   # Time to wait for the server to die, in seconds
+                            # If this value is set too low you might not
+                            # let some servers to die gracefully and
+                            # 'restart' will not work
+
+# Include supervisor defaults if available
+if [ -f /etc/default/supervisor ] ; then
+	. /etc/default/supervisor
+fi
+
+set -e
+
+running_pid()
+{
+    # Check if a given process pid's cmdline matches a given name
+    pid=$1
+    name=$2
+    [ -z "$pid" ] && return 1
+    [ ! -d /proc/$pid ] &&  return 1
+    (cat /proc/$pid/cmdline | tr "\000" "\n"|grep -q $name) || return 1
+    return 0
+}
+
+running()
+{
+# Check if the process is running looking at /proc
+# (works for all users)
+
+    # No pidfile, probably no daemon present
+    [ ! -f "$PIDFILE" ] && return 1
+    # Obtain the pid and check it against the binary name
+    pid=`cat $PIDFILE`
+    running_pid $pid $DAEMON || return 1
+    return 0
+}
+
+force_stop() {
+# Forcefully kill the process
+    [ ! -f "$PIDFILE" ] && return
+    if running ; then
+        kill -15 $pid
+        # Is it really dead?
+        [ -n "$DODTIME" ] && sleep "$DODTIME"s
+        if running ; then
+            kill -9 $pid
+            [ -n "$DODTIME" ] && sleep "$DODTIME"s
+            if running ; then
+                echo "Cannot kill $LABEL (pid=$pid)!"
+                exit 1
+            fi
+        fi
+    fi
+    rm -f $PIDFILE
+    return 0
+}
+
+case "$1" in
+  start)
+	echo -n "Starting $DESC: "
+	start-stop-daemon --start --quiet --pidfile $PIDFILE \
+		--exec $DAEMON -- $DAEMON_OPTS
+	test -f $PIDFILE || sleep 1
+        if running ; then
+            echo "$NAME."
+        else
+            echo " ERROR."
+        fi
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE 
+	echo "$NAME."
+	;;
+  force-stop)
+	echo -n "Forcefully stopping $DESC: "
+        force_stop
+        if ! running ; then
+            echo "$NAME."
+        else
+            echo " ERROR."
+        fi
+	;;
+  #reload)
+	#
+	#	If the daemon can reload its config files on the fly
+	#	for example by sending it SIGHUP, do it here.
+	#
+	#	If the daemon responds to changes in its config file
+	#	directly anyway, make this a do-nothing entry.
+	#
+	# echo "Reloading $DESC configuration files."
+	# start-stop-daemon --stop --signal 1 --quiet --pidfile \
+	#	/var/run/$NAME.pid --exec $DAEMON
+  #;;
+  force-reload)
+	#
+	#	If the "reload" option is implemented, move the "force-reload"
+	#	option to the "reload" entry above. If not, "force-reload" is
+	#	just the same as "restart" except that it does nothing if the
+	#   daemon isn't already running.
+	# check wether $DAEMON is running. If so, restart
+	start-stop-daemon --stop --test --quiet --pidfile \
+		/var/run/$NAME.pid --exec $DAEMON \
+	&& $0 restart \
+	|| exit 0
+	;;
+  restart)
+    echo -n "Restarting $DESC: "
+	start-stop-daemon --stop --quiet --pidfile \
+		/var/run/$NAME.pid --exec $DAEMON
+	[ -n "$DODTIME" ] && sleep $DODTIME
+	start-stop-daemon --start --quiet --pidfile \
+		/var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
+	echo "$NAME."
+	;;
+  status)
+    echo -n "$LABEL is "
+    if running ;  then
+        echo "running"
+    else
+        echo " not running."
+        exit 1
+    fi
+    ;;
+  *)
+	N=/etc/init.d/$NAME
+	# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+	echo "Usage: $N {start|stop|restart|force-reload|status|force-stop}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
--- supervisor-3.0a8.orig/debian/control
+++ supervisor-3.0a8/debian/control
@@ -0,0 +1,20 @@
+Source: supervisor
+Section: admin
+Priority: extra
+Maintainer: Anders Hammarquist <[email protected]>
+Build-Depends: debhelper (>= 7), python-setuptools (>= 0.6c7), python-support, python-all (>= 2.3.5-7)
+XS-Python-Version: >= 2.3
+Standards-Version: 3.8.3
+Homepage: http://supervisord.org/
+
+Package: supervisor
+Architecture: all
+Depends: python (>= 2.3), python-medusa (>= 0.5.4), python-meld3, python-pkg-resources (>= 0.6c7), ${python:Depends}
+Description: A system for controlling process state
+ Supervisor is a system for controlling and maintaining process state,
+ similar to what init does, but not intended as an init replacement.
+ .
+ It will manage individual processess or groups of processes that
+ need to be started and stopped in order, and it is possible to
+ control individual process state via an rpc mechanism, thus allowing
+ ordinary users to restart processes.
--- supervisor-3.0a8.orig/debian/watch
+++ supervisor-3.0a8/debian/watch
@@ -0,0 +1,9 @@
+# Example watch control file for uscan
+# Rename this file to "watch" and then you can run the "uscan" command
+# to check for upstream updates and more.
+# See uscan(1) for format
+
+# Compulsory line, this is a version 3 file
+version=3
+
+http://dist.supervisord.org/supervisor-(.*)\.tar\.gz
--- supervisor-3.0a8.orig/debian/changelog
+++ supervisor-3.0a8/debian/changelog
@@ -0,0 +1,32 @@
+supervisor (3.0a8-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Rebuild to add Python 2.7 support
+
+ -- Piotr Ożarowski <[email protected]>  Sun, 08 May 2011 16:45:52 +0200
+
+supervisor (3.0a8-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Anders Hammarquist <[email protected]>  Tue, 26 Jan 2010 13:17:32 +0100
+
+supervisor (3.0a7-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "manipulates site-packages/ directly, failing with Python 2.6"
+    Applied and uploaded Kumar's patch. (Closes: #547858)
+
+ -- Bastian Venthur <[email protected]>  Sat, 07 Nov 2009 13:06:00 +0100
+
+supervisor (3.0a7-2) unstable; urgency=low
+
+  * Fix build-depdends (Closes: #545624)
+
+ -- Anders Hammarquist <[email protected]>  Wed, 09 Sep 2009 23:12:43 +0200
+
+supervisor (3.0a7-1) unstable; urgency=low
+
+  * Initial release (Closes: #491665).
+
+ -- Anders Hammarquist <[email protected]>  Thu, 30 Jul 2009 11:29:24 +0200
--- supervisor-3.0a8.orig/debian/supervisor.examples
+++ supervisor-3.0a8/debian/supervisor.examples
@@ -0,0 +1,6 @@
+src/supervisor/scripts/loop_eventgen.py
+src/supervisor/scripts/loop_listener.py
+src/supervisor/scripts/sample_commevent.py
+src/supervisor/scripts/sample_eventlistener.py
+src/supervisor/scripts/sample_exiting_eventlistener.py
+src/supervisor/skel/sample.conf
--- supervisor-3.0a8.orig/debian/README.conf
+++ supervisor-3.0a8/debian/README.conf
@@ -0,0 +1,3 @@
+Place custom configuration files for supervisor here. They
+will be read after the main configuration file in
+/etc/supervisor/supervisord.conf
--- supervisor-3.0a8.orig/src/supervisor.egg-info/requires.txt
+++ supervisor-3.0a8/src/supervisor.egg-info/requires.txt
@@ -1,5 +1,4 @@
 meld3 >= 0.6.5
-elementtree
 
 [iterparse]
 cElementTree >= 1.0.2
\ No newline at end of file
--- supervisor-3.0a8.orig/src/supervisor/options.py
+++ supervisor-3.0a8/src/supervisor/options.py
@@ -105,7 +105,7 @@
     def default_configfile(self):
         """Return the name of the found config file or raise. """
         paths = ['supervisord.conf', 'etc/supervisord.conf',
-                 '/etc/supervisord.conf']
+                 '/etc/supervisor/supervisord.conf', '/etc/supervisord.conf']
         config = None
         for path in paths:
             if os.path.exists(path):
--- supervisor-3.0a8.orig/src/supervisor/medusa/__init__.py
+++ supervisor-3.0a8/src/supervisor/medusa/__init__.py
@@ -3,4 +3,4 @@
 
 # created 2002/03/19, AMK
 
-__revision__ = "$Id: __init__.py,v 1.2 2002/03/19 22:49:34 amk Exp $"
+__revision__ = "$Id: __init__.py 1592 2009-07-30 14:55:41Z iko $"
--- supervisor-3.0a8.orig/src/supervisor/medusa/monitor.py
+++ supervisor-3.0a8/src/supervisor/medusa/monitor.py
@@ -5,7 +5,7 @@
 # python REPL channel.
 #
 
-RCS_ID = '$Id: monitor.py,v 1.5 2002/03/23 15:08:06 amk Exp $'
+RCS_ID = '$Id: monitor.py 1592 2009-07-30 14:55:41Z iko $'
 
 import md5
 import socket
--- supervisor-3.0a8.orig/src/supervisor/medusa/ftp_server.py
+++ supervisor-3.0a8/src/supervisor/medusa/ftp_server.py
@@ -5,7 +5,7 @@
 #                                                All Rights Reserved.
 #
 
-RCS_ID =  '$Id: ftp_server.py,v 1.11 2003/12/24 16:05:28 akuchling Exp $'
+RCS_ID =  '$Id: ftp_server.py 1592 2009-07-30 14:55:41Z iko $'
 
 # An extensible, configurable, asynchronous FTP server.
 #
--- supervisor-3.0a8.orig/src/supervisor/medusa/unix_user_handler.py
+++ supervisor-3.0a8/src/supervisor/medusa/unix_user_handler.py
@@ -5,7 +5,7 @@
 #                                                All Rights Reserved.
 #
 
-RCS_ID =  '$Id: unix_user_handler.py,v 1.4 2002/11/25 00:09:23 akuchling Exp $'
+RCS_ID =  '$Id: unix_user_handler.py 1592 2009-07-30 14:55:41Z iko $'
 
 # support for `~user/public_html'.
 
--- supervisor-3.0a8.orig/src/supervisor/medusa/xmlrpc_handler.py
+++ supervisor-3.0a8/src/supervisor/medusa/xmlrpc_handler.py
@@ -5,7 +5,7 @@
 
 # Based on "xmlrpcserver.py" by Fredrik Lundh ([email protected])
 
-VERSION = "$Id: xmlrpc_handler.py,v 1.6 2004/04/21 14:09:24 akuchling Exp $"
+VERSION = "$Id: xmlrpc_handler.py 1592 2009-07-30 14:55:41Z iko $"
 
 import http_server
 import xmlrpclib
--- supervisor-3.0a8.orig/src/supervisor/medusa/filesys.py
+++ supervisor-3.0a8/src/supervisor/medusa/filesys.py
@@ -1,5 +1,5 @@
 # -*- Mode: Python -*-
-#       $Id: filesys.py,v 1.9 2003/12/24 16:10:56 akuchling Exp $
+#       $Id: filesys.py 1592 2009-07-30 14:55:41Z iko $
 #       Author: Sam Rushing <[email protected]>
 #
 # Generic filesystem interface.
--- supervisor-3.0a8.orig/src/supervisor/medusa/status_handler.py
+++ supervisor-3.0a8/src/supervisor/medusa/status_handler.py
@@ -1,6 +1,6 @@
 # -*- Mode: Python -*-
 
-VERSION_STRING = "$Id: status_handler.py,v 1.7 2003/12/24 16:08:16 akuchling Exp $"
+VERSION_STRING = "$Id: status_handler.py 1592 2009-07-30 14:55:41Z iko $"
 
 #
 # medusa status extension
--- supervisor-3.0a8.orig/src/supervisor/medusa/redirecting_handler.py
+++ supervisor-3.0a8/src/supervisor/medusa/redirecting_handler.py
@@ -5,7 +5,7 @@
 #                                                All Rights Reserved.
 #
 
-RCS_ID =  '$Id: redirecting_handler.py,v 1.4 2002/03/20 17:37:48 amk Exp $'
+RCS_ID =  '$Id: redirecting_handler.py 1592 2009-07-30 14:55:41Z iko $'
 
 import re
 import counter
--- supervisor-3.0a8.orig/src/supervisor/medusa/setup.py
+++ supervisor-3.0a8/src/supervisor/medusa/setup.py
@@ -1,5 +1,5 @@
 
-__revision__ = '$Id: setup.py,v 1.9 2003/08/22 13:07:07 akuchling Exp $'
+__revision__ = '$Id: setup.py 1592 2009-07-30 14:55:41Z iko $'
 
 from distutils.core import setup
 
--- supervisor-3.0a8.orig/src/supervisor/medusa/auth_handler.py
+++ supervisor-3.0a8/src/supervisor/medusa/auth_handler.py
@@ -5,7 +5,7 @@
 #                                                All Rights Reserved.
 #
 
-RCS_ID =  '$Id: auth_handler.py,v 1.6 2002/11/25 19:40:23 akuchling Exp $'
+RCS_ID =  '$Id: auth_handler.py 1592 2009-07-30 14:55:41Z iko $'
 
 # support for 'basic' authenticaion.
 
--- supervisor-3.0a8.orig/src/supervisor/medusa/http_server.py
+++ supervisor-3.0a8/src/supervisor/medusa/http_server.py
@@ -5,7 +5,7 @@
 #                                                All Rights Reserved.
 #
 
-RCS_ID =  '$Id: http_server.py,v 1.12 2004/04/21 15:11:44 akuchling Exp $'
+RCS_ID =  '$Id: http_server.py 2118 2010-01-26 12:33:46Z iko $'
 
 # python modules
 import os
--- supervisor-3.0a8.orig/src/supervisor/medusa/chat_server.py
+++ supervisor-3.0a8/src/supervisor/medusa/chat_server.py
@@ -5,7 +5,7 @@
 #                                                All Rights Reserved.
 #
 
-RCS_ID = '$Id: chat_server.py,v 1.4 2002/03/20 17:37:48 amk Exp $'
+RCS_ID = '$Id: chat_server.py 1592 2009-07-30 14:55:41Z iko $'
 
 import string
 
--- supervisor-3.0a8.orig/src/supervisor/medusa/put_handler.py
+++ supervisor-3.0a8/src/supervisor/medusa/put_handler.py
@@ -5,7 +5,7 @@
 #                                                All Rights Reserved.
 #
 
-RCS_ID =  '$Id: put_handler.py,v 1.4 2002/08/01 18:15:45 akuchling Exp $'
+RCS_ID =  '$Id: put_handler.py 1592 2009-07-30 14:55:41Z iko $'
 
 import re
 import string
--- supervisor-3.0a8.orig/src/supervisor/medusa/producers.py
+++ supervisor-3.0a8/src/supervisor/medusa/producers.py
@@ -1,6 +1,6 @@
 # -*- Mode: Python -*-
 
-RCS_ID = '$Id: producers.py,v 1.9 2004/04/21 13:56:28 akuchling Exp $'
+RCS_ID = '$Id: producers.py 1592 2009-07-30 14:55:41Z iko $'
 
 """
 A collection of producers.
--- supervisor-3.0a8.orig/src/supervisor/medusa/resolver.py
+++ supervisor-3.0a8/src/supervisor/medusa/resolver.py
@@ -4,7 +4,7 @@
 #       Author: Sam Rushing <[email protected]>
 #
 
-RCS_ID =  '$Id: resolver.py,v 1.4 2002/03/20 17:37:48 amk Exp $'
+RCS_ID =  '$Id: resolver.py 1592 2009-07-30 14:55:41Z iko $'
 
 
 # Fast, low-overhead asynchronous name resolver.  uses 'pre-cooked'
--- supervisor-3.0a8.orig/src/supervisor/medusa/default_handler.py
+++ supervisor-3.0a8/src/supervisor/medusa/default_handler.py
@@ -5,7 +5,7 @@
 #                                                All Rights Reserved.
 #
 
-RCS_ID = '$Id: default_handler.py,v 1.8 2002/08/01 18:15:45 akuchling Exp $'
+RCS_ID = '$Id: default_handler.py 1592 2009-07-30 14:55:41Z iko $'
 
 # standard python modules
 import mimetypes
--- supervisor-3.0a8.orig/src/supervisor/medusa/thread/thread_channel.py
+++ supervisor-3.0a8/src/supervisor/medusa/thread/thread_channel.py
@@ -1,6 +1,6 @@
 # -*- Mode: Python -*-
 
-VERSION_STRING = "$Id: thread_channel.py,v 1.3 2002/03/19 22:49:40 amk Exp $"
+VERSION_STRING = "$Id: thread_channel.py 1592 2009-07-30 14:55:41Z iko $"
 
 # This will probably only work on Unix.
 
--- supervisor-3.0a8.orig/src/supervisor/medusa/thread/select_trigger.py
+++ supervisor-3.0a8/src/supervisor/medusa/thread/select_trigger.py
@@ -14,7 +14,7 @@
 #
 ##############################################################################
 
-__revision__ = "$Id: select_trigger.py,v 1.4 2003/01/09 15:49:15 akuchling Exp $"
+__revision__ = "$Id: select_trigger.py 1592 2009-07-30 14:55:41Z iko $"
 
 import asyncore_25 as asyncore
 import asynchat_25 as asynchat
--- supervisor-3.0a8.orig/src/supervisor/medusa/test/test_producers.py
+++ supervisor-3.0a8/src/supervisor/medusa/test/test_producers.py
@@ -2,7 +2,7 @@
 # Test script for producers.py
 #
 
-__revision__ = "$Id: test_producers.py,v 1.2 2002/09/18 20:16:40 akuchling Exp $"
+__revision__ = "$Id: test_producers.py 2118 2010-01-26 12:33:46Z iko $"
 
 import StringIO, zlib
 from sancho.unittest import TestScenario, parse_args, run_scenarios