Index: Makefile
===================================================================
--- Makefile	(revision 15771)
+++ Makefile	(working copy)
@@ -58,15 +58,16 @@
 
 # When a version changes, the ARCHIVES lists below need to be updated.
 
-ifeq ($(OS),Linux)
-    READLINE   =
-    PYTHON     = $(CHANDLERARCHIVES)/python-$(SNAP)-2.5.1-$(BP)6.tar.gz
-    SETUPTOOLS = $(CHANDLERARCHIVES)/setuptools-$(SNAP)-0.6c6-$(BP)1.tar.gz
-    ICU        = $(CHANDLERARCHIVES)/icu-$(SNAP)-3.6-$(BP)1.tar.gz
-    OPENJDK    = $(CHANDLERARCHIVES)/openjdk-7-ea-j2re-b21-$(BP)2.tar.gz
-    OPENSSL    = $(CHANDLERARCHIVES)/openssl-$(SNAP)-0.9.8d-$(BP)2.tar.gz
-    DOCUTILS   = $(CHANDLERARCHIVES)/docutils-$(SNAP)-0.4-$(BP)1.tar.gz
+READLINE   = $(CHANDLERARCHIVES)/readline-$(SNAP)-5.2-$(BP)2.tar.gz
+PYTHON     = $(CHANDLERARCHIVES)/python-$(SNAP)-2.5.1-$(BP)8.tar.gz
+SETUPTOOLS = $(CHANDLERARCHIVES)/setuptools-$(SNAP)-0.6c6-$(BP)2.tar.gz
+ICU        = $(CHANDLERARCHIVES)/icu-$(SNAP)-3.6-$(BP)2.tar.gz
+OPENJDK    = $(CHANDLERARCHIVES)/openjdk-7-ea-j2re-b21-$(BP)3.tar.gz
+OPENSSL    = $(CHANDLERARCHIVES)/openssl-$(SNAP)-0.9.8d-$(BP)3.tar.gz
+DOCUTILS   = $(CHANDLERARCHIVES)/docutils-$(SNAP)-0.4-$(BP)2.tar.gz
 
+ifeq ($(OS),Linux)
+    READLINE     =
     ifeq ($(PLATFORM),linux/feisty)
         PYTHON   =
         ICU      =
@@ -82,63 +83,48 @@
 endif
 
 ifneq ($(findstring $(PLATFORM),macosx maciosx),)
-    PYTHON     = $(CHANDLERARCHIVES)/python-$(SNAP)-2.5.1-$(BP)6.tar.gz
-    SETUPTOOLS = $(CHANDLERARCHIVES)/setuptools-$(SNAP)-0.6c6-$(BP)1.tar.gz
-    DOCUTILS   = $(CHANDLERARCHIVES)/docutils-$(SNAP)-0.4-$(BP)1.tar.gz
-    OPENSSL    = $(CHANDLERARCHIVES)/openssl-$(SNAP)-0.9.8d-$(BP)2.tar.gz
     OPENJDK    =
-    READLINE   = $(CHANDLERARCHIVES)/readline-$(SNAP)-5.2-$(BP)1.tar.gz
-    ICU        = $(CHANDLERARCHIVES)/icu-$(SNAP)-3.6-$(BP)1.tar.gz
 endif
 
 ifeq ($(findstring 10.5,$(PLATFORM)),10.5)
     PYTHON     =
     SETUPTOOLS =
-    DOCUTILS   = $(CHANDLERARCHIVES)/docutils-$(SNAP)-0.4-$(BP)1.tar.gz
-    OPENSSL    = $(CHANDLERARCHIVES)/openssl-$(SNAP)-0.9.8d-$(BP)2.tar.gz
     OPENJDK    =
     READLINE   =
-    ICU        = $(CHANDLERARCHIVES)/icu-$(SNAP)-3.6-$(BP)1.tar.gz
 endif
 
 ifeq ($(PLATFORM),windows)
-    PYTHON     = $(CHANDLERARCHIVES)/python-$(SNAP)-2.5.1-$(BP)6.tar.gz
-    SETUPTOOLS = $(CHANDLERARCHIVES)/setuptools-$(SNAP)-0.6c6-$(BP)1.tar.gz
-    DOCUTILS   = $(CHANDLERARCHIVES)/docutils-$(SNAP)-0.4-$(BP)1.tar.gz
-    OPENSSL    = $(CHANDLERARCHIVES)/openssl-$(SNAP)-0.9.8d-$(BP)2.tar.gz
-    OPENJDK    = $(CHANDLERARCHIVES)/openjdk-7-ea-j2re-b21-$(BP)2.tar.gz
     READLINE   =
-    ICU        = $(CHANDLERARCHIVES)/icu-$(SNAP)-3.6-$(BP)1.tar.gz
 endif
 
 ARCHIVES = \
-    $(CHANDLERARCHIVES)/Launchers-$(SNAP)-0.9-$(BP)28.tar.gz \
-    $(CHANDLERARCHIVES)/chandlerdb-$(SNAP)-0.7-$(BP)28.tar.gz \
-    $(CHANDLERARCHIVES)/db-$(SNAP)-4.6.21-$(BP)1.tar.gz \
+    $(CHANDLERARCHIVES)/Launchers-$(SNAP)-0.9-$(BP)29.tar.gz \
+    $(CHANDLERARCHIVES)/chandlerdb-$(SNAP)-0.7-$(BP)29.tar.gz \
+    $(CHANDLERARCHIVES)/db-$(SNAP)-4.6.21-$(BP)2.tar.gz \
     $(READLINE) \
     $(PYTHON) \
     $(SETUPTOOLS) \
     $(ICU) \
     $(OPENSSL) \
     $(OPENJDK) \
-    $(CHANDLERARCHIVES)/m2crypto-$(SNAP)-0.18.2-$(BP)1.tar.gz \
-    $(CHANDLERARCHIVES)/pychecker-$(SNAP)-0.8.17-$(BP)1.tar.gz \
-    $(CHANDLERARCHIVES)/PyICU-$(SNAP)-0.6-81-$(BP)1.tar.gz \
-    $(CHANDLERARCHIVES)/PyLucene-$(SNAP)-2.2.0-1-359-$(BP)1.tar.gz \
-    $(CHANDLERARCHIVES)/twisted-$(SNAP)-r18795-$(BP)2.tar.gz \
-    $(CHANDLERARCHIVES)/wxPython-$(SNAP)-2.8.6.1-r198-$(BP)1.tar.gz \
-    $(CHANDLERARCHIVES)/dateutil-$(SNAP)-1.1-$(BP)5.tar.gz \
-    $(CHANDLERARCHIVES)/vobject-$(SNAP)-0.4.8-r186-$(BP)1.tar.gz \
-    $(CHANDLERARCHIVES)/zanshin-$(SNAP)-170-$(BP)1.tar.gz \
-    $(CHANDLERARCHIVES)/logilab-astng-$(SNAP)-0.17.0-$(BP)1.tar.gz \
-    $(CHANDLERARCHIVES)/logilab-common-$(SNAP)-0.21.2-$(BP)1.tar.gz \
-    $(CHANDLERARCHIVES)/pylint-$(SNAP)-0.13.1-$(BP)1.tar.gz \
-    $(CHANDLERARCHIVES)/parsedatetime-$(SNAP)-0.8.4-$(BP)1.tar.gz \
-    $(CHANDLERARCHIVES)/configobj-$(SNAP)-4.3.2-$(BP)1.tar.gz \
+    $(CHANDLERARCHIVES)/m2crypto-$(SNAP)-0.18.2-$(BP)2.tar.gz \
+    $(CHANDLERARCHIVES)/pychecker-$(SNAP)-0.8.17-$(BP)2.tar.gz \
+    $(CHANDLERARCHIVES)/PyICU-$(SNAP)-0.6-81-$(BP)2.tar.gz \
+    $(CHANDLERARCHIVES)/PyLucene-$(SNAP)-2.2.0-1-359-$(BP)2.tar.gz \
+    $(CHANDLERARCHIVES)/twisted-$(SNAP)-r18795-$(BP)3.tar.gz \
+    $(CHANDLERARCHIVES)/wxPython-$(SNAP)-2.8.6.1-r198-$(BP)2.tar.gz \
+    $(CHANDLERARCHIVES)/dateutil-$(SNAP)-1.1-$(BP)6.tar.gz \
+    $(CHANDLERARCHIVES)/vobject-$(SNAP)-0.4.8-r186-$(BP)2.tar.gz \
+    $(CHANDLERARCHIVES)/zanshin-$(SNAP)-170-$(BP)2.tar.gz \
+    $(CHANDLERARCHIVES)/logilab-astng-$(SNAP)-0.17.0-$(BP)2.tar.gz \
+    $(CHANDLERARCHIVES)/logilab-common-$(SNAP)-0.21.2-$(BP)2.tar.gz \
+    $(CHANDLERARCHIVES)/pylint-$(SNAP)-0.13.1-$(BP)2.tar.gz \
+    $(CHANDLERARCHIVES)/parsedatetime-$(SNAP)-0.8.4-$(BP)2.tar.gz \
+    $(CHANDLERARCHIVES)/configobj-$(SNAP)-4.3.2-$(BP)2.tar.gz \
     $(DOCUTILS) \
-    $(CHANDLERARCHIVES)/epydoc-$(SNAP)-3.0beta1-$(BP)1.tar.gz \
-    $(CHANDLERARCHIVES)/eggtranslations-$(SNAP)-1.1-r10-$(BP)1.tar.gz \
-    $(CHANDLERARCHIVES)/zope.interface-$(SNAP)-3.3.0b2-r71371-$(BP)3.tar.gz
+    $(CHANDLERARCHIVES)/epydoc-$(SNAP)-3.0beta1-$(BP)2.tar.gz \
+    $(CHANDLERARCHIVES)/eggtranslations-$(SNAP)-1.1-r10-$(BP)2.tar.gz \
+    $(CHANDLERARCHIVES)/zope.interface-$(SNAP)-3.3.0b2-r71371-$(BP)4.tar.gz
 
 ifeq ($(DEBUG),1)
     SNAP         = debug