Merge lp:~ericsnowcurrently/landscape-client/fix-1680875-fix-packaging-conflicts into lp:~landscape/landscape-client/trunk

[Eric Snow]

Factor out a common setup package for landscape-client and landscape-sysinfo.

This removes possible conflicts between the Python 2 and Python 3 lib packages.

Note that, as part of this change, the landscape-common packages have been
renamed to pythonX-landscape-lib.

Testing instructions:

make package DEBUILD_OPTS="-us -uc"
sudo apt-cache policy landscape-client landscape-sysinfo landscape-client-common python3-landscape-lib python-landscape-lib
sudo apt-get install landscape-client-common # no missing deps, created landscape user
sudo apt-get remove landscape-client-common # removes landscape user
sudo apt-get install landscape-client # fails due to missing common, sysinfo, py3 lib
sudo apt-get install landscape-sysinfo # fails due to missing common, py3 lib
sudo apt-get install python-landscape-lib # does not add landscape user
sudo apt-get install python3-landscape-lib # does not add landscape user
sudo apt-get install landscape-client-common
sudo apt-get install landscape-sysinfo
sudo apt-get install landscape-client
sudo apt-cache policy landscape-client landscape-sysinfo landscape-client-common python3-landscape-lib python-landscape-lib

[lp:~ericsnowcurrently/landscape-client/fix-1680875-fix-packaging-conflicts]

1023. By Eric Snow on 2017-04-10

Fix up the conflicts.

Unmerged revisions

=== modified file '.bzrignore'
--- .bzrignore	2017-04-04 13:46:49 +0000
+++ .bzrignore	2017-04-07 22:19:27 +0000
@@ -2,20 +2,16 @@
 docs/api
 build
 build-stamp
+debian/*.debhelper
+debian/*.debhelper.log
+debian/*.substvars
 debian/tmp
 debian/files
 debian/landscape-client
-debian/landscape-client.postinst.debhelper
-debian/landscape-client.postrm.debhelper
-debian/landscape-client.prerm.debhelper
-debian/landscape-client.substvars
-debian/landscape-client.debhelper.log
-debian/landscape-common*/
-debian/landscape-common*.debhelper.log
-debian/landscape-common*.postinst.debhelper
-debian/landscape-common*.postrm.debhelper
-debian/landscape-common*.prerm.debhelper
-debian/landscape-common*.substvars
+debian/landscape-client-common
+debian/landscape-sysinfo
+debian/python-landscape-lib
+debian/python3-landscape-lib
 man/landscape-client.1
 man/landscape-config.1
 man/landscape-message.1

=== modified file 'debian/changelog'
--- debian/changelog	2017-04-06 21:27:32 +0000
+++ debian/changelog	2017-04-07 22:19:27 +0000
@@ -3,7 +3,7 @@
   [ Steffen Allner ]
   * New local test build
 
- -- Eric Snow (landscape-dev) <[e-mail]>  Thu, 06 Apr 2017 21:20:37 +0000
+ -- Eric Snow (landscape-dev) <[e-mail]>  Fri, 07 Apr 2017 21:36:04 +0000
 
 landscape-client (17.04-0ubuntu1) UNRELEASED; urgency=medium
 

=== modified file 'debian/control'
--- debian/control	2017-04-06 21:27:32 +0000
+++ debian/control	2017-04-07 22:19:27 +0000
@@ -7,7 +7,7 @@
 Standards-Version: 3.8.2
 XS-Python-Version: >= 2.4, << 2.8
 
-Package: landscape-common
+Package: python-landscape-lib
 Architecture: any
 Depends: ${python:Depends}, ${misc:Depends}, ${extra:Depends},
          ${shlibs:Depends},
@@ -24,10 +24,13 @@
          lshw,
          libpam-modules
 Suggests: ${extra:Suggests}
-Breaks: landscape-client-ui (<< 16.04), landscape-client-ui-install (<< 16.04)
-Replaces: landscape-client-ui (<< 16.04), landscape-client-ui-install (<< 16.04)
-Conflicts: landscape-common3
-Description: Landscape administration system client - Common files
+Breaks: landscape-client-ui (<< 16.04),
+        landscape-client-ui-install (<< 16.04),
+        landscape-common (<< 17.04)
+Replaces: landscape-client-ui (<< 16.04),
+          landscape-client-ui-install (<< 16.04),
+          landscape-common (<< 17.04)
+Description: Landscape administration system client - Python 2 lib
  Landscape is a web-based tool for managing Ubuntu systems. This
  package is necessary if you want your machine to be managed in a
  Landscape account.
@@ -35,7 +38,7 @@
  This package provides the core libraries.
 XB-Python-Version: ${python:Versions}
 
-Package: landscape-common3
+Package: python3-landscape-lib
 Architecture: any
 Depends: ${python:Depends}, ${misc:Depends}, ${extra:Depends},
          ${shlibs:Depends},
@@ -52,10 +55,13 @@
          lshw,
          libpam-modules
 Suggests: ${extra:Suggests}
-Breaks: landscape-client-ui (<< 16.04), landscape-client-ui-install (<< 16.04)
-Replaces: landscape-client-ui (<< 16.04), landscape-client-ui-install (<< 16.04)
-Conflicts: landscape-common
-Description: Landscape administration system client - Common files
+Breaks: landscape-client-ui (<< 16.04),
+        landscape-client-ui-install (<< 16.04),
+        landscape-common3 (<< 17.04)
+Replaces: landscape-client-ui (<< 16.04),
+          landscape-client-ui-install (<< 16.04),
+          landscape-common3 (<< 17.04)
+Description: Landscape administration system client - Python 3 lib
  Landscape is a web-based tool for managing Ubuntu systems. This
  package is necessary if you want your machine to be managed in a
  Landscape account.
@@ -63,13 +69,50 @@
  This package provides the core libraries.
 XB-Python-Version: ${python:Versions}
 
+Package: landscape-client-common
+Architecture: any
+Depends: ${misc:Depends}, ${extra:Depends}, ${shlibs:Depends},
+         adduser,
+         libpam-modules
+Suggests: ${extra:Suggests}
+Breaks: landscape-client-ui (<< 16.04),
+        landscape-client-ui-install (<< 16.04),
+        landscape-common (<< 17.04)
+Conflicts: landscape-common (<< 17.04), landscape-common3 (<< 17.04)
+Description: Landscape administration system client - Common setup
+ Landscape is a web-based tool for managing Ubuntu systems. This
+ package is necessary if you want your machine to be managed in a
+ Landscape account.
+ .
+ This package provides the base setup for other packages related
+ to the Landscape client.
+
+Package: landscape-sysinfo
+Architecture: any
+Depends: ${python:Depends}, ${misc:Depends}, ${extra:Depends},
+         ${shlibs:Depends},
+         landscape-client-common (= ${binary:Version}),
+         python3-twisted,
+         python3-landscape-lib (= ${binary:Version})
+Suggests: ${extra:Suggests}
+Description: Landscape administration system client - sysinfo tool
+ Landscape is a web-based tool for managing Ubuntu systems. This
+ package is necessary if you want your machine to be managed in a
+ Landscape account.
+ .
+ This package provides the landscape-sysinfo tool that Landscape uses
+ to get information about the host.
+XB-Python-Version: ${python:Versions}
+
 Package: landscape-client
 Architecture: any
 Depends: ${python:Depends}, ${misc:Depends}, ${extra:Depends},
          ${shlibs:Depends},
+         landscape-client-common (= ${binary:Version}),
+         landscape-sysinfo (= ${binary:Version}),
          python3-twisted,
          python3-pycurl,
-         landscape-common3 (= ${binary:Version})
+         python3-landscape-lib (= ${binary:Version})
 Suggests: ${extra:Suggests}
 Description: Landscape administration system client
  Landscape is a web-based tool for managing Ubuntu systems. This

=== added file 'debian/landscape-client-common.dirs'
--- debian/landscape-client-common.dirs	1970-01-01 00:00:00 +0000
+++ debian/landscape-client-common.dirs	2017-04-07 22:19:27 +0000
@@ -0,0 +1,3 @@
+etc/landscape
+var/lib/landscape
+var/log/landscape

=== added file 'debian/landscape-client-common.postinst'
--- debian/landscape-client-common.postinst	1970-01-01 00:00:00 +0000
+++ debian/landscape-client-common.postinst	2017-04-07 22:19:27 +0000
@@ -0,0 +1,84 @@
+#!/bin/sh
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+. /usr/share/debconf/confmodule
+trap "db_stop || true" EXIT HUP INT QUIT TERM
+
+PACKAGE=landscape-client-common
+
+# Use the default installed Python.  Running just "python" might run
+# something from /usr/local/bin, which doesn't necessarily support
+# running the landscape client.
+PYTHON=/usr/bin/python
+
+case "$1" in
+    configure)
+
+        # 0.9.1 introduces non-backwards compatible changes.  This detects
+        # whether or not the data is in the current format.  If not, all
+        # existing data is removed.
+        DATA_DIR=/var/lib/landscape
+
+        if [ -d $DATA_DIR/data ]; then
+            rm -rf $DATA_DIR/*
+        elif [ -f $DATA_DIR/client/data.bpickle ]; then
+            LAST_BYTE=`sed -n '$,$s/.*\(.\)/\1/p' $DATA_DIR/client/data.bpickle`
+            if [ "$LAST_BYTE" = e ]; then
+                rm -rf $DATA_DIR/*
+            fi
+        fi
+
+        # Create landscape system user
+        if ! getent passwd landscape >/dev/null; then
+            adduser --quiet --system --group --disabled-password \
+                --home /var/lib/landscape --no-create-home landscape
+        fi
+
+        # Create landscape system group (for <= 1.0.29.1-0ubuntu0.9.04.0)
+        if ! getent group landscape >/dev/null; then
+            addgroup --quiet --system landscape
+        fi
+
+        # Ensure primary group is landscape (for <= 1.0.29.1-0ubuntu0.9.04.0)
+        if ! usermod -g landscape landscape > /dev/null 2>&1; then
+          echo "ERROR: usermod -g landscape landscape failed."
+        fi
+
+        # Fix prior ownerships, we exclude the custom-graph-scripts directory
+        # because there might script-generated files that we want to preserve
+        # the ownership of.
+        if [ -d /var/lib/landscape/client ]; then
+            find /var/lib/landscape/client/ -wholename /var/lib/landscape/client/custom-graph-scripts -prune -or -exec chown landscape {} \; > /dev/null 2>&1
+        fi
+        [ -d /var/lib/landscape/.gnupg ] && chown -R landscape /var/lib/landscape/.gnupg || :
+        chown -R landscape /var/log/landscape
+
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

=== added file 'debian/landscape-client-common.postrm'
--- debian/landscape-client-common.postrm	1970-01-01 00:00:00 +0000
+++ debian/landscape-client-common.postrm	2017-04-07 22:19:27 +0000
@@ -0,0 +1,38 @@
+#!/bin/sh
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+    purge)
+        CONFIG_FILE=/etc/landscape/client.conf
+        deluser --quiet --system landscape >/dev/null || true
+        rm -f "${CONFIG_FILE}"
+    ;;
+
+    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

=== removed file 'debian/landscape-common.config'
--- debian/landscape-common.config	2017-04-04 13:46:49 +0000
+++ debian/landscape-common.config	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-PACKAGE=landscape-common
-
-set -e
-. /usr/share/debconf/confmodule
-
-# Ask questions.
-db_input medium $PACKAGE/sysinfo || true
-db_go

=== removed file 'debian/landscape-common.dirs'
--- debian/landscape-common.dirs	2017-04-07 18:52:18 +0000
+++ debian/landscape-common.dirs	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-etc/update-motd.d
-etc/landscape
-var/lib/landscape
-var/log/landscape

=== removed file 'debian/landscape-common.manpages'
--- debian/landscape-common.manpages	2017-04-04 13:46:49 +0000
+++ debian/landscape-common.manpages	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-man/landscape-sysinfo.1

=== removed file 'debian/landscape-common.postinst'
--- debian/landscape-common.postinst	2017-04-04 13:46:49 +0000
+++ debian/landscape-common.postinst	1970-01-01 00:00:00 +0000
@@ -1,110 +0,0 @@
-#!/bin/sh
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-. /usr/share/debconf/confmodule
-trap "db_stop || true" EXIT HUP INT QUIT TERM
-
-PACKAGE=landscape-common
-
-# Use the default installed Python.  Running just "python" might run
-# something from /usr/local/bin, which doesn't necessarily support
-# running the landscape client.
-PYTHON=/usr/bin/python
-
-case "$1" in
-    configure)
-
-       # Since motd shows a different number of security updates, suppress the message
-       dpkg-divert --package landscape-common --rename /etc/update-motd.d/90-updates-available
-
-       db_get $PACKAGE/sysinfo
-       # Choices:
-       #  * Do not display sysinfo on login
-       #  * Cache sysinfo in /etc/motd
-       #  * Run sysinfo on every login
-       SYSINFO="${RET:-Cache sysinfo in /etc/motd}"
-       WRAPPER=/usr/share/landscape/landscape-sysinfo.wrapper
-       PROFILE_LOCATION=/etc/profile.d/50-landscape-sysinfo.sh
-       UPDATE_MOTD_LOCATION=/etc/update-motd.d/50-landscape-sysinfo
-       if [ "$RET" = "Cache sysinfo in /etc/motd" ]; then
-           rm -f $PROFILE_LOCATION 2>/dev/null || true
-           ln -sf $WRAPPER $UPDATE_MOTD_LOCATION
-           update-motd 2>/dev/null || true
-       elif [ "$RET" = "Run sysinfo on every login" ]; then
-           rm -f $UPDATE_MOTD_LOCATION 2>/dev/null || true
-           update-motd 2>/dev/null || true
-           ln -sf $WRAPPER $PROFILE_LOCATION
-       else
-           rm -f $UPDATE_MOTD_LOCATION 2>/dev/null || true
-           update-motd 2>/dev/null || true
-           rm -f $PROFILE_LOCATION || true
-       fi
-
-        # 0.9.1 introduces non-backwards compatible changes.  This detects
-        # whether or not the data is in the current format.  If not, all
-        # existing data is removed.
-        DATA_DIR=/var/lib/landscape
-
-        if [ -d $DATA_DIR/data ]; then
-            rm -rf $DATA_DIR/*
-        elif [ -f $DATA_DIR/client/data.bpickle ]; then
-            LAST_BYTE=`sed -n '$,$s/.*\(.\)/\1/p' $DATA_DIR/client/data.bpickle`
-            if [ "$LAST_BYTE" = e ]; then
-                rm -rf $DATA_DIR/*
-            fi
-        fi
-
-        # Create landscape system user
-        if ! getent passwd landscape >/dev/null; then
-            adduser --quiet --system --group --disabled-password \
-                --home /var/lib/landscape --no-create-home landscape
-        fi
-
-        # Create landscape system group (for <= 1.0.29.1-0ubuntu0.9.04.0)
-        if ! getent group landscape >/dev/null; then
-            addgroup --quiet --system landscape
-        fi
-
-        # Ensure primary group is landscape (for <= 1.0.29.1-0ubuntu0.9.04.0)
-        if ! usermod -g landscape landscape > /dev/null 2>&1; then
-          echo "ERROR: usermod -g landscape landscape failed."
-        fi
-
-        # Fix prior ownerships, we exclude the custom-graph-scripts directory
-        # because there might script-generated files that we want to preserve
-        # the ownership of.
-        if [ -d /var/lib/landscape/client ]; then
-            find /var/lib/landscape/client/ -wholename /var/lib/landscape/client/custom-graph-scripts -prune -or -exec chown landscape {} \; > /dev/null 2>&1
-        fi
-        [ -d /var/lib/landscape/.gnupg ] && chown -R landscape /var/lib/landscape/.gnupg || :
-        chown -R landscape /var/log/landscape
-
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

=== removed file 'debian/landscape-common.postrm'
--- debian/landscape-common.postrm	2017-04-04 13:46:49 +0000
+++ debian/landscape-common.postrm	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-#!/bin/sh
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
-#          <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-case "$1" in
-    purge)
-        LOG_DIR=/var/log/landscape
-        CONFIG_FILE=/etc/landscape/client.conf
-        deluser --quiet --system landscape >/dev/null || true
-        rm -f "${LOG_DIR}/sysinfo.log"*
-        rm -f "${CONFIG_FILE}"
-    ;;
-
-    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

=== removed file 'debian/landscape-common.prerm'
--- debian/landscape-common.prerm	2017-04-06 20:59:56 +0000
+++ debian/landscape-common.prerm	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-#!/bin/sh
-# prerm script for landscape-common
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <prerm> `remove'
-#        * <old-prerm> `upgrade' <new-version>
-#        * <new-prerm> `failed-upgrade' <old-version>
-#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-#        * <deconfigured's-prerm> `deconfigure' `in-favour'
-#          <package-being-installed> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    remove|upgrade|deconfigure)
-       dpkg-divert --remove --package landscape-common --rename /etc/update-motd.d/90-updates-available
-       rm -f /etc/update-motd.d/50-landscape-sysinfo 2>/dev/null || true
-       update-motd 2>/dev/null || true
-       rm -f /etc/profile.d/landscape-sysinfo.sh 2>/dev/null || true
-    ;;
-
-    failed-upgrade)
-    ;;
-
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

=== removed file 'debian/landscape-common.templates'
--- debian/landscape-common.templates	2017-04-06 20:59:56 +0000
+++ debian/landscape-common.templates	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-Template: landscape-common/sysinfo
-Type: select
-# Translators beware! the following three strings form a single
-# Choices menu. - Every one of these strings has to fit in a standard
-# 80 characters console, as the fancy screen setup takes up some space
-# try to keep below ~71 characters.
-# DO NOT USE commas (,) in Choices translations otherwise
-# this will break the choices shown to users
-__Choices: Do not display sysinfo on login, Cache sysinfo in /etc/motd, Run sysinfo on every login
-Default: Cache sysinfo in /etc/motd
-_Description: landscape-sysinfo configuration:
- Landscape includes a tool and a set of modules that can display
- system status, information, and statistics on login.
- .
- This information can be gathered periodically (every 10 minutes)
- and automatically written to /etc/motd.  The data could be a few
- minutes out-of-date.
- .
- Or, this information can be gathered at login.  The data will be
- more current, but might introduce a small delay at login.

=== removed file 'debian/landscape-common3.config'
--- debian/landscape-common3.config	2017-03-31 12:05:57 +0000
+++ debian/landscape-common3.config	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-PACKAGE=landscape-common3
-
-set -e
-. /usr/share/debconf/confmodule
-
-# Ask questions.
-db_input medium $PACKAGE/sysinfo || true
-db_go

=== removed file 'debian/landscape-common3.dirs'
--- debian/landscape-common3.dirs	2017-04-07 18:52:18 +0000
+++ debian/landscape-common3.dirs	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-etc/update-motd.d
-etc/landscape
-var/lib/landscape
-var/log/landscape

=== removed file 'debian/landscape-common3.manpages'
--- debian/landscape-common3.manpages	2017-04-06 20:59:56 +0000
+++ debian/landscape-common3.manpages	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-man/landscape-sysinfo.1

=== removed file 'debian/landscape-common3.postinst'
--- debian/landscape-common3.postinst	2017-03-31 12:05:57 +0000
+++ debian/landscape-common3.postinst	1970-01-01 00:00:00 +0000
@@ -1,110 +0,0 @@
-#!/bin/sh
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-. /usr/share/debconf/confmodule
-trap "db_stop || true" EXIT HUP INT QUIT TERM
-
-PACKAGE=landscape-common3
-
-# Use the default installed Python 3.  Running just "python" might run
-# something from /usr/local/bin, which doesn't necessarily support
-# running the landscape client.
-PYTHON=/usr/bin/python3
-
-case "$1" in
-    configure)
-
-       # Since motd shows a different number of security updates, suppress the message
-       dpkg-divert --package landscape-common3 --rename /etc/update-motd.d/90-updates-available
-
-       db_get $PACKAGE/sysinfo
-       # Choices:
-       #  * Do not display sysinfo on login
-       #  * Cache sysinfo in /etc/motd
-       #  * Run sysinfo on every login
-       SYSINFO="${RET:-Cache sysinfo in /etc/motd}"
-       WRAPPER=/usr/share/landscape/landscape-sysinfo.wrapper
-       PROFILE_LOCATION=/etc/profile.d/50-landscape-sysinfo.sh
-       UPDATE_MOTD_LOCATION=/etc/update-motd.d/50-landscape-sysinfo
-       if [ "$RET" = "Cache sysinfo in /etc/motd" ]; then
-           rm -f $PROFILE_LOCATION 2>/dev/null || true
-           ln -sf $WRAPPER $UPDATE_MOTD_LOCATION
-           update-motd 2>/dev/null || true
-       elif [ "$RET" = "Run sysinfo on every login" ]; then
-           rm -f $UPDATE_MOTD_LOCATION 2>/dev/null || true
-           update-motd 2>/dev/null || true
-           ln -sf $WRAPPER $PROFILE_LOCATION
-       else
-           rm -f $UPDATE_MOTD_LOCATION 2>/dev/null || true
-           update-motd 2>/dev/null || true
-           rm -f $PROFILE_LOCATION || true
-       fi
-
-        # 0.9.1 introduces non-backwards compatible changes.  This detects
-        # whether or not the data is in the current format.  If not, all
-        # existing data is removed.
-        DATA_DIR=/var/lib/landscape
-
-        if [ -d $DATA_DIR/data ]; then
-            rm -rf $DATA_DIR/*
-        elif [ -f $DATA_DIR/client/data.bpickle ]; then
-            LAST_BYTE=`sed -n '$,$s/.*\(.\)/\1/p' $DATA_DIR/client/data.bpickle`
-            if [ "$LAST_BYTE" = e ]; then
-                rm -rf $DATA_DIR/*
-            fi
-        fi
-
-        # Create landscape system user
-        if ! getent passwd landscape >/dev/null; then
-            adduser --quiet --system --group --disabled-password \
-                --home /var/lib/landscape --no-create-home landscape
-        fi
-
-        # Create landscape system group (for <= 1.0.29.1-0ubuntu0.9.04.0)
-        if ! getent group landscape >/dev/null; then
-            addgroup --quiet --system landscape
-        fi
-
-        # Ensure primary group is landscape (for <= 1.0.29.1-0ubuntu0.9.04.0)
-        if ! usermod -g landscape landscape > /dev/null 2>&1; then
-          echo "ERROR: usermod -g landscape landscape failed."
-        fi
-
-        # Fix prior ownerships, we exclude the custom-graph-scripts directory
-        # because there might script-generated files that we want to preserve
-        # the ownership of.
-        if [ -d /var/lib/landscape/client ]; then
-            find /var/lib/landscape/client/ -wholename /var/lib/landscape/client/custom-graph-scripts -prune -or -exec chown landscape {} \; > /dev/null 2>&1
-        fi
-        [ -d /var/lib/landscape/.gnupg ] && chown -R landscape /var/lib/landscape/.gnupg || :
-        chown -R landscape /var/log/landscape
-
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

=== removed file 'debian/landscape-common3.postrm'
--- debian/landscape-common3.postrm	2017-04-06 20:59:56 +0000
+++ debian/landscape-common3.postrm	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-#!/bin/sh
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
-#          <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-case "$1" in
-    purge)
-        LOG_DIR=/var/log/landscape
-        CONFIG_FILE=/etc/landscape/client.conf
-        deluser --quiet --system landscape >/dev/null || true
-        rm -f "${LOG_DIR}/sysinfo.log"*
-        rm -f "${CONFIG_FILE}"
-    ;;
-
-    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

=== removed file 'debian/landscape-common3.prerm'
--- debian/landscape-common3.prerm	2017-04-06 20:59:56 +0000
+++ debian/landscape-common3.prerm	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-#!/bin/sh
-# prerm script for landscape-common3
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <prerm> `remove'
-#        * <old-prerm> `upgrade' <new-version>
-#        * <new-prerm> `failed-upgrade' <old-version>
-#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-#        * <deconfigured's-prerm> `deconfigure' `in-favour'
-#          <package-being-installed> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    remove|upgrade|deconfigure)
-       dpkg-divert --remove --package landscape-common3 --rename /etc/update-motd.d/90-updates-available
-       rm -f /etc/update-motd.d/50-landscape-sysinfo 2>/dev/null || true
-       update-motd 2>/dev/null || true
-       rm -f /etc/profile.d/landscape-sysinfo.sh 2>/dev/null || true
-    ;;
-
-    failed-upgrade)
-    ;;
-
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

=== removed file 'debian/landscape-common3.templates'
--- debian/landscape-common3.templates	2017-04-06 20:59:56 +0000
+++ debian/landscape-common3.templates	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-Template: landscape-common3/sysinfo
-Type: select
-# Translators beware! the following three strings form a single
-# Choices menu. - Every one of these strings has to fit in a standard
-# 80 characters console, as the fancy screen setup takes up some space
-# try to keep below ~71 characters.
-# DO NOT USE commas (,) in Choices translations otherwise
-# this will break the choices shown to users
-__Choices: Do not display sysinfo on login, Cache sysinfo in /etc/motd, Run sysinfo on every login
-Default: Cache sysinfo in /etc/motd
-_Description: landscape-sysinfo configuration:
- Landscape includes a tool and a set of modules that can display
- system status, information, and statistics on login.
- .
- This information can be gathered periodically (every 10 minutes)
- and automatically written to /etc/motd.  The data could be a few
- minutes out-of-date.
- .
- Or, this information can be gathered at login.  The data will be
- more current, but might introduce a small delay at login.

=== added file 'debian/landscape-sysinfo.config'
--- debian/landscape-sysinfo.config	1970-01-01 00:00:00 +0000
+++ debian/landscape-sysinfo.config	2017-04-07 22:19:27 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+PACKAGE=landscape-sysinfo
+
+set -e
+. /usr/share/debconf/confmodule
+
+# Ask questions.
+db_input medium $PACKAGE/sysinfo || true
+db_go

=== added file 'debian/landscape-sysinfo.dirs'
--- debian/landscape-sysinfo.dirs	1970-01-01 00:00:00 +0000
+++ debian/landscape-sysinfo.dirs	2017-04-07 22:19:27 +0000
@@ -0,0 +1,2 @@
+etc/profile.d
+etc/update-motd.d

=== added file 'debian/landscape-sysinfo.install'
--- debian/landscape-sysinfo.install	1970-01-01 00:00:00 +0000
+++ debian/landscape-sysinfo.install	2017-04-07 22:19:27 +0000
@@ -0,0 +1,2 @@
+usr/bin/landscape-sysinfo
+usr/share/landscape/landscape-sysinfo.wrapper

=== added file 'debian/landscape-sysinfo.manpages'
--- debian/landscape-sysinfo.manpages	1970-01-01 00:00:00 +0000
+++ debian/landscape-sysinfo.manpages	2017-04-07 22:19:27 +0000
@@ -0,0 +1,1 @@
+man/landscape-sysinfo.1

=== added file 'debian/landscape-sysinfo.postinst'
--- debian/landscape-sysinfo.postinst	1970-01-01 00:00:00 +0000
+++ debian/landscape-sysinfo.postinst	2017-04-07 22:19:27 +0000
@@ -0,0 +1,73 @@
+#!/bin/sh
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+. /usr/share/debconf/confmodule
+trap "db_stop || true" EXIT HUP INT QUIT TERM
+
+PACKAGE=landscape-sysinfo
+
+# Use the default installed Python 3.  Running just "python3" might run
+# something from /usr/local/bin, which doesn't necessarily support
+# running the landscape client.
+PYTHON=/usr/bin/python3
+
+case "$1" in
+    configure)
+
+       # Since motd shows a different number of security updates, suppress the message
+       dpkg-divert --package landscape-sysinfo --rename /etc/update-motd.d/90-updates-available
+
+       db_get $PACKAGE/sysinfo
+       # Choices:
+       #  * Do not display sysinfo on login
+       #  * Cache sysinfo in /etc/motd
+       #  * Run sysinfo on every login
+       SYSINFO="${RET:-Cache sysinfo in /etc/motd}"
+       WRAPPER=/usr/share/landscape/landscape-sysinfo.wrapper
+       PROFILE_LOCATION=/etc/profile.d/50-landscape-sysinfo.sh
+       UPDATE_MOTD_LOCATION=/etc/update-motd.d/50-landscape-sysinfo
+       if [ "$RET" = "Cache sysinfo in /etc/motd" ]; then
+           rm -f $PROFILE_LOCATION 2>/dev/null || true
+           ln -sf $WRAPPER $UPDATE_MOTD_LOCATION
+           update-motd 2>/dev/null || true
+       elif [ "$RET" = "Run sysinfo on every login" ]; then
+           rm -f $UPDATE_MOTD_LOCATION 2>/dev/null || true
+           update-motd 2>/dev/null || true
+           ln -sf $WRAPPER $PROFILE_LOCATION
+       else
+           rm -f $UPDATE_MOTD_LOCATION 2>/dev/null || true
+           update-motd 2>/dev/null || true
+           rm -f $PROFILE_LOCATION || true
+       fi
+
+       # We rely on landscape-common to create the user and log dir.
+
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

=== added file 'debian/landscape-sysinfo.postrm'
--- debian/landscape-sysinfo.postrm	1970-01-01 00:00:00 +0000
+++ debian/landscape-sysinfo.postrm	2017-04-07 22:19:27 +0000
@@ -0,0 +1,37 @@
+#!/bin/sh
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+    purge)
+        LOG_DIR=/var/log/landscape
+        rm -f "${LOG_DIR}/sysinfo.log"*
+    ;;
+
+    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

=== added file 'debian/landscape-sysinfo.prerm'
--- debian/landscape-sysinfo.prerm	1970-01-01 00:00:00 +0000
+++ debian/landscape-sysinfo.prerm	2017-04-07 22:19:27 +0000
@@ -0,0 +1,42 @@
+#!/bin/sh
+# prerm script for landscape-sysinfo
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove|upgrade|deconfigure)
+       dpkg-divert --remove --package landscape-sysinfo --rename /etc/update-motd.d/90-updates-available
+       rm -f /etc/update-motd.d/50-landscape-sysinfo 2>/dev/null || true
+       update-motd 2>/dev/null || true
+       rm -f /etc/profile.d/landscape-sysinfo.sh 2>/dev/null || true
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

=== added file 'debian/landscape-sysinfo.templates'
--- debian/landscape-sysinfo.templates	1970-01-01 00:00:00 +0000
+++ debian/landscape-sysinfo.templates	2017-04-07 22:19:27 +0000
@@ -0,0 +1,20 @@
+Template: landscape-sysinfo/sysinfo
+Type: select
+# Translators beware! the following three strings form a single
+# Choices menu. - Every one of these strings has to fit in a standard
+# 80 characters console, as the fancy screen setup takes up some space
+# try to keep below ~71 characters.
+# DO NOT USE commas (,) in Choices translations otherwise
+# this will break the choices shown to users
+__Choices: Do not display sysinfo on login, Cache sysinfo in /etc/motd, Run sysinfo on every login
+Default: Cache sysinfo in /etc/motd
+_Description: landscape-sysinfo configuration:
+ Landscape includes a tool and a set of modules that can display
+ system status, information, and statistics on login.
+ .
+ This information can be gathered periodically (every 10 minutes)
+ and automatically written to /etc/motd.  The data could be a few
+ minutes out-of-date.
+ .
+ Or, this information can be gathered at login.  The data will be
+ more current, but might introduce a small delay at login.

=== renamed file 'debian/landscape-common.install' => 'debian/python-landscape-lib.install'
--- debian/landscape-common.install	2017-04-06 21:08:46 +0000
+++ debian/python-landscape-lib.install	2017-04-07 22:19:27 +0000
@@ -1,3 +1,1 @@
 usr/lib/python2*
-usr/bin/landscape-sysinfo
-usr/share/landscape/landscape-sysinfo.wrapper

=== renamed file 'debian/landscape-common3.install' => 'debian/python3-landscape-lib.install'
--- debian/landscape-common3.install	2017-04-06 21:08:46 +0000
+++ debian/python3-landscape-lib.install	2017-04-07 22:19:27 +0000
@@ -1,3 +1,1 @@
 usr/lib/python3*
-usr/bin/landscape-sysinfo
-usr/share/landscape/landscape-sysinfo.wrapper

=== modified file 'debian/rules'
--- debian/rules	2017-04-07 18:52:18 +0000
+++ debian/rules	2017-04-07 22:19:27 +0000
@@ -2,7 +2,7 @@
 
 dist_release := $(shell lsb_release -cs)
 
-dh_extra_flags = -plandscape-common -plandscape-common3 -plandscape-client
+dh_extra_flags = -ppython-landscape-lib -ppython3-landscape-lib -plandscape-client-common -plandscape-client -plandscape-sysinfo
 
 -include /usr/share/python/python.mk
 ifeq (,$(py_sitename))
@@ -17,8 +17,8 @@
 
 revision = $(shell dpkg-parsechangelog | grep ^Version | cut -f 2 -d " "| cut -f 2 -d "-")
 
-landscape_common_substvars = debian/landscape-common.substvars
-landscape_common3_substvars = debian/landscape-common3.substvars
+python_landscape_lib_substvars = debian/python-landscape-lib.substvars
+python3_landscape_lib_substvars = debian/python3-landscape-lib.substvars
 landscape_client_substvars = debian/landscape-client.substvars
 
 build-arch: build
@@ -77,8 +77,8 @@
 
 # from quantal onwards, we don't want python-gnupginterface anymore (#1045237)
 ifneq (,$(filter $(dist_release),lucid precise))
-	echo "extra:Depends=python-gnupginterface" >> $(landscape_common_substvars)
-	echo "extra:Depends=python-gnupginterface" >> $(landscape_common3_substvars)
+	echo "extra:Depends=python-gnupginterface" >> $(python_landscape_lib_substvars)
+	echo "extra:Depends=python-gnupginterface" >> $(python3_landscape_lib_substvars)
 endif
 
 # In xenial the client needs to depend on libpam-systemd (#1590838)