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

[Aurélien Gâteau]

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

[Florian Boucault (fboucault)]

This should be submitted against the maverick branch.

review: Needs Fixing

[Aurélien Gâteau (agateau)]

Resubmitted

[lp:~agateau/unity-2d/unity-2d-private-fix-transition]

406. By Aurélien Gâteau on 2011-02-11

Conflicts => Breaks

[Florian Boucault (fboucault)]

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]

407. By Aurélien Gâteau on 2011-02-11

Versionize breaks and replaces for libunity-2d0

[Florian Boucault (fboucault)]

let's go for it

review: Approve

=== 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 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: libunity-2d0 (<< 0.4-0ubuntu1~bzr403)
+Replaces: libunity-2d0 (<< 0.4-0ubuntu1~bzr403)
 Description: Unity 2D shared library
  This library is used to host common code used by several Unity 2D components
 
@@ -58,6 +60,8 @@
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libunity-2d-private0 (= ${binary:Version})
+Breaks: libunity-2d-dev (<< 0.4-0ubuntu1~bzr403)
+Replaces: libunity-2d-dev (<< 0.4-0ubuntu1~bzr403)
 Description: Unity 2D shared library - development files
  This library is used to host common code used by several Unity 2D components
  .
@@ -68,7 +72,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, unity-asset-pool, libqt4-svg, libunity-2d-private0
 Recommends: unity-place-files, unity-place-applications
 Provides: unity-qt-launcher
-Conflicts: unity-qt-launcher (<= 0.2)
+Breaks: unity-qt-launcher (<= 0.2)
 Replaces: unity-qt-launcher (<= 0.2)
 Description: Unity 2D Launcher
  The Unity 2D launcher displays a list of running applications as well as a
@@ -80,7 +84,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libunity-2d-private0
 Provides: unity-qt-panel
-Conflicts: unity-qt-panel (<= 0.2)
+Breaks: unity-qt-panel (<= 0.2)
 Replaces: unity-qt-panel (<= 0.2)
 Description: Unity 2D Panel
  The Unity 2D panel displays a top panel containing the application menu and
@@ -91,7 +95,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, unity-2d-launcher, libunity-2d-private0, libqt4-svg
 Provides: unity-qt-places
-Conflicts: unity-qt-places (<= 0.2)
+Breaks: unity-qt-places (<= 0.2)
 Replaces: unity-qt-places (<= 0.2)
 Description: Unity 2D Places
  The Unity 2D places overlay over the desktop to provide quick access to
@@ -103,7 +107,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, unity-2d-launcher, libunity-2d-private0,
          libqt4-svg
 Provides: unity-qt-spread
-Conflicts: unity-qt-spread (<= 0.2)
+Breaks: unity-qt-spread (<= 0.2)
 Replaces: unity-qt-spread (<= 0.2)
 Description: Unity 2D Spread
  The Unity 2D spread allows you to display a quick thumbnailed view of open