Merge lp:~mandel/ubuntu-sso-client/ensure_gtk_data into lp:ubuntu-sso-client

Proposed by Manuel de la Peña on 2011-03-31
Status: Merged
Approved by: Manuel de la Peña on 2011-03-31
Approved revision: 693
Merged at revision: 693
Proposed branch: lp:~mandel/ubuntu-sso-client/ensure_gtk_data
Merge into: lp:ubuntu-sso-client
Diff against target: 12 lines (+1/-1)
1 file modified
setup.py (+1/-1)
To merge this branch: bzr merge lp:~mandel/ubuntu-sso-client/ensure_gtk_data
Reviewer Review Type Date Requested Status
Natalia Bidart Approve on 2011-03-31
dobey (community) 2011-03-31 Approve on 2011-03-31
Review via email: mp+55758@code.launchpad.net

Commit message

Fixes lp: 746183

Fix the issue by updating the location to which setup.py copies the glade data files.

Description of the change

Fixes lp: 746183

Fix the issue by updating the location to which setup.py copies the glade data files.

To post a comment you must log in.
dobey (dobey) :
review: Approve
Natalia Bidart (nataliabidart) wrote :

Makes sense!

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 2011-03-18 18:26:55 +0000
3+++ setup.py 2011-03-31 14:24:30 +0000
4@@ -297,7 +297,7 @@
5 scripts = []
6 data_files = [('share/dbus-1/services', ['data/com.ubuntu.sso.service']),
7 ('lib/ubuntu-sso-client', ['bin/ubuntu-sso-login']),
8- ('share/ubuntu-sso-client/data', ['data/gtk/ui.glade'])]
9+ ('share/ubuntu-sso-client/data/gtk', ['data/gtk/ui.glade'])]
10 packages = ['ubuntu_sso', 'ubuntu_sso.gtk', 'ubuntu_sso.utils',
11 'ubuntu_sso.keyring', 'ubuntu_sso.networkstate',
12 'ubuntu_sso.main']

Subscribers

People subscribed via source and target branches