Launchpad itself

Merge lp:~lifeless/launchpad/gpgme-egg into lp:launchpad

  1. gpgme-egg
  2. Merge into devel
Proposed by Robert Collins
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merged at revision: 13747
Proposed branch: lp:~lifeless/launchpad/gpgme-egg
Merge into: lp:launchpad
Diff against target: 37 lines (+2/-1)
3 files modified
setup.py (+1/-0)
utilities/sourcedeps.conf (+0/-1)
versions.cfg (+1/-0)
To merge this branch: bzr merge lp:~lifeless/launchpad/gpgme-egg
Reviewer Review Type Date Requested Status
Jelmer Vernooij (community) Approve
Review via email: mp+72366@code.launchpad.net

Commit message

[r=jelmer][no-qa] Use pygpgme from an egg now that 0.2 is out.

Description of the change

James Henstridge has released all the inventory from the pygpgme project, so we can run a release egg. This takes us one step closer to having one less dependency system in play. \o/

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed symlink 'lib/gpgme'
2=== target was u'../sourcecode/pygpgme/gpgme'
3=== modified file 'setup.py'
4--- setup.py 2011-08-18 03:32:33 +0000
5+++ setup.py 2011-08-21 22:09:40 +0000
6@@ -38,6 +38,7 @@
7 'FeedParser',
8 'feedvalidator',
9 'funkload',
10+ 'pygpgme',
11 'launchpadlib',
12 'lazr.batchnavigator',
13 'lazr.config',
14
15=== modified file 'utilities/sourcedeps.conf'
16--- utilities/sourcedeps.conf 2011-08-19 14:03:25 +0000
17+++ utilities/sourcedeps.conf 2011-08-21 22:09:40 +0000
18@@ -11,7 +11,6 @@
19 mailman lp:~launchpad-pqm/mailman/2.1;revno=976
20 old_xmlplus lp:~launchpad-pqm/dtdparser/trunk;revno=4
21 pygettextpo lp:~launchpad-pqm/pygettextpo/trunk;revno=24
22-pygpgme lp:~launchpad-pqm/pygpgme/devel;revno=49
23 subvertpy lp:~launchpad-pqm/subvertpy/trunk;revno=2046
24 python-debian lp:~launchpad-pqm/python-debian/devel;revno=186
25 testresources lp:~launchpad-pqm/testresources/dev;revno=16
26
27=== modified file 'versions.cfg'
28--- versions.cfg 2011-08-19 19:40:05 +0000
29+++ versions.cfg 2011-08-21 22:09:40 +0000
30@@ -62,6 +62,7 @@
31 pydkim = 0.3-mbp-r7
32 # 1.4 with one-line fix from comment 2 of http://goo.gl/9TAeM .
33 Pygments = 1.4LP-20110803
34+pygpgme = 0.2
35 pyOpenSSL = 0.10
36 python-memcached = 1.45
37 # 2.2.1 with the one-liner Expect: 100-continue fix from