Merge ~simpoir/ubuntu/+source/landscape-client:disco-landscape-client-backports-1788219 into ubuntu/+source/landscape-client:ubuntu/disco-devel

Your fixes are changing upstream code directly. You need to create debian/patches/ files for each fix instead, and each patch file needs a DEP3 header. Here is a template of such a header:
Description: <short description, required>
 <long description that can span multiple lines, optional>
Author: <name and email of author, optional>
Origin: upstream, <URL to commit>
Bug: <URL to the upstream bug report if any, implies patch has been forwarded, optional>
Bug-Ubuntu: <URL to the vendor bug report if any, optional>
Last-Update: 2018-05-10 <YYYY-MM-DD, last update of the meta-information, optional>

I tweaked it a bit for the landscape-client use case already.

Quick example:
- create quiltrc config file per https://wiki.debian.org/UsingQuilt#Using_.quiltrc_configuration_file
- patch upstream code as you have
- git diff > debian/patches/<name-of-patch-file-you-want>.patch
- edit debian/patches/series and add the name to the ordered list
- git add the patch and the series file
- revert the source code change
- update the dep3 header per above template (you can also run quilt header -e --dep3 <name-of-patch-file>)
- commit
- apply quilt patch: quilt push -a
- refresh patch, so that the flags specified in quiltrc apply: quilt refresh <name>
- remove patch: quilt pop -a

For d/changelog. please try to use this formatting:
  * d/p/<name-of-patch>: <short description> (LP: #xxxxxx)

The dep3changelog tool can do the above for you, extracting the information from the dep3 header of the patch. It will also tell you if the dep3 header is correct or not.

If a fix needs multiple entries, then what you did with indenting is correct, using "-" for the leve immediatelly after "*".

Thanks for the changes, +1

Tagged and uploaded.