Merge lp:~ack/landscape-client/fix-package-rules into lp:~landscape/landscape-client/trunk

Proposed by Alberto Donato
Status: Merged
Approved by: Alberto Donato
Approved revision: 837
Merged at revision: 837
Proposed branch: lp:~ack/landscape-client/fix-package-rules
Merge into: lp:~landscape/landscape-client/trunk
Diff against target: 22 lines (+2/-3)
1 file modified
debian/control (+2/-3)
To merge this branch: bzr merge lp:~ack/landscape-client/fix-package-rules
Reviewer Review Type Date Requested Status
Free Ekanayaka (community) Approve
Adam Collard (community) Approve
Review via email: mp+289768@code.launchpad.net

Commit message

This fixes rules for landscape-client/landscape-common packages which were causing the landscape-client package being removed when performing a dist-upgrade.
With the new rules, only ui packages (landscape-client-ui and landscape-client-ui-install) are removed, which is the intended behavior.

Description of the change

This fixes rules for landscape-client/landscape-common packages which were causing the landscape-client package being removed when performing a dist-upgrade.
With the new rules, only ui packages (landscape-client-ui and landscape-client-ui-install) are removed, which is the intended behavior.

Testing instructions:

I tested a simulated upgrade path from wily to xenial (using packages built from this branch) by installing all landscape-* packages on a wily container, and adding a local repo which contains the new landscape-client and landscape-common packages.

An "apt-get dist-upgrade" will show the following:

The following packages will be REMOVED:
  landscape-client-ui landscape-client-ui-install
The following packages will be upgraded:
  landscape-client landscape-common

To post a comment you must log in.
Revision history for this message
Adam Collard (adam-collard) wrote :

LGTM! +1

review: Approve
Revision history for this message
Free Ekanayaka (free.ekanayaka) wrote :

+1

From IRC:

<free> ack: you didn't point the APT sources to xenial altogher right? just
       added to the stock the single repo with new client [11:28]
<free> to stock wily
<ack> free, yes [11:31]
<free> ack: ok
<ack> free, I wanted to test in isolation
<free> ack: makes sense
<sparkiegeek> ack: +1'd - that's what I expected to see [11:32]
<free> ack: I think it's a good enough test for landing the branch, but of
       course someone will need to also test the real thing: wily->xenial and
       trusty->xenial. I'm reasonably confident there won't be issues.

review: Approve
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

You didn't change the comment. It looks really odd now:

# added/changed when we moved the sysinfo manpage from client to common
# in r582. There is no accompaining "Breaks" because -client requires
# the exact same version of -common, which will trigger the upgrade
# and avoid the case discussed in
# http://www.debian.org/doc/debian-policy/footnotes.html#f53
Breaks: landscape-client-ui (<< 16.04), landscape-client-ui-install (<< 16.04)
Replaces: landscape-client-ui (<< 16.04), landscape-client-ui-install (<< 16.04)

Revision history for this message
Alberto Donato (ack) wrote :

Ah good catch. That comment is obsolete. I dropped it now.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2016-03-08 11:03:24 +0000
+++ debian/control 2016-03-22 10:28:08 +0000
@@ -28,7 +28,8 @@
28# the exact same version of -common, which will trigger the upgrade28# the exact same version of -common, which will trigger the upgrade
29# and avoid the case discussed in29# and avoid the case discussed in
30# http://www.debian.org/doc/debian-policy/footnotes.html#f5330# http://www.debian.org/doc/debian-policy/footnotes.html#f53
31Replaces: landscape-client (<< 12.09+bzr582)31Breaks: landscape-client-ui (<< 16.04), landscape-client-ui-install (<< 16.04)
32Replaces: landscape-client-ui (<< 16.04), landscape-client-ui-install (<< 16.04)
32Description: The Landscape administration system client - Common files33Description: The Landscape administration system client - Common files
33 Landscape is a web-based tool for managing Ubuntu systems. This34 Landscape is a web-based tool for managing Ubuntu systems. This
34 package is necessary if you want your machine to be managed in a35 package is necessary if you want your machine to be managed in a
@@ -44,8 +45,6 @@
44 python-twisted-web,45 python-twisted-web,
45 python-pycurl,46 python-pycurl,
46 landscape-common (= ${binary:Version})47 landscape-common (= ${binary:Version})
47Replaces: landscape-client-ui, landscape-client-ui-install
48Conflicts: landscape-client-ui, landscape-client-ui-install
49Suggests: ${extra:Suggests}48Suggests: ${extra:Suggests}
50Description: The Landscape administration system client49Description: The Landscape administration system client
51 Landscape is a web-based tool for managing Ubuntu systems. This50 Landscape is a web-based tool for managing Ubuntu systems. This

Subscribers

People subscribed via source and target branches

to all changes: