Mir

Merge lp:~afrantzis/mir/fix-mircommon-debian-replaces into lp:mir

Proposed by Alexandros Frantzis
Status: Merged
Merged at revision: 1838
Proposed branch: lp:~afrantzis/mir/fix-mircommon-debian-replaces
Merge into: lp:mir
Diff against target: 25 lines (+4/-4)
1 file modified
debian/control (+4/-4)
To merge this branch: bzr merge lp:~afrantzis/mir/fix-mircommon-debian-replaces
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Daniel van Vugt Approve
Chris Halse Rogers Approve
Alexandros Frantzis Pending
Kevin DuBois Pending
Alan Griffiths Pending
Review via email: mp+230583@code.launchpad.net

Commit message

debian: Update version numbers for libmircommon-dev and libmirplatform-dev Breaks,Replaces clauses

Our previous scheme used a specific 0.5.x version, but we have since moved to a newer 0.5.x version. Use (<< 0.6) to avoid such problems.

Description of the change

debian: Update version numbers for libmircommon-dev and libmirplatform-dev Breaks,Replaces clauses

Our previous scheme used a specific 0.5.x version, but we have since moved to a newer 0.5.x version. Use (<< 0.6) to avoid such problems.

To post a comment you must log in.
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Looks right but needs some manual testing...

review: Approve
Revision history for this message
Chris Halse Rogers (raof) wrote :

LGTM.

review: Approve
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Hmm, isn't working. Perhaps we shouldn't have "Breaks", only "Replaces"...

$ sudo dpkg -i libmircommon-dev_0.6.0+14.10.20140811-0ubuntu1vv1_amd64.deb
dpkg: regarding libmircommon-dev_0.6.0+14.10.20140811-0ubuntu1vv1_amd64.deb containing libmircommon-dev:amd64:
 libmircommon-dev:amd64 breaks mircommon-dev (<< 0.6)
  mircommon-dev:amd64 (version 0.5.1+14.10.20140728-0ubuntu1) is present and installed.

dpkg: error processing archive libmircommon-dev_0.6.0+14.10.20140811-0ubuntu1vv1_amd64.deb (--install):
 installing libmircommon-dev:amd64 would break mircommon-dev:amd64, and
 deconfiguration is not permitted (--auto-deconfigure might help)
Errors were encountered while processing:
 libmircommon-dev_0.6.0+14.10.20140811-0ubuntu1vv1_amd64.deb

review: Needs Fixing
Revision history for this message
Chris Halse Rogers (raof) wrote :

No, you need to pass --auto-deconfigure.

In order to test such upgrades you really have to use apt; apt is where the smarts that handle Breaks/Replaces are.

Revision history for this message
Daniel van Vugt (vanvugt) wrote :

OK, it does work with:
sudo dpkg --auto-deconfigure -i libmircommon-dev_0.6.0+14.10.20140811-0ubuntu1vv1_amd64.deb libmircommon1_0.6.0+14.10.20140811-0ubuntu1vv1_amd64.deb

Although I'm not sure if apt does auto-deconfigure. The policy manual does say to "Breaks" and "Replaces"...
https://www.debian.org/doc/debian-policy/ch-relationships.html#s-replaces

review: Approve
Revision history for this message
Chris Halse Rogers (raof) wrote :

apt will translate Breaks/Replaces into “remove mircommon-dev and install libmircommon-dev instead”. There's no way to really duplicate the apt upgrade procedure except for actually running apt that I know of.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~afrantzis/mir/fix-mircommon-debian-replaces/+merge/230583/+edit-commit-message

review: Needs Fixing (continuous-integration)
Revision history for this message
Iain Lane (laney) wrote :

I uploaded this manually since the error was breaking dist-upgrades. You can tell the train to ignore that upload when merging this branch.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

Manually cancelled since it would fail anyway because of CI issues, retriggering.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

Sigh...

dpkg: error processing archive /var/cache/apt/archives/lxc-android-config_0.192_all.deb (--unpack):
 unable to make backup link of `./lib/udev/rules.d/70-android.rules' before installing new version: Invalid cross-device link

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-08-07 08:43:25 +0000
3+++ debian/control 2014-08-13 07:05:25 +0000
4@@ -111,8 +111,8 @@
5 Depends: libmircommon1 (= ${binary:Version}),
6 libprotobuf-dev (>= 2.4.1),
7 ${misc:Depends},
8-Breaks: mircommon-dev (<= 0.5.0+14.10.20140722-0ubuntu1)
9-Replaces: mircommon-dev (<= 0.5.0+14.10.20140722-0ubuntu1)
10+Breaks: mircommon-dev (<< 0.6)
11+Replaces: mircommon-dev (<< 0.6)
12 Description: Display server for Ubuntu - development headers
13 Mir is a display server running on linux systems, with a focus on efficiency,
14 robust operation and a well-defined driver model.
15@@ -128,8 +128,8 @@
16 libmircommon-dev,
17 libboost-program-options-dev,
18 ${misc:Depends},
19-Breaks: libmirplatform (<=0.5.1+14.10.20140728-0ubuntu1)
20-Replaces: libmirplatform (<=0.5.1+14.10.20140728-0ubuntu1)
21+Breaks: libmirplatform (<< 0.6)
22+Replaces: libmirplatform (<< 0.6)
23 Description: Display server for Ubuntu - development headers
24 Mir is a display server running on linux systems, with a focus on efficiency,
25 robust operation and a well-defined driver model.

Subscribers

People subscribed via source and target branches