Merge lp:~brian.curtin/ubuntuone-windows-installer/keyring-downgrade into lp:ubuntuone-windows-installer

[Brian Curtin]

- Revert to the patched keyring 0.7, and revive protobuf since the previous link died.

Revert to the patched keyring 0.7, and revive protobuf since the previous link died.

[dobey (dobey)]

review: Approve

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'scripts/devsetup/buildout.cfg'
--- scripts/devsetup/buildout.cfg	2013-04-12 21:10:13 +0000
+++ scripts/devsetup/buildout.cfg	2013-04-25 15:01:27 +0000
@@ -27,13 +27,13 @@
     https://github.com/ghtdak/qtreactor/tarball/master#egg=qt4reactor
     http://launchpad.net/python-distutils-extra/trunk/2.31/+download/python-distutils-extra-2.31.tar.gz#egg=python-distutils-extra
 # Mandel's patched keyring, already built
-    http://u1.to/~brian.curtin/X/keyring-1.2.2-py2.7.egg#egg=keyring
+    http://u1.to/~brian.curtin/0/keyring-0.7-py2.7.egg#egg=keyring
 # Pycrypto already built using python -c "import setuptools; execfile('setup.py')" bdist_egg
     http://u1.to/~brian.curtin/V/pycrypto-2.6-py2.7-win32.egg#egg=pycrypto
 # Py2exe already build using python -c "import setuptools; execfile('setup.py')" bdist_egg
     http://u1.to/ralsina/x/py2exe-0.6.9-py2.7-win32.egg#egg=py2exe
 # Protobuf's upstream zip file doesn't work via easy_install so using an egg.
-    http://u1.to/ralsina/G/protobuf-2.4.1-py2.7.egg#egg=protobuf
+    http://u1.to/~brian.curtin/3/protobuf-2.4.1-py2.7.egg#egg=protobuf
 # Comtypes has a bug in setup.py with Python 2.7, so this should be changed eventually
 # http://sourceforge.net/tracker/index.php?func=detail&aid=3036368&group_id=115265&atid=692940
     http://u1.to/~brian.curtin/I/comtypes-0.6.2.zip#egg=comtypes
@@ -160,7 +160,7 @@
 twisted = 12.3.0
 # qt4reactor does not go in here. Specifying the github link covers it.
 python-distutils-extra = 2.31
-keyring = 1.2.2
+keyring = 0.7
 pycrypto = 2.6
 pyOpenSSL = 0.13
 pil = 1.1.7