--- a/bin/pvl.verkko-dhcp	Tue Feb 19 21:28:57 2013 +0200
+++ b/bin/pvl.verkko-dhcp	Tue Feb 19 21:31:56 2013 +0200
@@ -2,12 +2,12 @@
 
 from werkzeug.serving import run_simple
 
-from pvl import __version__
 import pvl.args
 import pvl.web.args
 import pvl.verkko
 import pvl.verkko.dhcp
 
+from pvl.verkko import __version__
 import optparse
 import logging; log = logging.getLogger('main')
 

--- a/bin/pvl.verkko-rrd	Tue Feb 19 21:28:57 2013 +0200
+++ b/bin/pvl.verkko-rrd	Tue Feb 19 21:31:56 2013 +0200
@@ -6,12 +6,12 @@
 
 import werkzeug.serving 
 
-from pvl import __version__
 import pvl.args
 import pvl.rrd.args
 import pvl.web.args
 import pvl.verkko.rrd
 
+from pvl.verkko import __version__
 import optparse
 import logging; log = logging.getLogger('main')
 

--- a/pvl/__init__.py	Tue Feb 19 21:28:57 2013 +0200
+++ b/pvl/__init__.py	Tue Feb 19 21:31:56 2013 +0200
@@ -1,7 +1,3 @@
-# Namespace package
-# http://docs.python.org/library/pkgutil.html#pkgutil.extend_path
-
-from pkgutil import extend_path
-
-# magic to support further pvl.foo packages
-__path__ == extend_path(__path__, __name__)
+## Namespace package
+# http://pythonhosted.org/distribute/setuptools.html#namespace-packages
+__import__('pkg_resources').declare_namespace(__name__)

--- a/pvl/verkko/__init__.py	Tue Feb 19 21:28:57 2013 +0200
+++ b/pvl/verkko/__init__.py	Tue Feb 19 21:31:56 2013 +0200
@@ -2,3 +2,4 @@
 from pvl.verkko import db
 from pvl.verkko.db import Database
 
+__version__ = '0.5.0-dev1'

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/setup.py	Tue Feb 19 21:31:56 2013 +0200
@@ -0,0 +1,53 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+from pvl.verkko import __version__
+
+from distutils.core import setup
+from glob import glob
+
+setup(
+    name            = 'pvl-verkko',
+    version         = __version__,
+    description     = "verkko.paivola.fi WSGI",
+    url             = 'http://verkko.paivola.fi/hg/pvl-verkko',
+
+    author          = "Tero Marttila",
+    author_email    = "terom@paivola.fi",
+    
+    # deps
+    install_requires    = [
+        # pvl.args
+        # pvl.invoke
+        'pvl-common',
+    ],
+    
+    # lib
+    namespace_packages = [ 'pvl' ],
+    py_modules = [
+
+    ],
+    packages    = [
+        'pvl.web',
+        'pvl.dhcp',
+        'pvl.rrd',
+        'pvl.verkko',
+    ],
+    
+    # bin
+    scripts     =  [
+        'bin/pvl.dhcp-leases',
+        'bin/pvl.syslog-dhcp',
+        'bin/pvl.verkko-dhcp',
+        'bin/pvl.verkko-rrd',
+        'bin/pvl.verkko-rrd-interfaces',
+    ],
+    
+    # etc, static
+    data_files  = [
+        ( 'etc/pvl/verkko', [  ] ),
+        ( 'share/pvl/verkko/static/dhcp',   glob('static/dhcp/*.css') + glob('static/dhcp/*.js')),
+        ( 'share/pvl/verkko/static/rrd',    glob('static/rrd/*.css') + glob('static/rrd/*.js')),
+    ],
+)
+

--- a/setup_verkko.py	Tue Feb 19 21:28:57 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-#!/usr/bin/env python
-# encoding: utf-8
-
-__version__ = '0.4.1'
-
-from distutils.core import setup
-from glob import glob
-
-setup(
-    name            = 'pvl-verkko',
-    version         = __version__,
-    description     = "verkko.paivola.fi WSGI",
-
-    author          = "Tero Marttila",
-    author_email    = "terom@paivola.fi",
-    
-    # XXX:?
-    #namespace_packages = [ 'pvl' ],
-    packages    = [
-        'pvl', # XXX
-        'pvl.syslog',
-        'pvl.dhcp',
-        'pvl.rrd',
-        'pvl.web',
-        'pvl.verkko',
-    ],
-
-    scripts     =  [
-        'bin/pvl.dhcp-leases',
-        'bin/pvl.syslog-dhcp',
-        'bin/pvl.verkko-dhcp',
-        'bin/pvl.verkko-rrd',
-        'bin/pvl.verkko-rrd-interfaces',
-    ],
-
-    data_files  = [
-        ( 'etc/pvl/verkko', [  ] ),
-        ( 'share/pvl/verkko/static/dhcp',   glob('static/dhcp/*.css') + glob('static/dhcp/*.js')),
-        ( 'share/pvl/verkko/static/rrd',    glob('static/rrd/*.css') + glob('static/rrd/*.js')),
-    ],
-)
-