Merge lp:~ericsnowcurrently/landscape-client/sysinfo-package into lp:~landscape/landscape-client/trunk

[Eric Snow]

Factor out a landscape-sysinfo debian package.

This allows us to drop the CONFLICTS constraints in the common packages.

Factor out a landscape-sysinfo debian package.

This allows us to drop the CONFLICTS constraints in the common packages.

Testing instructions:

sudo apt-cache policy landscape-client landscape-common3 landscape-common landscape-sysinfo
make package DEBUILD_OPTS="-us -uc"
sudo apt-get install ../landscape-common_...
sudo apt-get install ../landscape-common3_... # no longer removes landscape-common
sudo apt-get install ../landscape-client_... # fails due to missing landscape-sysinfo
sudo apt-get install ../landscape-sysinfo_...
sudo apt-get install ../landscape-client_... # succeds now
sudo apt-cache policy landscape-client landscape-common3 landscape-common landscape-sysinfo

[lp:~ericsnowcurrently/landscape-client/sysinfo-package]

1014. By Eric Snow on 2017-04-07

Merge from trunk.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[lp:~ericsnowcurrently/landscape-client/sysinfo-package]

1015. By Eric Snow on 2017-04-07

Merge from trunk.

1016. By Eric Snow on 2017-04-07

Merge from trunk.

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make ci-check
Result: Success
Revno: 1014
Branch: lp:~ericsnowcurrently/landscape-client/sysinfo-package
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3863/

review: Approve (test results)

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make ci-check
Result: Success
Revno: 1016
Branch: lp:~ericsnowcurrently/landscape-client/sysinfo-package
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3864/

review: Approve (test results)

[lp:~ericsnowcurrently/landscape-client/sysinfo-package]

1017. By Eric Snow on 2017-04-07

Drop the pycurl dep.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make ci-check
Result: Success
Revno: 1017
Branch: lp:~ericsnowcurrently/landscape-client/sysinfo-package
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3865/

review: Approve (test results)

[Chad Smith (chad.smith)]

Looks like a good 2nd step in factoring out py2-py3 dependencies. Packages files look reasonable for this pass. Attempted installs w/out issue. I'll check followup branches for final pkg details as this implies some upcoming landscape pkg fixes.

review: Approve

[Free Ekanayaka (free.ekanayaka)]

+1

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2017-04-04 13:46:49 +0000
+++ .bzrignore	2017-04-07 21:11:06 +0000
@@ -10,6 +10,12 @@
 debian/landscape-client.prerm.debhelper
 debian/landscape-client.substvars
 debian/landscape-client.debhelper.log
+debian/landscape-sysinfo
+debian/landscape-sysinfo.debhelper.log
+debian/landscape-sysinfo.postinst.debhelper
+debian/landscape-sysinfo.postrm.debhelper
+debian/landscape-sysinfo.prerm.debhelper
+debian/landscape-sysinfo.substvars
 debian/landscape-common*/
 debian/landscape-common*.debhelper.log
 debian/landscape-common*.postinst.debhelper

=== modified file 'debian/changelog'
--- debian/changelog	2017-04-06 21:27:32 +0000
+++ debian/changelog	2017-04-07 21:11:06 +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:10:28 +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 21:11:06 +0000
@@ -26,7 +26,6 @@
 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
  Landscape is a web-based tool for managing Ubuntu systems. This
  package is necessary if you want your machine to be managed in a
@@ -54,7 +53,6 @@
 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
  Landscape is a web-based tool for managing Ubuntu systems. This
  package is necessary if you want your machine to be managed in a
@@ -63,12 +61,29 @@
  This package provides the core libraries.
 XB-Python-Version: ${python:Versions}
 
+Package: landscape-sysinfo
+Architecture: any
+Depends: ${python:Depends}, ${misc:Depends}, ${extra:Depends},
+         ${shlibs:Depends},
+         python3-twisted,
+         landscape-common3 (= ${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},
          python3-twisted,
          python3-pycurl,
+         landscape-sysinfo (= ${binary:Version}),
          landscape-common3 (= ${binary:Version})
 Suggests: ${extra:Suggests}
 Description: Landscape administration system client

=== 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

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

=== 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

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

=== 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

=== modified file 'debian/landscape-common.postinst'
--- debian/landscape-common.postinst	2017-04-04 13:46:49 +0000
+++ debian/landscape-common.postinst	2017-04-07 21:11:06 +0000
@@ -26,32 +26,6 @@
 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.

=== modified file 'debian/landscape-common.postrm'
--- debian/landscape-common.postrm	2017-04-04 13:46:49 +0000
+++ debian/landscape-common.postrm	2017-04-07 21:11:06 +0000
@@ -16,10 +16,8 @@
 
 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}"
     ;;
 

=== 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

=== added file 'debian/landscape-common3.dirs'
--- debian/landscape-common3.dirs	1970-01-01 00:00:00 +0000
+++ debian/landscape-common3.dirs	2017-04-07 21:11:06 +0000
@@ -0,0 +1,3 @@
+etc/landscape
+var/lib/landscape
+var/log/landscape

=== 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

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

=== 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

=== modified file 'debian/landscape-common3.postinst'
--- debian/landscape-common3.postinst	2017-03-31 12:05:57 +0000
+++ debian/landscape-common3.postinst	2017-04-07 21:11:06 +0000
@@ -26,32 +26,6 @@
 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.

=== modified file 'debian/landscape-common3.postrm'
--- debian/landscape-common3.postrm	2017-04-06 20:59:56 +0000
+++ debian/landscape-common3.postrm	2017-04-07 21:11:06 +0000
@@ -16,10 +16,8 @@
 
 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}"
     ;;
 

=== 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 21:11:06 +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 21:11:06 +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 21:11:06 +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 21:11:06 +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 21:11:06 +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 21:11:06 +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 21:11:06 +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 21:11:06 +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.

=== modified file 'debian/rules'
--- debian/rules	2017-04-07 18:52:18 +0000
+++ debian/rules	2017-04-07 21:11:06 +0000
@@ -2,7 +2,7 @@
 
 dist_release := $(shell lsb_release -cs)
 
-dh_extra_flags = -plandscape-common -plandscape-common3 -plandscape-client
+dh_extra_flags = -plandscape-common -plandscape-common3 -plandscape-client -plandscape-sysinfo
 
 -include /usr/share/python/python.mk
 ifeq (,$(py_sitename))