Moving setup.py.in back to setup.py

diff --git a/configure.ac b/configure.ac
index 3a6a802fb7d3b47e84fe709c33d1917b6ddcaa03..e56a55a544d9a0e61cf6ffad7742cbb802efa39a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -197,6 +197,6 @@ dnl Finish #
 dnl#########
 
 dnl Define the files to be configured
-AC_CONFIG_FILES([Makefile setup.py])
+AC_CONFIG_FILES([Makefile])
 dnl Generate config.status
 AC_OUTPUT

diff --git a/setup.py.in b/setup.py
similarity index 98%
rename from setup.py.in
rename to setup.py
index 10e650b56e8ee246bfccae4216aad6fde68864c6..6e026f30b6997257d931b9733ce8d0af4addde99 100644 (file)
--- a/setup.py.in
+++ b/setup.py
@@ -34,7 +34,7 @@ def get_version():
 
 
 setup(
-    name="@PACKAGE_NAME@",
+    name="mediagoblin",
     version=get_version(),
     packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
     zip_safe=False,
@@ -91,7 +91,7 @@ setup(
         """,
     license='AGPLv3',
     author='Free Software Foundation and contributors',
-    author_email='@PACKAGE_BUGREPORT@',
+    author_email='cwebber@gnu.org',
     url="http://mediagoblin.org/",
     download_url="http://mediagoblin.org/download/",
     long_description=open(READMEFILE).read(),