unity-2d

Merge lp:~agateau/unity-2d/unity-2d-private-fix-transition into lp:unity-2d/0.4

  1. unity-2d-private-fix-transition
  2. Merge into maverick
Proposed by Aurélien Gâteau
Status: Merged
Approved by: Florian Boucault
Approved revision: 407
Merged at revision: 405
Proposed branch: lp:~agateau/unity-2d/unity-2d-private-fix-transition
Merge into: lp:unity-2d/0.4
Diff against target: 57 lines (+8/-4)
1 file modified
debian/control (+8/-4)
To merge this branch: bzr merge lp:~agateau/unity-2d/unity-2d-private-fix-transition
Reviewer Review Type Date Requested Status
Florian Boucault (community) Approve
Olivier Tilloy Pending
Review via email: mp+49389@code.launchpad.net

This proposal supersedes a proposal from 2011-02-11.

Description of the change

[packaging] Make sure libunity-2d-private0 replaces libunity-2d0 and libunity-2d-private-dev replaces libunity-2d-dev

To post a comment you must log in.
Revision history for this message
Florian Boucault (fboucault) wrote : Posted in a previous version of this proposal

This should be submitted against the maverick branch.

review: Needs Fixing
Revision history for this message
Aurélien Gâteau (agateau) wrote :

Resubmitted

lp:~agateau/unity-2d/unity-2d-private-fix-transition updated
406. By Aurélien Gâteau

Conflicts => Breaks

Revision history for this message
Florian Boucault (fboucault) wrote :

Because we provide virtual packages for libunity-2d0 and libunity-2d-dev we need to have *versioned* Breaks and Replaces.

review: Needs Fixing
lp:~agateau/unity-2d/unity-2d-private-fix-transition updated
407. By Aurélien Gâteau

Versionize breaks and replaces for libunity-2d0

Revision history for this message
Florian Boucault (fboucault) wrote :

let's go for it

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 2011-02-10 20:25:38 +0000
+++ debian/control 2011-02-11 14:47:42 +0000
@@ -51,6 +51,8 @@
51Section: libs51Section: libs
52Architecture: any52Architecture: any
53Depends: ${shlibs:Depends}, ${misc:Depends}53Depends: ${shlibs:Depends}, ${misc:Depends}
54Breaks: libunity-2d0 (<< 0.4-0ubuntu1~bzr403)
55Replaces: libunity-2d0 (<< 0.4-0ubuntu1~bzr403)
54Description: Unity 2D shared library56Description: Unity 2D shared library
55 This library is used to host common code used by several Unity 2D components57 This library is used to host common code used by several Unity 2D components
5658
@@ -58,6 +60,8 @@
58Section: libdevel60Section: libdevel
59Architecture: any61Architecture: any
60Depends: ${shlibs:Depends}, ${misc:Depends}, libunity-2d-private0 (= ${binary:Version})62Depends: ${shlibs:Depends}, ${misc:Depends}, libunity-2d-private0 (= ${binary:Version})
63Breaks: libunity-2d-dev (<< 0.4-0ubuntu1~bzr403)
64Replaces: libunity-2d-dev (<< 0.4-0ubuntu1~bzr403)
61Description: Unity 2D shared library - development files65Description: Unity 2D shared library - development files
62 This library is used to host common code used by several Unity 2D components66 This library is used to host common code used by several Unity 2D components
63 .67 .
@@ -68,7 +72,7 @@
68Depends: ${shlibs:Depends}, ${misc:Depends}, unity-asset-pool, libqt4-svg, libunity-2d-private072Depends: ${shlibs:Depends}, ${misc:Depends}, unity-asset-pool, libqt4-svg, libunity-2d-private0
69Recommends: unity-place-files, unity-place-applications73Recommends: unity-place-files, unity-place-applications
70Provides: unity-qt-launcher74Provides: unity-qt-launcher
71Conflicts: unity-qt-launcher (<= 0.2)75Breaks: unity-qt-launcher (<= 0.2)
72Replaces: unity-qt-launcher (<= 0.2)76Replaces: unity-qt-launcher (<= 0.2)
73Description: Unity 2D Launcher77Description: Unity 2D Launcher
74 The Unity 2D launcher displays a list of running applications as well as a78 The Unity 2D launcher displays a list of running applications as well as a
@@ -80,7 +84,7 @@
80Architecture: any84Architecture: any
81Depends: ${shlibs:Depends}, ${misc:Depends}, libunity-2d-private085Depends: ${shlibs:Depends}, ${misc:Depends}, libunity-2d-private0
82Provides: unity-qt-panel86Provides: unity-qt-panel
83Conflicts: unity-qt-panel (<= 0.2)87Breaks: unity-qt-panel (<= 0.2)
84Replaces: unity-qt-panel (<= 0.2)88Replaces: unity-qt-panel (<= 0.2)
85Description: Unity 2D Panel89Description: Unity 2D Panel
86 The Unity 2D panel displays a top panel containing the application menu and90 The Unity 2D panel displays a top panel containing the application menu and
@@ -91,7 +95,7 @@
91Architecture: any95Architecture: any
92Depends: ${shlibs:Depends}, ${misc:Depends}, unity-2d-launcher, libunity-2d-private0, libqt4-svg96Depends: ${shlibs:Depends}, ${misc:Depends}, unity-2d-launcher, libunity-2d-private0, libqt4-svg
93Provides: unity-qt-places97Provides: unity-qt-places
94Conflicts: unity-qt-places (<= 0.2)98Breaks: unity-qt-places (<= 0.2)
95Replaces: unity-qt-places (<= 0.2)99Replaces: unity-qt-places (<= 0.2)
96Description: Unity 2D Places100Description: Unity 2D Places
97 The Unity 2D places overlay over the desktop to provide quick access to101 The Unity 2D places overlay over the desktop to provide quick access to
@@ -103,7 +107,7 @@
103Depends: ${shlibs:Depends}, ${misc:Depends}, unity-2d-launcher, libunity-2d-private0,107Depends: ${shlibs:Depends}, ${misc:Depends}, unity-2d-launcher, libunity-2d-private0,
104 libqt4-svg108 libqt4-svg
105Provides: unity-qt-spread109Provides: unity-qt-spread
106Conflicts: unity-qt-spread (<= 0.2)110Breaks: unity-qt-spread (<= 0.2)
107Replaces: unity-qt-spread (<= 0.2)111Replaces: unity-qt-spread (<= 0.2)
108Description: Unity 2D Spread112Description: Unity 2D Spread
109 The Unity 2D spread allows you to display a quick thumbnailed view of open113 The Unity 2D spread allows you to display a quick thumbnailed view of open

Subscribers

People subscribed via source and target branches