Ubuntu One Client

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

  1. no-more-zg
  2. Merge into packaging-dailies
Proposed by dobey
Status: Merged
Approved by: dobey
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) Approve
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.
Revision history for this message
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
=== modified file 'control'
--- control 2013-02-01 20:20:03 +0000
+++ control 2013-02-05 16:23:22 +0000
@@ -44,8 +44,7 @@
44 python-zope.interface,44 python-zope.interface,
45 ubuntuone-dev-tools (>= 4.1),45 ubuntuone-dev-tools (>= 4.1),
46 valac,46 valac,
47 xutils-dev,47 xutils-dev
48 zeitgeist-core
49Standards-Version: 3.9.348Standards-Version: 3.9.3
50Homepage: https://one.ubuntu.com49Homepage: https://one.ubuntu.com
5150
@@ -106,7 +105,6 @@
106 ubuntuone-client-data (>= 4.1)105 ubuntuone-client-data (>= 4.1)
107Provides: ${python:Provides}106Provides: ${python:Provides}
108Replaces: ubuntuone-client (<< 0.92.0-0ubuntu1)107Replaces: ubuntuone-client (<< 0.92.0-0ubuntu1)
109Recommends: zeitgeist-core
110Description: Ubuntu One client Python libraries108Description: Ubuntu One client Python libraries
111 Ubuntu One is a suite of on-line services. This package provides the Python109 Ubuntu One is a suite of on-line services. This package provides the Python
112 libraries for the Ubuntu One file storage and sharing synchronization110 libraries for the Ubuntu One file storage and sharing synchronization
113111
=== modified file 'python-ubuntuone-client.install'
--- python-ubuntuone-client.install 2012-09-12 18:56:31 +0000
+++ python-ubuntuone-client.install 2013-02-05 16:23:22 +0000
@@ -5,5 +5,4 @@
5usr/lib/python2.*/*-packages/ubuntuone-client/ubuntuone/*.py5usr/lib/python2.*/*-packages/ubuntuone-client/ubuntuone/*.py
6usr/lib/python2.*/*-packages/ubuntuone-client/ubuntuone/platform6usr/lib/python2.*/*-packages/ubuntuone-client/ubuntuone/platform
7usr/lib/python2.*/*-packages/ubuntuone-client/ubuntuone/status7usr/lib/python2.*/*-packages/ubuntuone-client/ubuntuone/status
8usr/lib/python2.*/*-packages/ubuntuone-client/ubuntuone/eventlog
9usr/lib/python2.*/*-packages/ubuntuone-client/ubuntuone/syncdaemon8usr/lib/python2.*/*-packages/ubuntuone-client/ubuntuone/syncdaemon

Subscribers

People subscribed via source and target branches

to all changes: