Merge lp:~rainct/apt-zeroconf/cheetah into lp:apt-zeroconf

[Siegfried Gevatter]

[Siegfried Gevatter (rainct)]

 - Several fixes so that installing the package works correctly.
 - Fix http.py to look in the right path for the installed files.
 - Replace the manpage with a roff one, so that no conversion is needed.
 - Change hashbang to python2.6 so this works on Debian too (where 2.5 is default).
 - Merge in a couple other branches.
 - Other little changes to debian/.

[lp:~rainct/apt-zeroconf/cheetah]

142. By Siegfried Gevatter on 2010-02-01

Catch exception when socket is already in use and signalize this
condition with a special code.

143. By Siegfried Gevatter on 2010-02-01

apt-zeroconf.1: clarify the use of --daemon.

144. By Siegfried Gevatter on 2010-02-01

Fix debian/init.

The previous version was good enough for the package to work, but
"sudo service apt-zeroconf start/stop/restart" didn't work.

145. By Siegfried Gevatter on 2010-02-01

Some more changes here and there to make pep-8.py happy.
Change debian/init to always return 0 on stop, else dpkg-reconfigure gets mad.

146. By Siegfried Gevatter on 2010-02-01

azc_daemon/__init__.py: close all file descriptors after forking

Now that we don't use start-stop-daemon with the --background
workaround option anymore, dpkg-reconfigure was hanging again.
*Finally* I discovered the problem as being in _daemonize() :/.

147. By Siegfried Gevatter on 2010-02-01

Update debian/changelog.

Unmerged revisions

147. By Siegfried Gevatter on 2010-02-01

Update debian/changelog.

146. By Siegfried Gevatter on 2010-02-01

azc_daemon/__init__.py: close all file descriptors after forking

Now that we don't use start-stop-daemon with the --background
workaround option anymore, dpkg-reconfigure was hanging again.
*Finally* I discovered the problem as being in _daemonize() :/.

145. By Siegfried Gevatter on 2010-02-01

Some more changes here and there to make pep-8.py happy.
Change debian/init to always return 0 on stop, else dpkg-reconfigure gets mad.

144. By Siegfried Gevatter on 2010-02-01

Fix debian/init.

The previous version was good enough for the package to work, but
"sudo service apt-zeroconf start/stop/restart" didn't work.

143. By Siegfried Gevatter on 2010-02-01

apt-zeroconf.1: clarify the use of --daemon.

142. By Siegfried Gevatter on 2010-02-01

Catch exception when socket is already in use and signalize this
condition with a special code.

141. By Siegfried Gevatter on 2010-01-31

Fix postinst, init file, etc. Installing the package works now!

140. By Siegfried Gevatter on 2010-01-31

Fix wrong path for HTML files when installed.

139. By Siegfried Gevatter on 2010-01-31

Remove now superfluous manpage generation code from setup.py.

138. By Siegfried Gevatter on 2010-01-31

Change python-central dependency to python-support.

=== modified file 'HACKING'
--- HACKING	2009-08-09 01:45:52 +0000
+++ HACKING	2010-02-01 20:58:13 +0000
@@ -15,7 +15,8 @@
 -------
 
 We use py.test for testing at the moment.
-You can get it by running "[sudo] easy_install -U py"
+You can get it by running "[sudo] easy_install -U py", or installing
+python-codespeak-lib on Debian systems.
     
 - For every change, try to create a new test.
 - Run all tests: 'py.test' in main project dir.
 
=== modified file 'MANIFEST'
--- MANIFEST	2009-07-14 19:40:59 +0000
+++ MANIFEST	2010-02-01 20:58:13 +0000
@@ -21,10 +21,9 @@
 pages/list.xsl
 pages/logo.png
 pages/stats.html
-support/apt-zeroconf.1.gz
+support/apt-zeroconf.1
 support/apt-zeroconf.apt.conf
 support/apt-zeroconf.conf
-support/apt-zeroconf.xml
 support/azc_rule
 support/build.sh
 support/make_docs.sh
 
=== modified file 'apt-zeroconf'
--- apt-zeroconf	2009-07-25 21:59:12 +0000
+++ apt-zeroconf	2010-02-01 20:58:13 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.6
 # -*- coding: utf-8; tab-width: 4; indent-tabs-mode: nil -*-
 
 # This file is part of apt-zeroconf.
@@ -25,10 +25,10 @@
 import optparse
 import sys
 import os
-#from pwd import getpwnam
+
+sys.path.append('/usr/share/pyshared/')
 from aptzeroconf import main
-
-SCRIPTPATH = os.path.dirname(os.path.abspath(__file__))
+from aptzeroconf.exceptions import AlreadyRunningError
 
 if __name__ == "__main__":
     parser = optparse.OptionParser()
@@ -50,10 +50,8 @@
         class azcDaemon(Daemon):
 
             def run(self):
-                os.chdir(SCRIPTPATH)
                 main(options)
 
-
         if os.getuid() != 0:
             print ("** Logging has been disabled. **"
                 "You need root privileges to start apt-zeroconf as daemon."
@@ -97,4 +95,8 @@
         print "--background has been deprecated, use --daemon."
         sys.exit(2)
 
-main(options)
+try:
+    main(options)
+except AlreadyRunningError:
+    print "Another instance of Apt-ZeroConf is already running."
+    sys.exit(42)
 
=== added file 'aptzeroconf/exceptions.py'
--- aptzeroconf/exceptions.py	1970-01-01 00:00:00 +0000
+++ aptzeroconf/exceptions.py	2010-02-01 20:58:13 +0000
@@ -0,0 +1,32 @@
+# -*- coding: utf-8; tab-width: 4; indent-tabs-mode: nil -*-
+#
+# Copyright (C) 2010 - Siegfried Gevatter <[e-mail]>
+#
+# Apt-zeroconf is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Apt-zeroconf is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with apt-zeroconf; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+class AptZeroConfException(Exception):
+    """
+    Base class for exceptions from AptZeroConf.
+    """
+    pass
+
+
+class AlreadyRunningError(AptZeroConfException):
+    """
+    Exception raised if another instance or a conflicting service is
+    already running.
+    """
+    pass
 
=== modified file 'aptzeroconf/http.py'
--- aptzeroconf/http.py	2009-09-12 02:04:35 +0000
+++ aptzeroconf/http.py	2010-02-01 20:58:13 +0000
@@ -25,9 +25,11 @@
 redirected, or page url.
 
 @requires: logging
+@requires: socket
 @requires: SocketServer.[ThreadingTCPServer|BaseServer]
 @requires: SimpleHTTPServer.SimpleHTTPRequestHandler
 @requires: aptzeroconf.config.[config|cache]
+@requires: aptzeroconf.exceptions.AlreadyRunningError
 @requires: socket
 @requires: urllib2.HTTPError
 """
@@ -37,6 +39,7 @@
 from SocketServer import ThreadingTCPServer, BaseServer
 from SimpleHTTPServer import SimpleHTTPRequestHandler
 from aptzeroconf.config import config, cache
+from aptzeroconf.exceptions import AlreadyRunningError
 
 
 class HttpServer(ThreadingTCPServer):
@@ -45,11 +48,18 @@
     """
 
     def __init__(self):
-        BaseServer.__init__(self, ('', config['http_port']), AZCHTTPHandler)
-        self.socket = socket.socket(socket.AF_INET6, self.socket_type)
-        self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        self.server_bind()
-        self.server_activate()
+        try:
+            BaseServer.__init__(self, ('', config['http_port']),
+                AZCHTTPHandler)
+            self.socket = socket.socket(socket.AF_INET6, self.socket_type)
+            self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+            self.server_bind()
+            self.server_activate()
+        except socket.error as error:
+            if error.args and error.args[0] == 98:
+                # Address already in use
+                raise AlreadyRunningError
+            raise
 
 
 def trap_socketerror(method):
@@ -145,7 +155,7 @@
     @trap_socketerror
     def do_GET(self):
         self._do_GET()
-    
+
     def _do_GET(self):
         """
         Respond to a GET request by proxy the url to preferably local content,
@@ -186,7 +196,7 @@
                 if os.path.isfile("pages/" + filename):
                     page = "pages/" + filename
                 else:
-                    page = "/usr/share/pages/" + filename
+                    page = "/usr/share/apt-zeroconf/pages/" + filename
                 return open(page, "r")
 
             httpCode = 200 #: Default HTTP Error code set
 
=== modified file 'aptzeroconf/parse.py'
--- aptzeroconf/parse.py	2009-08-09 02:39:51 +0000
+++ aptzeroconf/parse.py	2010-02-01 20:58:13 +0000
@@ -21,116 +21,72 @@
 from xml.sax import parseString, ContentHandler
 #from xml.sax.handler import feature_namespaces
 from xml.sax._exceptions import SAXParseException
+from apt_pkg import VersionCompare
 import logging
 import re
 
 __version__ = float(0.3)
 
 V2, V3 = 0.2, 0.3
-EPOCH_PATTERN = {
-    V2 : re.compile(r'\_\d+\%3a'),
-    V3 : re.compile(r'\_\d+\:')
-}
+EPOCH_PATTERN = re.compile(r'\_\d+\%3a')
+
 
 def normalize_whitespace(text):
     """Remove excessive whitespace in spaces."""
     return ' '.join(text.split())
 
-def _is_equal(pkg, find, ver):
+
+def _is_equal(pkg, find):
     """Are the packages equal disregarding the epoch?"""
-    return EPOCH_PATTERN[ver].sub('_', pkg) == find or pkg == find
-
-
-class _PackageList(list):
-    """
-    Found Package list container.
-    """
-
-    def found(self, item):
-        """
-        Callback to add a found package to contatiner
-
-        @param item: Package Name
-        @type item: basestring
-        """
-        self.append(item)
-
-    def __str__(self):
-        """
-        String representaion of found package container. Displays the best
-        package found in container if multiples were added.
-
-        @return: Best or only package
-        @rtype: basestring
-        """
-        from apt_pkg import VersionCompare
-        from urllib2 import quote
-        if len(self) > 1:
-            self.sort(cmp=VersionCompare)
-            return quote(self[-1])
-
-        elif len(self) == 1:
-            return quote(self[0])
-
-        else:
-            return ""
-
+    return EPOCH_PATTERN.sub('_', pkg) == find or pkg == find
+
+
+class Package(object):
+    """Represents a single package."""
+    def __init__(self, name=''):
+        self.name = name
     def __repr__(self):
-        return '<Package name="%s" count="%d">' % (str(self), len(self))
-
-
-class _PackageFinder(ContentHandler):
+        return '<Package name=' + self.name + '>'
+
+
+class _XMLDecoder(ContentHandler):
+    """Decodes an xml package list, calling a callback for each package."""
     callback = None #: Callback function to be set when item found
-    inPkgElemCnt = {}
 
-    def __init__(self, package):
+    def __init__(self):
         """
         Initialize sax content handler.
 
         @param search_name: Package to locate in search data.
         @type search_name: basestring
         """
-        self.packageSearch = normalize_whitespace(package)
-
-        self.inPkgName = False #: Initialize the content flag to False
-        self.inPkg = False #: Initialize the content flag to False
-        self.list_version = '' #: Initialize the version value to None
+        self.text = ''
+        self.package = None
+        self.list_version = ''
 
     def startElement(self, name, attrs):
         """
         Check start element tags for packagelist or name.
 
-        @param name: element tag.
-        @type name: basestring
-        @param name: element tag attrs.
-        @type name: basestring
+        @param name: element tag
+        @type name: basestring
+        @param name: element attributes
+        @type name: dict
         """
         if name == 'packagelist': #: handle element by getting ver. attribute
             self.list_version = normalize_whitespace(attrs.get('version', ""))
-
-        if float(self.list_version) == __version__:
-
-            if name == 'package':
-                self.inPkg = True
-                self.inPkgElemCnt = {'name': 0}
-
-            elif name == 'name': #: handle element by set flag, reset value
-                if self.inPkgElemCnt[name] > 1:
-                    raise SAXParseException
-
-                self.inPkgName = True
-                self.packageName = ""
-                self.inPkgElemCnt[name] += 1
+        if name == 'package':
+            self.package = Package()
+        self.text = ''
 
     def characters(self, char):
         """
-        Check characters for name value.
+        Add character input to text buffer.
 
         @param char: text chunk
         @type name: basestring
         """
-        if self.inPkgName:
-            self.packageName = self.packageName + char
+        self.text += char
 
     def endElement(self, name):
         """
@@ -140,70 +96,72 @@
         @param name: element tag.
         @type name: basestring
         """
-        if float(self.list_version) == __version__:
-            if name == 'package':
-                self.inPkgName = False
-            elif name == 'name':
-                self.inPkgName = False
-                self.packageName = normalize_whitespace(self.packageName)
-
-                #{ Check search_name for match with packagename
-                if _is_equal(self.packageName, self.packageSearch, V3):
-                    self.callback(self.packageName)
-
-
-def has_package(package, data):
+        if name == 'package':
+            self.callback(self.package)
+        elif name == 'name':
+            self.package.name = self.text
+
+
+def decode_list(data):
     """
-    Locate package in data string.
-
-    @param package: package name
-    @type package: basestring
-    @param data: xml package data
+    @param data: xml/raw package data
     @type data: basestring
-    @return: PkgList object
-    @rtype: object
+    @return: list of Packages
+    @rtype: list
     """
-    pkglist = _PackageList()
     if not data.startswith('<?xml'):
-        for name in data.split():
-            if _is_equal(name, package, V2):
-                pkglist.found(name)
-        return pkglist
+        data = data.split()
+        if data[0] == str(V2):
+            return [Package(name) for name in data[1:]]
 
-    handler = _PackageFinder(package)
-    handler.callback = pkglist.found
+    pkglist = []
+    handler = _XMLDecoder()
+    handler.callback = pkglist.append
 
     try:
         parseString(data, handler)
-
     except SAXParseException:
         #{ Non-conforming list
         logging.warning(
             '[PARSER] Parse Error, Ignoring: malformed package list.')
-        return _PackageList()
-
+        return []
     return pkglist
 
 
+def has_package(package, list):
+    """
+    Locate package (disregarding the epoch) in package list.
+
+    Returns the package name, including the epoch if there is one.
+
+    @param package: package name
+    @type package: basestring
+    @param data: list of Packages
+    @type data: list
+    @return: package name
+    @rtype: basestring
+    """
+    results = []
+    for pkg in list:
+        if _is_equal(pkg.name, package):
+            results.append(pkg.name)
+
+    results.sort(cmp=VersionCompare)
+    if results:
+        return results[-1]
+    else:
+        return ''
+
+
 def store_packages(url, port):
     """
     Fetch non-local AZC Cache service host cache listings.
-
-    @param url:
-    @type url:
     """
     from urllib2 import Request, urlopen
 
-    pkglist = urlopen(Request(url="http://%s:%d/list" % (url, port)))
-    pkgdata = pkglist.read(4)
-
-    if pkgdata[:3] == V2:
-        return pkglist.read()
-
-    elif pkgdata == '<?xm':
-        return pkgdata + pkglist.read()
-
-    return ''
+    pkglist = urlopen("http://%s:%d/list" % (url, port))
+    data = pkglist.read()
+    return decode_list(data)
 
 
 def make_packagelist(packages):
@@ -215,12 +173,10 @@
     @return: xml package data
     @rtype: basestring
     """
-    from urllib2 import unquote
-
     form = ("<?xml version='1.0' ?>\n"
         "<?xml-stylesheet href='list.xsl' type='text/xsl' ?>\n"
         "<packagelist version='%.1f'>\n" % __version__)
     for pkg in packages:
-        form += "  <package>\n    <name>%s</name>\n  </package>" % unquote(pkg)
+        form += "  <package>\n    <name>%s</name>\n  </package>" % pkg
     form += "</packagelist>\n"
     return form
 
=== modified file 'azc_daemon/__init__.py'
--- azc_daemon/__init__.py	2009-07-11 22:12:07 +0000
+++ azc_daemon/__init__.py	2010-02-01 20:58:13 +0000
@@ -23,6 +23,7 @@
 import os
 import time
 import atexit
+import resource
 from signal import SIGTERM
 
 
@@ -85,9 +86,21 @@
                 error.errno, error.strerror))
             sys.exit(1)
 
-        #{ redirect standard file descriptors
         sys.stdout.flush()
         sys.stderr.flush()
+
+        #{ close all file descriptors; without this dpkg-reconfigure gets mad
+        #{ code taken from http://code.activestate.com/recipes/278731/
+        maxfd = resource.getrlimit(resource.RLIMIT_NOFILE)[1]
+        if maxfd == resource.RLIM_INFINITY:
+            maxfd = 1024
+        for fd in xrange(0, maxfd):
+            try:
+                os.close(fd)
+            except OSError:
+                pass # fd wasn't open, ignore it
+
+        #{ redirect standard file descriptors
         si = file(self.stdin, 'r')
         so = file(self.stdout, 'a+')
         se = file(self.stderr, 'a+', 0)
 
=== renamed file 'debian/postinst' => 'debian/apt-zeroconf.postinst'
--- debian/postinst	2009-07-24 23:20:29 +0000
+++ debian/apt-zeroconf.postinst	2010-02-01 20:58:13 +0000
@@ -9,23 +9,18 @@
 
 case "$1" in
     configure)
+        db_input medium apt-zeroconf/activate || true
+        db_go
         db_get apt-zeroconf/activate
-        if [ "$RET" = true ]; then
+        if [ "$RET" = "false" ]; then
+            echo "ENABLED=0" > /etc/default/apt-zeroconf
+        else
             echo "ENABLED=1" > /etc/default/apt-zeroconf
-            ln -s /usr/share/apt-zeroconf/apt-zeroconf.apt.conf \
+            [ -L /etc/apt/apt.conf.d/10apt-zeroconf ] || \
+                    ln -s /usr/share/apt-zeroconf/apt-zeroconf.apt.conf \
                     /etc/apt/apt.conf.d/10apt-zeroconf || true
-        else
-            echo "ENABLED=0" > /etc/default/apt-zeroconf
         fi
     ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
 esac
 
 update-rc.d -f apt-zeroconf remove >/dev/null
 
=== modified file 'debian/changelog'
--- debian/changelog	2009-07-01 00:04:09 +0000
+++ debian/changelog	2010-02-01 20:58:13 +0000
@@ -1,3 +1,24 @@
+apt-zeroconf (0.5.0+20100131-0ubuntu1~ppa1) unstable; urgency=low
+
+  [ Josh Holland ]
+  * Moved packaging to use debhelper 7.
+
+  [ Siegfried-Angel Gevatter Pujals ]
+  * debian/
+    - Fix Python dependencies so this works on Debian.
+    - Other little changes.
+  * debian/templates, debian/apt-zeroconf.postinst:
+     - Give the debconf question priority "medium" and define a template for it.
+  * apt-zeroconf:
+     - Add installation directory to the path.
+  * aptzeroconf/__init__.py:
+     - Close open file descriptors after forking, without this
+       dpkg-reconfigure would hang forever.
+  * Replace manpage with a troff version, which doesn't need to
+    be generated.
+
+ -- Siegfried-Angel Gevatter Pujals <[e-mail]>  Sun, 31 Jan 2010 21:55:46 +0100
+
 apt-zeroconf (0.5.0-0ubuntu1~karmic~ppa1) karmic; urgency=low
 
   * Improve proxy server to include some test urls and improved pages.
 
=== modified file 'debian/control'
--- debian/control	2009-07-24 23:20:29 +0000
+++ debian/control	2010-02-01 20:58:13 +0000
@@ -1,30 +1,44 @@
 Source: apt-zeroconf
 Section: admin
-Priority: extra
+Priority: optional
 Maintainer: Apt-ZeroConf Launchpad Team <[e-mail]>
-Uploaders: Jeremy Austin-Bardo <[e-mail]>, Martin-Éric Racine <[e-mail]>
+Uploaders: Jeremy Austin-Bardo <[e-mail]>,
+ Martin-Éric Racine <[e-mail]>,
+ Siegfried-Angel Gevatter Pujals <[e-mail]>
 Homepage: https://launchpad.net/apt-zeroconf
-Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5.0.37.2), python-central (>= 0.6), python-dev (>= 2.6)
-Build-Depends-Indep: dpkg (>= 1.14.6), po-debconf
-Standards-Version: 3.8.0
-Vcs-Bzr: https://code.launchpad.net/~apt-zeroconf/apt-zeroconf/r0.5
-XS-Python-Version: >=2.6
+Build-Depends: cdbs (>= 0.4.49),
+ debhelper (>= 7),
+ python-support (>= 0.6),
+ python2.6-dev,
+ dpkg (>= 1.14.6),
+ po-debconf
+Standards-Version: 3.8.3
+Vcs-Bzr: https://code.launchpad.net/~apt-zeroconf/apt-zeroconf/trunk
+Vcs-Browser: https://code.launchpad.net/~apt-zeroconf/apt-zeroconf/trunk
+XS-Python-Version: >= 2.6
 
 Package: apt-zeroconf
 Architecture: all
-Depends:  python-apt, python-avahi, python-dbus, debconf, python-azc-daemon, 
- ${python:Depends}, ${misc:Depends}
+Depends: ${python:Depends},
+ ${misc:Depends},
+ python-apt,
+ python-avahi,
+ python-dbus,
+ debconf,
+ python-azc-daemon,
+ lsb-base (>= 3.0-6)
 XB-Python-Version: ${python:Versions}
 Description: Caching peer-to-peer apt proxy for local networks
  Apt-zeroconf is an extension to apt which enables it to find other
- instances on the LAN in order to exchange debian package files and not to 
+ instances on the LAN in order to exchange Debian package files and not to 
  fetch them from the internet.
 
 Package: python-azc-daemon
 Architecture: all
 XB-Python-Version: ${python:Versions}
-Depends:  ${python:Depends}, ${misc:Depends}
-Description: AZC daemon library.
- Daemon library to allow python code to run in the background. Based on code  
- found at 
+Depends: ${python:Depends},
+ ${misc:Depends}
+Description: apt-zeroconf daemon library
+ Daemon library to allow Python code to run in the background. Based upon code  
+ found at:
  http://www.jejik.com/articles/2007/02/a_simple_unix_linux_daemon_in_python/
 
=== modified file 'debian/init'
--- debian/init	2009-08-14 22:08:19 +0000
+++ debian/init	2010-02-01 20:58:13 +0000
@@ -4,20 +4,18 @@
 # Required-Start:    $local_fs dbus avahi
 # Required-Stop:     $local_fs dbus avahi
 # Default-Start:     2 3 4 5
-# Default-Stop:      S 0 1 6
+# Default-Stop:      0 1 6
 # Short-Description: apt-zeroconf peer-to-peer apt proxy
 # Description:       apt-zeroconf is a caching peer-to-peer proxy for
 #                    local networks
 ### END INIT INFO
 
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-#PYTHONPATH=/usr/share/pyshared #<== Not sure of this... anyone??? -- ausimage
-DAEMON=/usr/bin/apt-zeroconf
-#DAEMON_OPTS_START="-d start"
-#DAEMON_OPTS_STOP="-d stop"
-#DAEMON_OPTS_RESTART="-d restart"
+PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:/usr/local/sbin
 NAME=apt-zeroconf
 DESC="apt-zeroconf APT proxy"
+DAEMON=/usr/bin/apt-zeroconf
+PIDFILE=/var/run/$NAME.pid
+STATUSCODE=0
 
 test -x $DAEMON || exit 0
 
@@ -25,40 +23,36 @@
 
 . /lib/lsb/init-functions
 
-#start_azc() {
-#        start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
-#                --startas $DAEMON -- $DAEMON_OPTS
-#}
-
-#stop_azc() {
-#        start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid
-#        rm -f /var/run/$NAME.pid
-#}
-
 case "$1" in
     start)
         if [ "$ENABLED" != 1 ]; then
             log_begin_msg "Starting $DESC (not enabled)"
         else
             log_begin_msg "Starting $DESC"
-            #start_azc
-            $DAEMON -d start
+            if [ -f "$PIDFILE" ]; then
+                STATUSCODE=1 # already running
+            else
+                $DAEMON -d start
+                STATUSCODE=$?
+                if [ $STATUSCODE -eq 42 ]; then
+                    STATUSCODE=1 # already running
+                elif [ $STATUSCODE -ne 0 ]; then
+                    STATUSCODE=2 # error
+                fi
+            fi
         fi
-        log_end_msg 0
+        log_end_msg $STATUSCODE
         ;;
     stop)
         log_begin_msg "Stopping $DESC"
-        #stop_azc
-        $DAEMON -d stop
-        log_end_msg 0
+        $DAEMON -d stop >/dev/null 2>&1
+        log_end_msg 0 # else dpkg-reconfigure fails
         ;;
   restart|force-reload)
         log_begin_msg "Restarting $DESC"
-        #stop_azc
-        #sleep 1
-        #start_azc
-        $DAEMON -d restart
-        log_end_msg 0
+        $DAEMON -d restart >/dev/null 2>&1
+        STATUSCODE=$?
+        log_end_msg $STATUSCODE
         ;;
   *)
         echo "Usage: $0 {start|stop|restart|force-reload}" >&2
@@ -66,4 +60,4 @@
         ;;
 esac
 
-exit 0
+exit $STATUSCODE
 
=== modified file 'debian/rules'
--- debian/rules	2009-05-06 04:18:16 +0000
+++ debian/rules	2010-02-01 20:58:13 +0000
@@ -1,7 +1,3 @@
 #!/usr/bin/make -f
-
-DEB_UPDATE_RCD_PARAMS=defaults 25
-DEB_PYTHON_SYSTEM=pycentral
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
+%:
+	dh $@
 
=== added file 'debian/templates'
--- debian/templates	1970-01-01 00:00:00 +0000
+++ debian/templates	2010-02-01 20:58:13 +0000
@@ -0,0 +1,4 @@
+Template: apt-zeroconf/activate
+Type: boolean
+Default: true
+Description: Do you want to apt-zeroconf to start automatically at boot?
 
=== modified file 'setup.py'
--- setup.py	2009-08-14 22:08:19 +0000
+++ setup.py	2010-02-01 20:58:13 +0000
@@ -1,7 +1,11 @@
 #!/usr/bin/env python
+import os
+
 from distutils.core import setup
+from distutils.command.build import build
 
-setup(name='apt-zeroconf',
+setup(
+    name='apt-zeroconf',
     version='0.6.x~bzr',
     author='Apt-Zeroconf Launchpad Team',
     author_email='[e-mail]',
@@ -18,18 +22,19 @@
     packages=['aptzeroconf', 'azc_daemon'],
     scripts=['apt-zeroconf'],
     data_files=[
-        ('/usr/share/apt-zeroconf', ['support/apt-zeroconf.apt.conf', ]),
-        ('/usr/share/apt-zeroconf/pages', [
+        ('share/apt-zeroconf', ['support/apt-zeroconf.apt.conf', ]),
+        ('share/apt-zeroconf/pages', [
             'pages/aptzeroconf.css', 'pages/host.html', 'pages/index.html',
             'pages/listupdate.html', 'pages/list.xsl', 'pages/aptzeroconf.png',
             'pages/stats.html', ]),
-        ('/usr/share/apt-zeroconf/tests', [
+        ('share/apt-zeroconf/tests', [
             'test/common.py', 'test/__init__.py', 'test/pep8.py',
             'test/test_auth.py', 'test/test_general.py',
             'test/test_sourcecode.py', ]),
         ('/etc/', ['support/apt-zeroconf.conf']),
         ('/etc/ufw/applications.d/', ['support/azc_rule']),
-        ('/usr/share/man/man1', ['support/apt-zeroconf.1.gz', ]), ],
+        ('share/man/man1', ['support/apt-zeroconf.1', ]),
+        ],
     keywords="zeroconf, apt, cache, pacakage, proxy, adhoc",
     platforms="Ubuntu 9.04 and 9.10 (others may work as well)",
     classifiers=[
 
=== added file 'support/apt-zeroconf.1'
--- support/apt-zeroconf.1	1970-01-01 00:00:00 +0000
+++ support/apt-zeroconf.1	2010-02-01 20:58:13 +0000
@@ -0,0 +1,65 @@
+.TH APT\-ZEROCONF 1 "January 31, 2010" "Apt-ZeroConf"
+
+.SH NAME
+apt\-zeroconf \- write summary here...
+
+.SH SYNOPSIS
+\fBapt\-zeroconf\fP \fI[OPTION]\fP
+
+.SH DESCRIPTION
+\fBapt\-zeroconf\fP creates an adhoc network on your local network to provide
+apt repository packages. Allowing you download once, then retrieve locally for
+all other computers on your network.
+
+.SH OPTIONS
+The program follows the usual GNU command line syntax, with
+options starting with two dashes (`--'). A summary of options is
+included below.
+.TP
+.B \-p, \-\-port
+Start \fBapt\-zeroconf\fP at the given port.
+.TP
+.B \-r, \-\-restrict
+Overrides the option in \fBapt\-zeroconf\fP's configuration file, on whether
+to restrict the proxy to only operate for the URLs specified under the
+[apt-cache] section.
+.TP
+.B \-d, \-\-daemon=start|stop|restart
+Start \fBapt\-zeroconf\fP as a background process, stop an already running
+instance or restart an already running instance.
+.TP
+.B -l, \-\-logger=debug|info|warning|error|critical
+Change the verbosity of the log output.
+
+.SH EXIT VALUES
+.TP
+.B 0
+Success.
+.TP
+.B 2
+Incorrect parameter or another user error.
+.TP
+.B 42
+Another instance of \fBapt\-zeroconf\fP is already running or there's
+another service using the same port.
+
+.SH BUGS
+Please report any bugs at https://bugs.launchpad.net/apt-zeroconf.
+
+.SH AUTHORS
+Please see the AUTHORS file bundled with this application for
+a complete list of contributors.
+
+.SH LICENSE
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+.PP
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+.PP
+You should have received a copy of the GNU Lesser General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
=== removed file 'support/apt-zeroconf.xml'
--- support/apt-zeroconf.xml	2009-07-04 03:53:33 +0000
+++ support/apt-zeroconf.xml	1970-01-01 00:00:00 +0000
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-<!-- See http://www.docbook.org/tdg/en/html/refentry.html for more info 
-    Use docbook2x-man to generate manpage.                       -->
-<refentry id="application.soovee">
-  <refentryinfo>
-    <author>Apt-ZeroConf Launchpad Team</author>
-    <address></address>
-
-    <copyright><year>2009</year><holder>Jeremy Austin-Bardo</holder></copyright>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>apt-zeroconf</refentrytitle><manvolnum>1</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>apt-zeroconf</refname>
-    <refpurpose>Create an adhoc network on your local network to provide
-    Internet apt repository packages. Allowing you download once, then retrieve
-    locally for all other computers on your network.
-    </refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>apt-zeroconf</command>
-        <arg choice="opt">
-          <option>-p</option><option>--port</option> Number
-        </arg>
-        <arg choice="opt">
-            <option>-r</option><option>--restrict</option>
-        </arg>
-        <arg choice="opt">
-          <option>-d</option><option>--daemon</option>
-          <arg choice="req">start stop restart</arg>
-        </arg>
-        <arg choice="opt">
-                <option>-r</option><option>--restrict</option>
-            </arg>
-                <arg choice="opt">
-          <option>-l</option><option>--logger</option>
-          <arg choice="req">debug info warning error critical</arg>
-        </arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>Description</title>
-
-    <para><command>apt-zeroconf</command> </para>
-  </refsect1>
-
-  <refsect1>
-    <title>Command Arguments</title>
-
-    <variablelist>
-      <varlistentry>
-        <term>
-          <option>--port</option><option>-p</option>
-        </term>
-        <listitem>
-          <para>Override configuration file port designation for 
-          <option>Number</option></para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>-r</option><option>--restrict</option>
-        </term>
-        <listitem>
-          <para>Override configuration file proxy restriction to enable only
-          designated urls in [apt-cache] section.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term> 
-          <option>-d</option><option>--daemon</option>
-        </term>
-        <listitem>
-          <para>Daemonize apt-zeroconf process to run as a background process.
-          Daemons value should be <option>debug</option>, <option>info</option>,
-          <option>warning</option>, <option>error</option>, or 
-          <option>critical</option>. Should be run with sudo priviledges to 
-          enable logging functionality.
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term> 
-          <option>-l</option><option>--logger</option>
-        </term>
-        <listitem>
-          <para>Set logger logging level for apt-zeroconf to one of the 
-          following <option>info</option>, <option>warning</option>, 
-          <option>error</option>, or <option>critical</option>. Without setting
-          this switch the default will be <option>info</option>.
-          </para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-
-  <refsect1>
-    <title>See Also</title>
-
-  </refsect1>
-
-  <refsect1>
-    <title>Author</title>
-    <para>Apt-ZeroConf Launchpad Team</para>
-    <para>Permission is hereby granted to copy, distribute and/or modify this
-    document under the terms of the GNU General Public License, Version 2 or
-    later by the Free Software Foundation.</para>
-  </refsect1>
-</refentry>
 
=== modified file 'support/azc_rule'
--- support/azc_rule	2009-07-13 23:48:19 +0000
+++ support/azc_rule	2010-02-01 20:58:13 +0000
@@ -1,4 +1,4 @@
 [AptZeroConf]
-title= Apt-ZeroConf
+title=Apt-ZeroConf
 description=Personal Package Cache using Avahi ZeroConf.
 ports=1618/tcp
 
=== removed file 'support/build.sh'
--- support/build.sh	2009-06-30 21:20:54 +0000
+++ support/build.sh	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-#!/bin/sh
-echo "building..."
-for file in `ls *.xml`; do docbook2x-man $file; done
-echo "compressing..."
-for file in `ls *.1`; do gzip $file; done
 
=== modified file 'test/test_general.py'
--- test/test_general.py	2009-08-09 03:57:29 +0000
+++ test/test_general.py	2010-02-01 20:58:13 +0000
@@ -122,8 +122,7 @@
                 PORT, DEBNAME)).read()
     # make sure the data is equal
     assert data == '*contents*'
-
-
+    
 def test_download_epoch_local_server(tmpdir):
     """
     Test fetching a file with an epoch from an AZC instance on the local network.