Merge lp:~dobey/ubuntuone-client/no-more-zg into lp:ubuntuone-client/packaging-dailies

Proposed by dobey on 2013-02-05
Status: Merged
Approved by: dobey on 2013-02-05
Approved revision: 73
Merged at revision: 73
Proposed branch: lp:~dobey/ubuntuone-client/no-more-zg
Merge into: lp:ubuntuone-client/packaging-dailies
Diff against target: 31 lines (+1/-4)
2 files modified
control (+1/-3)
python-ubuntuone-client.install (+0/-1)
To merge this branch: bzr merge lp:~dobey/ubuntuone-client/no-more-zg
Reviewer Review Type Date Requested Status
Mike McCracken (community) 2013-02-05 Approve on 2013-02-05
Review via email: mp+146666@code.launchpad.net

Commit message

Remove zeitgeist from dependencies listings.
Remove eventlog directory from install file as it's gone now.

To post a comment you must log in.
Mike McCracken (mikemc) wrote :

Looks good to me

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'control'
2--- control 2013-02-01 20:20:03 +0000
3+++ control 2013-02-05 16:23:22 +0000
4@@ -44,8 +44,7 @@
5 python-zope.interface,
6 ubuntuone-dev-tools (>= 4.1),
7 valac,
8- xutils-dev,
9- zeitgeist-core
10+ xutils-dev
11 Standards-Version: 3.9.3
12 Homepage: https://one.ubuntu.com
13
14@@ -106,7 +105,6 @@
15 ubuntuone-client-data (>= 4.1)
16 Provides: ${python:Provides}
17 Replaces: ubuntuone-client (<< 0.92.0-0ubuntu1)
18-Recommends: zeitgeist-core
19 Description: Ubuntu One client Python libraries
20 Ubuntu One is a suite of on-line services. This package provides the Python
21 libraries for the Ubuntu One file storage and sharing synchronization
22
23=== modified file 'python-ubuntuone-client.install'
24--- python-ubuntuone-client.install 2012-09-12 18:56:31 +0000
25+++ python-ubuntuone-client.install 2013-02-05 16:23:22 +0000
26@@ -5,5 +5,4 @@
27 usr/lib/python2.*/*-packages/ubuntuone-client/ubuntuone/*.py
28 usr/lib/python2.*/*-packages/ubuntuone-client/ubuntuone/platform
29 usr/lib/python2.*/*-packages/ubuntuone-client/ubuntuone/status
30-usr/lib/python2.*/*-packages/ubuntuone-client/ubuntuone/eventlog
31 usr/lib/python2.*/*-packages/ubuntuone-client/ubuntuone/syncdaemon

Subscribers

People subscribed via source and target branches

to all changes: