Merge lp:~gocept/landscape-client/py3-packages into lp:~landscape/landscape-client/trunk

[Steffen Allner]

Add the landscape-common3 deb package and use it in landscape-client.

This MP changes the debian package build configuration of the project to build a Python 3 driven landscape-client package. This is facilitated through a new landscape-common3 package. The existing landscape-common package, based on Python 2, remains unchanged.

This MP changes the debian package build configuration of the project to build a Python 3 driven landscape-client package. This is facilitated through a new landscape-common3 package. The existing landscape-common package, based on Python 2, remains unchanged.

Please review these changes as I am not so familiar with your building system. This MP should only be merged, when the general issue with client-server and bytes/unicode is solved.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make ci-check
Result: Success
Revno: 1003
Branch: lp:~gocept/landscape-client/py3-packages
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3829/

review: Approve (test results)

[Eric Snow (ericsnowcurrently)]

As noted below, please leave the "landscape-common" package name and share packaging script code as much as possible.

review: Needs Fixing

[Steffen Allner (sallner)]

I was not able to find a nice solution for the shared code on landscape-common.postinst, but would be interested in a working idea. I will apply the symlinks and keep the name, even if this was not specified in the contract.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[Steffen Allner (sallner)]

That looks not nice with the large diff, but apparently deleting and adding the same file does not work so easily with bzr. Maybe we should apply the resulting diff of this MP to a new one.

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-check
Result: Success
Revno: 1006
Branch: lp:~gocept/landscape-client/py3-packages
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3834/

review: Approve (test results)

[Eric Snow (ericsnowcurrently)]

LGTM

The messiness with the diff is unfortunate but fine.

review: Approve

[Free Ekanayaka (free.ekanayaka)]

+1

review: Approve

[Eric Snow (ericsnowcurrently)]

I'm marking this MP as WIP until we have the client-server interaction fully resolved under Python 3.

[Free Ekanayaka (free.ekanayaka)]

The client-server interaction will be addressed separately.

=== modified file '.bzrignore'
--- .bzrignore	2017-01-11 09:22:48 +0000
+++ .bzrignore	2017-04-04 14:00:41 +0000
@@ -10,12 +10,12 @@
 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-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
 man/landscape-client.1
 man/landscape-config.1
 man/landscape-message.1

=== modified file 'Makefile'
--- Makefile	2017-03-30 13:44:12 +0000
+++ Makefile	2017-04-04 14:00:41 +0000
@@ -1,6 +1,6 @@
 PYDOCTOR ?= pydoctor
 TXT2MAN ?= txt2man
-PYTHON ?= python
+PYTHON2 ?= python2
 PYTHON3 ?= python3
 TRIAL_ARGS ?=
 TEST_COMMAND_PY2 = trial --unclean-warnings $(TRIAL_ARGS) landscape
@@ -43,7 +43,7 @@
 
 .PHONY: build2
 build2:
-	$(PYTHON) setup.py build_ext -i
+	$(PYTHON2) setup.py build_ext -i
 
 .PHONY: build3
 build3:
@@ -59,7 +59,7 @@
 check: check2 check3-ready  ## Run all the tests.
 
 .PHONY: check2
-check2: build
+check2: build2
 	LC_ALL=C $(TEST_COMMAND_PY2)
 
 .PHONY: check3

=== modified file 'debian/changelog'
--- debian/changelog	2017-03-27 20:48:26 +0000
+++ debian/changelog	2017-04-04 14:00:41 +0000
@@ -1,3 +1,9 @@
+landscape-client (17.04+bzr1002-0ubuntu0) xenial; urgency=medium
+
+  * New local test build
+
+ -- Steffen Allner <[e-mail]>  Fri, 31 Mar 2017 13:27:26 +0200
+
 landscape-client (17.04-0ubuntu1) UNRELEASED; urgency=medium
 
   * New trunk build

=== modified file 'debian/control'
--- debian/control	2017-01-19 08:34:52 +0000
+++ debian/control	2017-04-04 14:00:41 +0000
@@ -34,13 +34,40 @@
  This package provides the core libraries.
 XB-Python-Version: ${python:Versions}
 
+Package: landscape-common3
+Architecture: any
+Depends: ${python:Depends}, ${misc:Depends}, ${extra:Depends},
+         ${shlibs:Depends},
+         python3-twisted,
+         python3-configobj,
+         python3-apt,
+         python3-passlib,
+         ca-certificates,
+         python3-gdbm,
+         lsb-release,
+         lsb-base,
+         adduser,
+         bc,
+         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)
+Description: 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
+ Landscape account.
+ .
+ This package provides the core libraries.
+XB-Python-Version: ${python:Versions}
+
 Package: landscape-client
 Architecture: any
 Depends: ${python:Depends}, ${misc:Depends}, ${extra:Depends},
          ${shlibs:Depends},
-         python-twisted-web,
-         python-pycurl,
-         landscape-common (= ${binary:Version})
+         python3-twisted,
+         python3-pycurl,
+         landscape-common3 (= ${binary:Version})
 Suggests: ${extra:Suggests}
 Description: Landscape administration system client
  Landscape is a web-based tool for managing Ubuntu systems. This

=== modified file 'debian/landscape-client.postinst'
--- debian/landscape-client.postinst	2017-01-05 11:19:41 +0000
+++ debian/landscape-client.postinst	2017-04-04 14:00:41 +0000
@@ -18,10 +18,10 @@
 
 PACKAGE=landscape-client
 
-# Use the default installed Python.  Running just "python" might run
+# 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/python
+PYTHON=/usr/bin/python3
 
 case "$1" in
     configure)

=== added file 'debian/landscape-common.config'
--- debian/landscape-common.config	1970-01-01 00:00:00 +0000
+++ debian/landscape-common.config	2017-04-04 14:00:41 +0000
@@ -0,0 +1,10 @@
+#!/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.config'
--- debian/landscape-common.config	2009-08-10 15:14:09 +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

=== added file 'debian/landscape-common.dirs'
--- debian/landscape-common.dirs	1970-01-01 00:00:00 +0000
+++ debian/landscape-common.dirs	2017-04-04 14:00:41 +0000
@@ -0,0 +1,1 @@
+etc/update-motd.d

=== removed file 'debian/landscape-common.dirs'
--- debian/landscape-common.dirs	2009-06-08 14:32:33 +0000
+++ debian/landscape-common.dirs	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-etc/update-motd.d

=== added file 'debian/landscape-common.install'
--- debian/landscape-common.install	1970-01-01 00:00:00 +0000
+++ debian/landscape-common.install	2017-04-04 14:00:41 +0000
@@ -0,0 +1,3 @@
+usr/lib/python*
+usr/bin/landscape-sysinfo
+usr/share/landscape/landscape-sysinfo.wrapper

=== removed file 'debian/landscape-common.install'
--- debian/landscape-common.install	2009-06-08 14:32:33 +0000
+++ debian/landscape-common.install	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-usr/lib/python*
-usr/bin/landscape-sysinfo
-usr/share/landscape/landscape-sysinfo.wrapper

=== added file 'debian/landscape-common.manpages'
--- debian/landscape-common.manpages	1970-01-01 00:00:00 +0000
+++ debian/landscape-common.manpages	2017-04-04 14:00:41 +0000
@@ -0,0 +1,1 @@
+man/landscape-sysinfo.1

=== removed file 'debian/landscape-common.manpages'
--- debian/landscape-common.manpages	2012-09-26 14:04:47 +0000
+++ debian/landscape-common.manpages	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-man/landscape-sysinfo.1

=== added file 'debian/landscape-common.postinst'
--- debian/landscape-common.postinst	1970-01-01 00:00:00 +0000
+++ debian/landscape-common.postinst	2017-04-04 14:00:41 +0000
@@ -0,0 +1,110 @@
+#!/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.postinst'
--- debian/landscape-common.postinst	2017-01-18 09:11:59 +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

=== added file 'debian/landscape-common.postrm'
--- debian/landscape-common.postrm	1970-01-01 00:00:00 +0000
+++ debian/landscape-common.postrm	2017-04-04 14:00:41 +0000
@@ -0,0 +1,40 @@
+#!/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.postrm'
--- debian/landscape-common.postrm	2012-03-07 16:26:01 +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

=== added file 'debian/landscape-common.prerm'
--- debian/landscape-common.prerm	1970-01-01 00:00:00 +0000
+++ debian/landscape-common.prerm	2017-04-04 14:00:41 +0000
@@ -0,0 +1,42 @@
+#!/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.prerm'
--- debian/landscape-common.prerm	2017-01-18 09:11:59 +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

=== added file 'debian/landscape-common.templates'
--- debian/landscape-common.templates	1970-01-01 00:00:00 +0000
+++ debian/landscape-common.templates	2017-04-04 14:00:41 +0000
@@ -0,0 +1,20 @@
+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-common.templates'
--- debian/landscape-common.templates	2012-05-28 15:14:28 +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.

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

=== added symlink 'debian/landscape-common3.dirs'
=== target is u'landscape-common.dirs'
=== added symlink 'debian/landscape-common3.install'
=== target is u'landscape-common.install'
=== added symlink 'debian/landscape-common3.manpages'
=== target is u'landscape-common.manpages'
=== added file 'debian/landscape-common3.postinst'
--- debian/landscape-common3.postinst	1970-01-01 00:00:00 +0000
+++ debian/landscape-common3.postinst	2017-04-04 14:00:41 +0000
@@ -0,0 +1,110 @@
+#!/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

=== added symlink 'debian/landscape-common3.postrm'
=== target is u'landscape-common.postrm'
=== added symlink 'debian/landscape-common3.prerm'
=== target is u'landscape-common.prerm'
=== added symlink 'debian/landscape-common3.templates'
=== target is u'landscape-common.templates'
=== modified file 'debian/po/POTFILES.in'
--- debian/po/POTFILES.in	2008-09-10 20:10:52 +0000
+++ debian/po/POTFILES.in	2017-04-04 14:00:41 +0000
@@ -1,2 +1,3 @@
 [type: gettext/rfc822deb] landscape-client.templates
 [type: gettext/rfc822deb] landscape-common.templates
+[type: gettext/rfc822deb] landscape-common3.templates

=== modified file 'debian/rules'
--- debian/rules	2017-01-18 09:58:48 +0000
+++ debian/rules	2017-04-04 14:00:41 +0000
@@ -2,7 +2,7 @@
 
 dist_release := $(shell lsb_release -cs)
 
-dh_extra_flags = -plandscape-common -plandscape-client
+dh_extra_flags = -plandscape-common -plandscape-common3 -plandscape-client
 
 -include /usr/share/python/python.mk
 ifeq (,$(py_sitename))
@@ -18,6 +18,7 @@
 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
 landscape_client_substvars = debian/landscape-client.substvars
 
 build-arch: build
@@ -28,7 +29,7 @@
 build-stamp:
 	dh_testdir
 	sed -i -e "s/^DEBIAN_REVISION = \"\"/DEBIAN_REVISION = \"-$(revision)\"/g" landscape/__init__.py
-	python setup.py build
+	python3 setup.py build
 	make -C apt-update
 	touch build-stamp
 
@@ -51,7 +52,7 @@
 		var/log/landscape \
 		usr/share/landscape
 
-	python setup.py install --root $(root_dir) $(py_setup_install_args)
+	python3 setup.py install --root $(root_dir) $(py_setup_install_args)
 
 	# Keep in mind that some installed files are defined in setup.py
 	install -D -o root -g root -m 755 debian/landscape-sysinfo.wrapper $(root_dir)/usr/share/landscape/landscape-sysinfo.wrapper
@@ -79,6 +80,7 @@
 # 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)
 endif
 
 # In xenial the client needs to depend on libpam-systemd (#1590838)

=== modified file 'landscape/__init__.py'
--- landscape/__init__.py	2017-03-21 13:00:17 +0000
+++ landscape/__init__.py	2017-04-04 14:00:41 +0000
@@ -1,5 +1,5 @@
-DEBIAN_REVISION = ""
-UPSTREAM_VERSION = "17.02"
+DEBIAN_REVISION = "-0ubuntu0"
+UPSTREAM_VERSION = "17.04+bzr1002"
 VERSION = "%s%s" % (UPSTREAM_VERSION, DEBIAN_REVISION)
 
 # The minimum server API version that all Landscape servers are known to speak

=== modified file 'scripts/landscape-broker'
--- scripts/landscape-broker	2010-01-06 15:11:24 +0000
+++ scripts/landscape-broker	2017-04-04 14:00:41 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 import sys, os
 if os.path.dirname(os.path.abspath(sys.argv[0])) == os.path.abspath("scripts"):
     sys.path.insert(0, "./")

=== modified file 'scripts/landscape-client'
--- scripts/landscape-client	2010-04-23 14:42:21 +0000
+++ scripts/landscape-client	2017-04-04 14:00:41 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 import sys, os
 if os.path.dirname(os.path.abspath(sys.argv[0])) == os.path.abspath("scripts"):
     sys.path.insert(0, "./")

=== modified file 'scripts/landscape-config'
--- scripts/landscape-config	2009-04-09 14:32:45 +0000
+++ scripts/landscape-config	2017-04-04 14:00:41 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 import sys, os
 if os.path.dirname(os.path.abspath(sys.argv[0])) == os.path.abspath("scripts"):
     sys.path.insert(0, "./")

=== modified file 'scripts/landscape-manager'
--- scripts/landscape-manager	2010-01-06 15:11:24 +0000
+++ scripts/landscape-manager	2017-04-04 14:00:41 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 import sys, os
 if os.path.dirname(os.path.abspath(sys.argv[0])) == os.path.abspath("scripts"):
     sys.path.insert(0, "./")

=== modified file 'scripts/landscape-monitor'
--- scripts/landscape-monitor	2010-01-06 15:11:24 +0000
+++ scripts/landscape-monitor	2017-04-04 14:00:41 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 import sys, os
 if os.path.dirname(os.path.abspath(sys.argv[0])) == os.path.abspath("scripts"):
     sys.path.insert(0, "./")

=== modified file 'scripts/landscape-package-changer'
--- scripts/landscape-package-changer	2008-09-08 17:49:13 +0000
+++ scripts/landscape-package-changer	2017-04-04 14:00:41 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 import sys, os
 if os.path.dirname(os.path.abspath(sys.argv[0])) == os.path.abspath("scripts"):
     sys.path.insert(0, "./")

=== modified file 'scripts/landscape-package-reporter'
--- scripts/landscape-package-reporter	2008-09-08 17:49:13 +0000
+++ scripts/landscape-package-reporter	2017-04-04 14:00:41 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 import sys, os
 if os.path.dirname(os.path.abspath(sys.argv[0])) == os.path.abspath("scripts"):
     sys.path.insert(0, "./")

=== modified file 'scripts/landscape-release-upgrader'
--- scripts/landscape-release-upgrader	2009-10-21 11:00:47 +0000
+++ scripts/landscape-release-upgrader	2017-04-04 14:00:41 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 import sys, os
 if os.path.dirname(os.path.abspath(sys.argv[0])) == os.path.abspath("scripts"):
     sys.path.insert(0, "./")

=== modified file 'scripts/landscape-sysinfo'
--- scripts/landscape-sysinfo	2009-10-08 13:27:31 +0000
+++ scripts/landscape-sysinfo	2017-04-04 14:00:41 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 import sys, os
 
 try: