Ubuntu One Windows Installer

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

  1. keyring-downgrade
  2. Merge into trunk
Proposed by Brian Curtin
Status: Merged
Approved by: dobey
Approved revision: 168
Merged at revision: 169
Proposed branch: lp:~brian.curtin/ubuntuone-windows-installer/keyring-downgrade
Merge into: lp:ubuntuone-windows-installer
Diff against target: 28 lines (+3/-3)
1 file modified
scripts/devsetup/buildout.cfg (+3/-3)
To merge this branch: bzr merge lp:~brian.curtin/ubuntuone-windows-installer/keyring-downgrade
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
dobey (community) Approve
Review via email: mp+160920@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
dobey (dobey) :
review: Approve
Revision history for this message
Roberto Alsina (ralsina) :
review: Approve

Preview Diff

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

Subscribers

People subscribed via source and target branches