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.

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

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make ci-check
Result: Success
Revno: 1022
Branch: lp:~ericsnowcurrently/landscape-client/fix-1680875-fix-packaging-conflicts
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3866/

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: 1023
Branch: lp:~ericsnowcurrently/landscape-client/fix-1680875-fix-packaging-conflicts
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3868/

review: Approve (test results)

[Chad Smith (chad.smith)]

+1 thanks for the fixes.

review: Approve

[Free Ekanayaka (free.ekanayaka)]

+1

I think at some point we want to diverge the packaging. Leave only python3-related packaging in lp:landscape-client, and put python2-related packaging separately, since the python2 version will only be relevant for Landscape server, it can be built by Jenkins or a separate lp recipe and won't be uploaded to the Ubuntu archive.

review: Approve

[Eric Snow (ericsnowcurrently)]

@free agreed

[🤖 Landscape Builder (landscape-builder)]

The attempt to merge lp:~ericsnowcurrently/landscape-client/fix-1680875-fix-packaging-conflicts into lp:landscape-client failed. Below is the output from the failed tests.

sudo apt -y install python-twisted-core python-distutils-extra python-mock python-configobj python-passlib
Reading package lists...
Building dependency tree...
Reading state information...
python-configobj is already the newest version (5.0.6-2).
python-mock is already the newest version (1.3.0-2.1ubuntu1).
python-passlib is already the newest version (1.6.5-4).
python-twisted-core is already the newest version (16.0.0-1).
python-distutils-extra is already the newest version (2.39-1).
The following packages were automatically installed and are no longer required:
  golang-check.v1-dev golang-context-dev golang-github-gorilla-mux-dev
  golang-yaml.v2-dev linux-headers-4.4.0-64 linux-headers-4.4.0-64-generic
  linux-headers-4.4.0-66 linux-headers-4.4.0-66-generic linux-headers-4.4.0-70
  linux-headers-4.4.0-70-generic linux-image-4.4.0-64-generic
  linux-image-4.4.0-66-generic linux-image-4.4.0-70-generic
Use 'sudo apt autoremove' to remove them.
0 upgraded, 0 newly installed, 0 to remove and 33 not upgraded.
sudo apt -y install python3-twisted python3-distutils-extra python3-mock python3-configobj python3-passlib
Reading package lists...
Building dependency tree...
Reading state information...
python3-configobj is already the newest version (5.0.6-2).
python3-twisted is already the newest version (16.0.0-1).
python3-distutils-extra is already the newest version (2.39-1).
python3-mock is already the newest version (1.3.0-2.1ubuntu1).
python3-passlib is already the newest version (1.6.5-4).
The following packages were automatically installed and are no longer required:
  golang-check.v1-dev golang-context-dev golang-github-gorilla-mux-dev
  golang-yaml.v2-dev linux-headers-4.4.0-64 linux-headers-4.4.0-64-generic
  linux-headers-4.4.0-66 linux-headers-4.4.0-66-generic linux-headers-4.4.0-70
  linux-headers-4.4.0-70-generic linux-image-4.4.0-64-generic
  linux-image-4.4.0-66-generic linux-image-4.4.0-70-generic
Use 'sudo apt autoremove' to remove them.
0 upgraded, 0 newly installed, 0 to remove and 33 not upgraded.
python2 setup.py build_ext -i
running build_ext
python3 setup.py build_ext -i
running build_ext
LC_ALL=C trial --unclean-warnings -j4 landscape
Running 2187 tests.
landscape.broker.tests.test_amp
  RemoteBrokerTest
    test_call_if_accepted ... [OK]
    test_fire_event ... [OK]
    test_get_accepted_message_types ... [OK]
    test_get_server_uuid ... [OK]
    test_is_message_pending ... [OK]
    test_listen_events ... [OK]
    test_call_if_accepted_with_not_accepted ... [OK]
    test_method_call_error ... [OK]
    test_ping ... [OK]
    test_register_client ... ...

[🤖 Landscape Builder (landscape-builder)]

No approved revision specified.

=== modified file '.bzrignore'
--- .bzrignore	2017-04-07 20:08:33 +0000
+++ .bzrignore	2017-04-10 20:31:06 +0000
@@ -2,26 +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-client-common
 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
-debian/landscape-common*.postrm.debhelper
-debian/landscape-common*.prerm.debhelper
-debian/landscape-common*.substvars
+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-07 21:10:43 +0000
+++ debian/changelog	2017-04-10 20:31:06 +0000
@@ -3,7 +3,7 @@
   [ Steffen Allner ]
   * New local test build
 
- -- Eric Snow (landscape-dev) <[e-mail]>  Fri, 07 Apr 2017 21:10:28 +0000
+ -- Eric Snow (landscape-dev) <[e-mail]>  Mon, 10 Apr 2017 20:29:34 +0000
 
 landscape-client (17.04-0ubuntu1) UNRELEASED; urgency=medium
 

=== modified file 'debian/control'
--- debian/control	2017-04-07 21:10:43 +0000
+++ debian/control	2017-04-10 20:31:06 +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,9 +24,12 @@
          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
+Breaks: landscape-client-ui (<< 16.04),
+        landscape-client-ui-install (<< 16.04)
+Replaces: landscape-client-ui (<< 16.04),
+          landscape-client-ui-install (<< 16.04),
+          landscape-common
+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.
@@ -34,7 +37,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},
@@ -51,9 +54,12 @@
          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
+Breaks: landscape-client-ui (<< 16.04),
+        landscape-client-ui-install (<< 16.04)
+Replaces: landscape-client-ui (<< 16.04),
+          landscape-client-ui-install (<< 16.04),
+          landscape-common3
+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.
@@ -61,12 +67,29 @@
  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}
+Conflicts: landscape-common,
+           landscape-common3
+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,
-         landscape-common3 (= ${binary:Version})
+         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
@@ -81,10 +104,11 @@
 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-sysinfo (= ${binary:Version}),
-         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-10 20:31:06 +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-10 20:31:06 +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-10 20:31:06 +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.dirs'
--- debian/landscape-common.dirs	2017-04-07 20:31:35 +0000
+++ debian/landscape-common.dirs	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-etc/landscape
-var/lib/landscape
-var/log/landscape

=== removed file 'debian/landscape-common.postinst'
--- debian/landscape-common.postinst	2017-04-07 19:58:25 +0000
+++ debian/landscape-common.postinst	1970-01-01 00:00:00 +0000
@@ -1,84 +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)
-
-        # 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-07 19:58:25 +0000
+++ debian/landscape-common.postrm	1970-01-01 00:00:00 +0000
@@ -1,38 +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)
-        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-common3.dirs'
--- debian/landscape-common3.dirs	2017-04-07 20:31:35 +0000
+++ debian/landscape-common3.dirs	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-etc/landscape
-var/lib/landscape
-var/log/landscape

=== removed file 'debian/landscape-common3.postinst'
--- debian/landscape-common3.postinst	2017-04-07 19:58:25 +0000
+++ debian/landscape-common3.postinst	1970-01-01 00:00:00 +0000
@@ -1,84 +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)
-
-        # 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-07 19:58:25 +0000
+++ debian/landscape-common3.postrm	1970-01-01 00:00:00 +0000
@@ -1,38 +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)
-        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

=== renamed file 'debian/landscape-common.install' => 'debian/python-landscape-lib.install'
=== renamed file 'debian/landscape-common3.install' => 'debian/python3-landscape-lib.install'
=== modified file 'debian/rules'
--- debian/rules	2017-04-07 20:31:35 +0000
+++ debian/rules	2017-04-10 20:31:06 +0000
@@ -2,7 +2,7 @@
 
 dist_release := $(shell lsb_release -cs)
 
-dh_extra_flags = -plandscape-common -plandscape-common3 -plandscape-client -plandscape-sysinfo
+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)