From fa1abaad08d7e19bad1d8cf4755be5637107645e Mon Sep 17 00:00:00 2001
From: jdh2358 <>
Date: Wed, 11 Apr 2007 14:29:25 +0000
Subject: [PATCH] Fix setup.py for new package structure.

---
 MANIFEST.in           |  1 +
 pyreadline/release.py |  2 +-
 setup.py              | 14 +++++++++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 MANIFEST.in

diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..8a8360f
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1 @@
+include pyreadline/configuration/pyreadlineconfig.ini
diff --git a/pyreadline/release.py b/pyreadline/release.py
index f3c7026..c099c1c 100644
--- a/pyreadline/release.py
+++ b/pyreadline/release.py
@@ -22,7 +22,7 @@ name = 'pyreadline'
 
 branch = 'refactor'
 
-version = '1.4.svn'
+version = '1.4'
 
 revision = '$Revision$'
 
diff --git a/setup.py b/setup.py
index e667309..065e60c 100644
--- a/setup.py
+++ b/setup.py
@@ -8,10 +8,22 @@
 #  the file COPYING, distributed as part of this software.
 #*****************************************************************************
 
+import os
 import glob
+
+# BEFORE importing distutils, remove MANIFEST. distutils doesn't properly
+# update it when the contents of directories change.
+if os.path.exists('MANIFEST'): os.remove('MANIFEST')
+#
+
 from distutils.core import setup
 execfile('pyreadline/release.py')
 
+packages = ['pyreadline','pyreadline.clipboard','pyreadline.configuration',
+            'pyreadline.console','pyreadline.keysyms','pyreadline.lineeditor',
+            'pyreadline.modes','pyreadline.test',
+            ]
+
 setup(name=name,
       version          = version,
       description      = description,
@@ -27,7 +39,7 @@ setup(name=name,
       platforms        = platforms,
       keywords         = keywords,
       py_modules       = ['readline'],
-      packages         = ['pyreadline'],
+      packages         = packages,
       package_data     = {'pyreadline':['configuration/*']},
       data_files       = [('share/doc/pyreadline', glob.glob("doc/*")),
                          ]