Ubuntu
ubuntuone-client package

Merge lp://qastaging/~rmcbride/ubuntu/lucid/ubuntuone-client/remove.uca into lp://qastaging/~ubuntuone-control-tower/ubuntu/lucid/ubuntuone-client/trunk

  1. Lucid (10.04)
  2. remove.uca
  3. Merge into trunk
Proposed by Rick McBride
Status: Rejected
Rejected by: dobey
Proposed branch: lp://qastaging/~rmcbride/ubuntu/lucid/ubuntuone-client/remove.uca
Merge into: lp://qastaging/~ubuntuone-control-tower/ubuntu/lucid/ubuntuone-client/trunk
Diff against target: 12 lines (+1/-3)
1 file modified
debian/ubuntuone-client-gnome.install (+1/-3)
To merge this branch: bzr merge lp://qastaging/~rmcbride/ubuntu/lucid/ubuntuone-client/remove.uca
Reviewer Review Type Date Requested Status
dobey (community) Disapprove
James Westby (community) Approve
Review via email: mp+17917@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Rick McBride (rmcbride) wrote :

Removes references to teh applet so that packages can be built

lp://qastaging/~rmcbride/ubuntu/lucid/ubuntuone-client/remove.uca updated
4. By Rick McBride

removed reference to applications directory

Revision history for this message
James Westby (james-w) wrote :

Makes sense to me.

Thanks,

James

review: Approve
Revision history for this message
dobey (dobey) wrote :

I'm marking this as Rejected, as these changes, as well as other required updates have already been merged to the Ubuntu branch, and I've replaced our package branch with the contents from there.

review: Disapprove
Revision history for this message
Rick McBride (rmcbride) wrote :

On 03/01/2010 09:52 AM, Rodney Dawes wrote:
> Review: Disapprove
> I'm marking this as Rejected, as these changes, as well as other required updates have already been merged to the Ubuntu branch, and I've replaced our package branch with the contents from there.
 Makes sense to me.

Unmerged revisions

4. By Rick McBride

removed reference to applications directory

3. By Rick McBride

remove references to deleted applet

2. By dobey

* New upstream release.
* Require new ubuntuone-storage-protocol

1. By dobey

ubuntuone-client (1.1.0-0ubuntu1) lucid; urgency=low

  * New upstream release.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/ubuntuone-client-gnome.install'
2--- debian/ubuntuone-client-gnome.install 2009-12-07 22:50:37 +0000
3+++ debian/ubuntuone-client-gnome.install 2010-01-27 14:17:18 +0000
4@@ -1,7 +1,5 @@
5-debian/tmp/usr/bin/ubuntuone-client-applet
6 debian/tmp/usr/bin/ubuntuone-client-preferences
7 debian/tmp/usr/lib/nautilus/extensions-*/libnautilus-ubuntuone.*
8-debian/tmp/usr/share/{applications,icons,ubuntuone-client}
9-debian/tmp/usr/share/man/man1/ubuntuone-client-applet.*
10+debian/tmp/usr/share/{icons,ubuntuone-client}
11 debian/tmp/usr/share/man/man1/ubuntuone-client-preferences.*
12 debian/tmp/usr/share/dbus-1/services/com.ubuntuone.Authentication.service

Subscribers

People subscribed via source and target branches

to all changes: