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

[Alberto Donato]

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.

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

[Adam Collard (adam-collard)]

LGTM! +1

review: Approve

[Free Ekanayaka (free.ekanayaka)]

+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

[Andreas Hasenack (ahasenack)]

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)

[Alberto Donato (ack)]

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

=== 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 @@
 # 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
-Replaces: landscape-client (<< 12.09+bzr582)
+Breaks: landscape-client-ui (<< 16.04), landscape-client-ui-install (<< 16.04)
+Replaces: landscape-client-ui (<< 16.04), landscape-client-ui-install (<< 16.04)
 Description: The Landscape administration system client - Common files
  Landscape is a web-based tool for managing Ubuntu systems. This
  package is necessary if you want your machine to be managed in a
@@ -44,8 +45,6 @@
          python-twisted-web,
          python-pycurl,
          landscape-common (= ${binary:Version})
-Replaces: landscape-client-ui, landscape-client-ui-install
-Conflicts: landscape-client-ui, landscape-client-ui-install
 Suggests: ${extra:Suggests}
 Description: The Landscape administration system client
  Landscape is a web-based tool for managing Ubuntu systems. This