Oxide

Merge lp:~bzoltan/oxide/packaging.vivid-improved-conflicts into lp:~oxide-developers/oxide/packaging.vivid

  1. packaging.vivid-improved-conflicts
  2. Merge into packaging.vivid
Proposed by Zoltan Balogh
Status: Merged
Merged at revision: 55
Proposed branch: lp:~bzoltan/oxide/packaging.vivid-improved-conflicts
Merge into: lp:~oxide-developers/oxide/packaging.vivid
Diff against target: 25 lines (+6/-2)
1 file modified
debian/control (+6/-2)
To merge this branch: bzr merge lp:~bzoltan/oxide/packaging.vivid-improved-conflicts
Reviewer Review Type Date Requested Status
Chris Coulson Approve
Review via email: mp+243515@code.launchpad.net

This proposal supersedes a proposal from 2014-12-03.

Description of the change

Limit the codecs vs. codecs-extra conlict for the same arch only

To post a comment you must log in.
Revision history for this message
Chris Coulson (chrisccoulson) :
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 2014-10-29 09:04:21 +0000
3+++ debian/control 2014-12-03 10:40:50 +0000
4@@ -111,7 +111,9 @@
5 Architecture: any
6 Multi-Arch: same
7 Depends: ${shlibs:Depends}, ${misc:Depends}
8-Conflicts: oxideqt-codecs-extra
9+Conflicts: oxideqt-codecs-extra:armhf [armhf],
10+ oxideqt-codecs-extra:i386 [i386],
11+ oxideqt-codecs-extra:amd64 [amd64]
12 Breaks: liboxideqtcore0 (<< 1.0.0~bzr488)
13 Replaces: oxideqt-codecs-extra, liboxideqtcore0 (<< 1.0.0~bzr488)
14 Description: Web browser engine library for Qt (codecs)
15@@ -140,7 +142,9 @@
16 Architecture: any
17 Multi-Arch: same
18 Depends: ${shlibs:Depends}, ${misc:Depends}
19-Conflicts: oxideqt-codecs
20+Conflicts: oxideqt-codecs:armhf [armhf],
21+ oxideqt-codecs:i386 [i386],
22+ oxideqt-codecs:amd64 [amd64]
23 Breaks: liboxideqtcore0 (<< 1.0.0~bzr488)
24 Replaces: oxideqt-codecs, liboxideqtcore0 (<< 1.0.0~bzr488)
25 Description: Web browser engine library for Qt (codecs)

Subscribers

People subscribed via source and target branches