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
=== modified file 'debian/control'
--- debian/control 2014-10-29 09:04:21 +0000
+++ debian/control 2014-12-03 10:40:50 +0000
@@ -111,7 +111,9 @@
111Architecture: any111Architecture: any
112Multi-Arch: same112Multi-Arch: same
113Depends: ${shlibs:Depends}, ${misc:Depends}113Depends: ${shlibs:Depends}, ${misc:Depends}
114Conflicts: oxideqt-codecs-extra114Conflicts: oxideqt-codecs-extra:armhf [armhf],
115 oxideqt-codecs-extra:i386 [i386],
116 oxideqt-codecs-extra:amd64 [amd64]
115Breaks: liboxideqtcore0 (<< 1.0.0~bzr488)117Breaks: liboxideqtcore0 (<< 1.0.0~bzr488)
116Replaces: oxideqt-codecs-extra, liboxideqtcore0 (<< 1.0.0~bzr488)118Replaces: oxideqt-codecs-extra, liboxideqtcore0 (<< 1.0.0~bzr488)
117Description: Web browser engine library for Qt (codecs)119Description: Web browser engine library for Qt (codecs)
@@ -140,7 +142,9 @@
140Architecture: any142Architecture: any
141Multi-Arch: same143Multi-Arch: same
142Depends: ${shlibs:Depends}, ${misc:Depends}144Depends: ${shlibs:Depends}, ${misc:Depends}
143Conflicts: oxideqt-codecs145Conflicts: oxideqt-codecs:armhf [armhf],
146 oxideqt-codecs:i386 [i386],
147 oxideqt-codecs:amd64 [amd64]
144Breaks: liboxideqtcore0 (<< 1.0.0~bzr488)148Breaks: liboxideqtcore0 (<< 1.0.0~bzr488)
145Replaces: oxideqt-codecs, liboxideqtcore0 (<< 1.0.0~bzr488)149Replaces: oxideqt-codecs, liboxideqtcore0 (<< 1.0.0~bzr488)
146Description: Web browser engine library for Qt (codecs)150Description: Web browser engine library for Qt (codecs)

Subscribers

People subscribed via source and target branches