Merge lp:~fginther/landscape-client/fix-missing-install-dirs into lp:~landscape/landscape-client/trunk

[Francis Ginther]

Fix missing install directories for landscape-common3 and drop usr/share/landscape as its only used and created by landscape-client.

Fix missing install directories for landscape-common3 and drop usr/share/landscape as its only used and created by landscape-client.

Build a package:
 - dpkg-buildpackage -b -rfakeroot -us -uc

Then install landscape-common3 and landscape-client onto a pristine xenial instance or lxd. The packages should install without error.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make ci-check
Result: Success
Revno: 1008
Branch: lp:~fginther/landscape-client/fix-missing-install-dirs
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3860/

review: Approve (test results)

[Andreas Hasenack (ahasenack)]

+1, packages built and installed fine, and landscape-client also runs correctly with -common3.

review: Approve

[Eric Snow (ericsnowcurrently)]

LGTM

review: Approve

=== modified file 'debian/landscape-common.dirs'
--- debian/landscape-common.dirs	2017-04-04 13:46:49 +0000
+++ debian/landscape-common.dirs	2017-04-07 18:54:02 +0000
@@ -1,1 +1,4 @@
 etc/update-motd.d
+etc/landscape
+var/lib/landscape
+var/log/landscape
 
=== modified file 'debian/landscape-common3.dirs'
--- debian/landscape-common3.dirs	2017-04-06 20:59:56 +0000
+++ debian/landscape-common3.dirs	2017-04-07 18:54:02 +0000
@@ -1,1 +1,4 @@
 etc/update-motd.d
+etc/landscape
+var/lib/landscape
+var/log/landscape
 
=== modified file 'debian/rules'
--- debian/rules	2017-04-06 21:08:46 +0000
+++ debian/rules	2017-04-07 18:54:02 +0000
@@ -47,11 +47,7 @@
 	dh_testdir
 	dh_testroot
 	dh_prep
-	dh_installdirs \
-		etc/landscape \
-		var/lib/landscape \
-		var/log/landscape \
-		usr/share/landscape
+	dh_installdirs
 
 	python2 setup.py install --root $(root_dir) $(py_setup_install_args)
 	python3 setup.py install --root $(root_dir) $(py_setup_install_args)