# HG changeset patch
# User Ben Croston <ben@croston.org>
# Date 1314740822 -3600
# Node ID 317e6f82c73347b45d5ad171688a3ad656609a16
# Parent  6a61cfdf69309b63ecd3e71972dfab06f9001511
-

diff -r 6a61cfdf6930 -r 317e6f82c733 .hgignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Tue Aug 30 22:47:02 2011 +0100
@@ -0,0 +1,7 @@
+syntax: glob
+*.pyc
+*.*~
+dist/*
+build/*
+distribute*
+*egg-info/*
diff -r 6a61cfdf6930 -r 317e6f82c733 setup.py
--- a/setup.py	Tue Aug 30 22:19:48 2011 +0100
+++ b/setup.py	Tue Aug 30 22:47:02 2011 +0100
@@ -2,6 +2,7 @@
 import distribute_setup
 distribute_setup.use_setuptools()
 from setuptools import setup, find_packages
+import platform
 
 classifiers = ['Development Status :: 3 - Alpha',
                'Operating System :: Microsoft :: Windows',
@@ -14,14 +15,13 @@
                'Topic :: Internet :: WWW/HTTP :: WSGI :: Middleware',
                'Topic :: Internet :: WWW/HTTP :: HTTP Servers']
 
-import platform
 if platform.python_version().startswith('2'):
     # python 2.x
-    packages = ['wibble.client','wibble.server']
+    packages = find_packages()
     install_requires = ['webob>=1.0.0']
 else:
     # assume python 3.x
-    packages = ['wibble.client']
+    packages = find_packages(exclude=['wibble.server'])
     install_requires = []
 
 setup(name             = 'Wibble',