[cig-commits] r5467 - in cs/merlin/branches/v1: . merlin.egg-info

[leif at geodynamics.org]

Author: leif
Date: 2006-12-05 15:04:15 -0800 (Tue, 05 Dec 2006)
New Revision: 5467

Modified:
   cs/merlin/branches/v1/PKG-INFO
   cs/merlin/branches/v1/merlin.egg-info/PKG-INFO
   cs/merlin/branches/v1/setup.py
Log:
Released Merlin v1.0 and updated PyPI page.


Modified: cs/merlin/branches/v1/PKG-INFO
===================================================================
--- cs/merlin/branches/v1/PKG-INFO	2006-12-05 22:33:44 UTC (rev 5466)
+++ cs/merlin/branches/v1/PKG-INFO	2006-12-05 23:04:15 UTC (rev 5467)
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: merlin
-Version: 1.0b1
+Version: 1.0
 Summary: A custom version of Phillip J. Eby's setuptools.
 Home-page: http://www.geodynamics.org/cig/software/packages/pythia/
 Author: Leif Strand

Modified: cs/merlin/branches/v1/merlin.egg-info/PKG-INFO
===================================================================
--- cs/merlin/branches/v1/merlin.egg-info/PKG-INFO	2006-12-05 22:33:44 UTC (rev 5466)
+++ cs/merlin/branches/v1/merlin.egg-info/PKG-INFO	2006-12-05 23:04:15 UTC (rev 5467)
@@ -2,7 +2,7 @@
 Name: merlin
 Version: 1.0
 Summary: A custom version of Phillip J. Eby's setuptools.
-Home-page: http://www.geodynamics.org/cig/software/packages/pythia/
+Home-page: http://www.geodynamics.org/cig/software/packages/cs/pythia/
 Author: Leif Strand
 Author-email: leif at geodynamics.org
 License: PSF or ZPL

Modified: cs/merlin/branches/v1/setup.py
===================================================================
--- cs/merlin/branches/v1/setup.py	2006-12-05 22:33:44 UTC (rev 5466)
+++ cs/merlin/branches/v1/setup.py	2006-12-05 23:04:15 UTC (rev 5467)
@@ -32,7 +32,7 @@
     author_email = 'leif at geodynamics.org',
     license="PSF or ZPL",
     #long_description = get_description(),
-    url = 'http://www.geodynamics.org/cig/software/packages/pythia/',
+    url = 'http://www.geodynamics.org/cig/software/packages/cs/pythia/',
     test_suite = 'merlin.tests',
     packages = find_packages(),
     package_data = {'merlin':['*.exe', '*.cfg']},