Merge lp:~nataliabidart/ubuntu-sso-client/rename-me-too into lp:ubuntu-sso-client

Proposed by Natalia Bidart
Status: Merged
Approved by: Natalia Bidart
Approved revision: 874
Merged at revision: 874
Proposed branch: lp:~nataliabidart/ubuntu-sso-client/rename-me-too
Merge into: lp:ubuntu-sso-client
Diff against target: 40 lines (+10/-6)
1 file modified
setup.py (+10/-6)
To merge this branch: bzr merge lp:~nataliabidart/ubuntu-sso-client/rename-me-too
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Review via email: mp+93074@code.launchpad.net

Commit message

  - Proper name in setup.py for the proxy credentials executable
    (LP: #932328).

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

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup.py'
2--- setup.py 2012-02-13 16:16:03 +0000
3+++ setup.py 2012-02-14 20:53:18 +0000
4@@ -311,6 +311,14 @@
5 }
6
7
8+sso_executables = [
9+ 'bin/ubuntu-sso-login',
10+ 'bin/ubuntu-sso-login-gtk',
11+ 'bin/ubuntu-sso-login-qt',
12+ 'bin/ubuntu-sso-proxy-creds-qt',
13+]
14+
15+
16 class dummy_build_i18n(distutils.cmd.Command):
17
18 """Dummy for windows."""
19@@ -348,7 +356,7 @@
20 },
21 },
22 # add the console script so that py2exe compiles it
23- 'console': ['bin/ubuntu-sso-login', 'bin/proxy-creds-qt'],
24+ 'console': sso_executables,
25 'zipfile': None,
26 }
27 return _data_files, _extra
28@@ -357,11 +365,7 @@
29 data_files, extra = setup_windows()
30 else:
31 data_files = [
32- ('lib/ubuntu-sso-client',
33- ['bin/ubuntu-sso-login',
34- 'bin/ubuntu-sso-login-gtk',
35- 'bin/ubuntu-sso-login-qt',
36- 'bin/proxy-creds-qt']),
37+ ('lib/ubuntu-sso-client', sso_executables),
38 ('share/dbus-1/services', ['data/com.ubuntu.sso.service']),
39 ]
40 extra = {}

Subscribers

People subscribed via source and target branches