magicicada client

Merge lp:~nataliabidart/magicicada-client/fix-travis-ubuntuone-clientdefs into lp:magicicada-client

  1. fix-travis-ubuntuone-clientdefs
  2. Merge into trunk
Proposed by Natalia Bidart
Status: Merged
Approved by: Natalia Bidart
Approved revision: 1446
Merged at revision: 1446
Proposed branch: lp:~nataliabidart/magicicada-client/fix-travis-ubuntuone-clientdefs
Merge into: lp:magicicada-client
Diff against target: 12 lines (+1/-1)
1 file modified
setup.py (+1/-1)
To merge this branch: bzr merge lp:~nataliabidart/magicicada-client/fix-travis-ubuntuone-clientdefs
Reviewer Review Type Date Requested Status
Facundo Batista Approve
Review via email: mp+347218@code.launchpad.net

Commit message

- Ensure clientdefs (still needed :-() builds after the namespace change.

To post a comment you must log in.
Revision history for this message
Facundo Batista (facundo) :
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 2018-04-23 02:21:03 +0000
3+++ setup.py 2018-05-31 16:31:46 +0000
4@@ -50,7 +50,7 @@
5 SERVICE_FILES = ['data/com.ubuntuone.Credentials.service',
6 'data/com.ubuntuone.SyncDaemon.service']
7 CONFIG_FILES = ['data/logging.conf']
8-CLIENTDEFS = 'ubuntuone/clientdefs.py'
9+CLIENTDEFS = 'magicicadaclient/clientdefs.py'
10
11 BUILD_FILES = [CLIENTDEFS] + CONFIG_FILES
12 CLEANFILES = [POT_FILE, 'MANIFEST'] + BUILD_FILES + SERVICE_FILES

Subscribers

People subscribed via source and target branches

to all changes: