Snappy

Merge lp:~sergiusens/snappy/conflictsPackaging into lp:~snappy-dev/snappy/snappy-moved-to-github

  1. conflictsPackaging
  2. Merge into snappy-moved-to-github
Proposed by Sergio Schvezov on 2015-04-21
Status: Merged
Approved by: John Lenton on 2015-04-22
Approved revision: 409
Merged at revision: 410
Proposed branch: lp:~sergiusens/snappy/conflictsPackaging
Merge into: lp:~snappy-dev/snappy/snappy-moved-to-github
Diff against target: 11 lines (+1/-0)
1 file modified
debian/control (+1/-0)
To merge this branch: bzr merge lp:~sergiusens/snappy/conflictsPackaging
Reviewer Review Type Date Requested Status
Steve Langasek 2015-04-21 Approve on 2015-04-21
Review via email: mp+257008@code.launchpad.net

Commit Message

Declaring a conflicts agains snappy for ubuntu-snappy-cli

To post a comment you must log in.
Steve Langasek (vorlon) wrote :

Ideally, we would not have two packages in the archive providing a command of the same name but completely different functionality. But as long as this is the case, it's better to have it documented in the package.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2015-04-21 06:25:09 +0000
3+++ debian/control 2015-04-21 22:03:29 +0000
4@@ -46,6 +46,7 @@
5 Depends: ${misc:Depends}, ${shlibs:Depends}, adduser
6 Replaces: ubuntu-core-snappy (<< 0.2~ppa90)
7 Breaks: ubuntu-core-snappy (<< 0.2~ppa90)
8+Conflicts: snappy
9 Built-Using: ${misc:Built-Using}
10 Description: Tool to interact with Ubuntu Core Snappy.
11 Manage an Ubuntu system with snappy.

Subscribers

People subscribed via source and target branches