Ubuntu
ubuntuone-client package

Merge lp:~rmcbride/ubuntu/lucid/ubuntuone-client/fixucg into lp:ubuntu/lucid/ubuntuone-client

  1. Lucid (10.04)
  2. fixucg
  3. Merge into lucid
Proposed by Rick McBride
Status: Merged
Merged at revision: not available
Proposed branch: lp:~rmcbride/ubuntu/lucid/ubuntuone-client/fixucg
Merge into: lp:ubuntu/lucid/ubuntuone-client
Diff against target: 26 lines (+8/-0)
2 files modified
debian/changelog (+6/-0)
debian/control (+2/-0)
To merge this branch: bzr merge lp:~rmcbride/ubuntu/lucid/ubuntuone-client/fixucg
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+20181@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Rick McBride (rmcbride) wrote :

This packaging fix should resolve the conflict set up by the move of ubuntuone-login from the ubuntuone-client package to ubuntuone-client-gnome.

I welcome any and all criticism and advice regarding this branch.

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

On Thu, 25 Feb 2010 22:15:26 -0000, Rick McBride <email address hidden> wrote:
> Rick McBride has proposed merging lp:~rmcbride/ubuntu/lucid/ubuntuone-client/fixucg into lp:ubuntu/ubuntuone-client.
>
> Requested reviews:
> Ubuntu branches (ubuntu-branches)
> Related bugs:
> #523752 package ubuntuone-client-gnome 1.1.1+r321-0ubuntu1~ppa1~lucid failed to install/upgrade: trying to overwrite '/usr/lib/ubuntuone-client/ubuntuone-login', which is also in package ubuntuone-client 0:1.1.1+r321-0ubuntu1~ppa1~lucid
> https://bugs.launchpad.net/bugs/523752
>
>
> This packaging fix should resolve the conflict set up by the move of ubuntuone-login from the ubuntuone-client package to ubuntuone-client-gnome.

You need Replaces for a file move in addition to conflicts.

Thanks,

James

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

Thanks! Fixed and pushed.

lp:~rmcbride/ubuntu/lucid/ubuntuone-client/fixucg updated
21. By Rick McBride

added Replaces line to finish the fix

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-02-18 03:32:31 +0000
3+++ debian/changelog 2010-02-25 23:31:13 +0000
4@@ -1,3 +1,9 @@
5+ubuntuone-client (1.1.2-0ubuntu2) lucid; urgency=low
6+
7+ * added Conflicts: line to resolve issue with ubuntuone-login moving from one package to another.
8+
9+ -- Rick McBride <rick.mcbride@canonical.com> Thu, 25 Feb 2010 16:55:46 -0500
10+
11 ubuntuone-client (1.1.2-0ubuntu1) lucid; urgency=low
12
13 * New upstream release.
14
15=== modified file 'debian/control'
16--- debian/control 2010-02-18 00:08:41 +0000
17+++ debian/control 2010-02-25 23:31:13 +0000
18@@ -43,6 +43,8 @@
19 ubuntuone-client (= ${source:Version}),
20 python-gtk2 (>= 2.10),
21 python-simplejson
22+Replaces: ubuntuone-client (<= 1.1.1)
23+Conflicts: ubuntuone-client (<= 1.1.1)
24 Description: Ubuntu One client GNOME integration
25 Ubuntu One is a suite of on-line services. This package contains the tray
26 applet and Nautilus extension, providing integration with the GNOME desktop.

Subscribers

People subscribed via source and target branches

to all changes: