Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

4 files changed, 37 insertions, 19 deletions

diff --git a/README b/README
index 082ab2a7..0aba179b 100644
--- a/README
+++ b/README
@@ -33,6 +33,10 @@ hang out, see `our Join page <http://mediagoblin.org/join/>`_
 Where is the documentation?
 ===========================
 
-Documentation is located in the ``docs/`` directory in a "raw"
-restructured-text form.  It is also available at
-http://docs.mediagoblin.org/ in HTML form.
+The beginnings of a user manual is located in the ``docs/`` directory
+in HTML, Texinfo, and source (Restructured Text) forms.  It's also
+available online at http://docs.mediagoblin.org/ in HTML form.
+
+Contributor/developer documentation as well as documentation on the
+project processes and infrastructure is located on 
+`the wiki <http://wiki.mediagoblin.org/>`_.
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 5861a463..e2f327c9 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -48,9 +48,9 @@ copyright = u'2011, Free Software Foundation, Inc and contributors'
 # built documents.
 #
 # The short X.Y version.
-version = '0.0.3'
+version = '0.0.4'
 # The full version, including alpha/beta/rc tags.
-release = '0.0.3'
+release = '0.0.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/maketarball.sh b/maketarball.sh
index 6bfaf920..5f17e578 100755
--- a/maketarball.sh
+++ b/maketarball.sh
@@ -154,10 +154,13 @@ then
         mv docs/build/texinfo/ docs/texinfo/
 
         rm -rf docs/build/
+        rm -rf docs/source/mgext/*.pyc
     else
+        # this is the old directory structure pre-0.0.4
         mv docs/_build/html/ docs/html/
 
         rm -rf docs/_build/
+        rm -rf docs/mgext/*.pyc
     fi
 
     popd
diff --git a/setup.py b/setup.py
index 799f00d8..3508f5f0 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@ from setuptools import setup, find_packages
 
 setup(
     name = "mediagoblin",
-    version = "0.0.3",
+    version = "0.0.4",
     packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
     zip_safe=False,
     # scripts and dependencies
@@ -49,21 +49,32 @@ setup(
         # 'lxml',
         ],
     test_suite='nose.collector',
-
-    license = 'AGPLv3',
-    author = 'Free Software Foundation and contributors',
-    author_email = 'cwebber@gnu.org',
     entry_points = """\
-      [console_scripts]
-      gmg = mediagoblin.gmg_commands:main_cli
+        [console_scripts]
+        gmg = mediagoblin.gmg_commands:main_cli
 
-      [paste.app_factory]
-      app = mediagoblin.app:paste_app_factory
+        [paste.app_factory]
+        app = mediagoblin.app:paste_app_factory
 
-      [zc.buildout]
-      make_user_dev_dirs = mediagoblin.buildout_recipes:MakeUserDevDirs
+        [zc.buildout]
+        make_user_dev_dirs = mediagoblin.buildout_recipes:MakeUserDevDirs
 
-      [babel.extractors]
-      jinja2 = jinja2.ext:babel_extract
-      """,
+        [babel.extractors]
+        jinja2 = jinja2.ext:babel_extract
+        """,
+ 
+    license='AGPLv3',
+    author='Free Software Foundation and contributors',
+    author_email='cwebber@gnu.org',
+    url="http://mediagoblin.org/",
+    download_url="http://mediagoblin.org/download/",
+    long_description=open('README').read(),
+    classifiers=[
+        "Development Status :: 3 - Alpha",
+        "Environment :: Web Environment",
+        "License :: OSI Approved :: GNU Affero General Public License",
+        "Operating System :: OS Independent",
+        "Programming Language :: Python",
+        "Topic :: Internet :: WWW/HTTP :: Dynamic Content"
+        ],
     )