Updated setup.py and MANIFEST for recent package refactor.

3 files changed, 8 insertions, 25 deletions

diff --git a/MANIFEST b/MANIFEST
deleted file mode 100644
index 028b0e7..0000000
--- a/MANIFEST
+++ /dev/null
@@ -1,21 +0,0 @@
-markdown.py
-markdown_extensions/__init__.py
-markdown_extensions/codehilite.py
-markdown_extensions/fenced_code.py
-markdown_extensions/footnotes.py
-markdown_extensions/headerid.py
-markdown_extensions/imagelinks.py
-markdown_extensions/meta.py
-markdown_extensions/rss.py
-markdown_extensions/tables.py
-markdown_extensions/wikilink.py
-setup.py
-scripts/pymarkdown.py
-docs/README
-docs/README.html
-docs/CHANGE_LOG
-docs/INSTALL
-docs/AUTHORS
-docs/LICENSE
-docs/writing_extensions.txt
-
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..b2e49da
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,5 @@
+include markdown.py
+recursive-include markdown *.py
+include docs/*
+include setup.py
+include MANIFEST
diff --git a/setup.py b/setup.py
index bf30c9a..7320727 100755
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ from distutils.core import setup
 
 setup(
     name = 'Markdown',
-    version = '2.0-beta',
+    version = '2.0-beta-2',
     description = "Python implementation of Markdown.",
     author = "Manfred Stienstra and Yuri takhteyev",
     author_email = "yuri [at] freewisdom.org",
@@ -12,7 +12,6 @@ setup(
     maintainer_email = "waylan [at] gmail.com",
     url = "http://www.freewisdom.org/projects/python-markdown",
     license = "BSD License, GNU Public License (GPL)",
-    py_modules = ["markdown"],
-    packages = ['markdown_extensions'],
-    scripts = ['scripts/pymarkdown.py'],
+    packages = ['markdown', 'markdown.extensions'],
+    scripts = ['markdown.py'],
     )