Sync 2.2.6 from Debian Sid

Attached is a debdiff which does this merge.

would you please provide me with a debdiff against 2.2.4 as it's in debian?

Here you are, Mattia. :)

+ - Fix references to the host apt keyring

I don't see this in the debdiff, and if I looked correctly that change has been incorporated in Debian too.
Do you confirm? If so, I'll just drop the line from the changelog and upload.

also, josch just uploaded a new version a few seconds ago :)
While there, I also just asked him if he minded to include this remaining change too, to allow for a sync.

I also sent a bug to debian (josch asked me so) to ask for inclusion of those 2 example files; debbugs seems to have gone AWOL for today, so dunno when i'll have a number.

BTW, when there are simple chnages like this, please consider to file a bug in debian to ask for inclusion of the changes there, instead of keeping a delta (=> more work for ubuntu) :)

That change of "Fix references to the host apt keyring" that you (accidentally) dropped from the debdiff was actually still required.

josch just uploaded another version including everything, so I'll take care of syncing the package once it's possible.

This bug was fixed in the package multistrap - 2.2.7

---------------
multistrap (2.2.7) unstable; urgency=medium

  * Since bash completion was moved away from /etc, invoke rm_conffile in
    maintainer script (Thanks, Helmut Grohne)

 -- Johannes Schauer <email address hidden> Mon, 05 Dec 2016 16:37:21 +0100

multistrap (2.2.6) unstable; urgency=medium

  * Fix value for Dir::Etc::Trusted to point at trusted.gpg outside of
    trusted.gpg.d (Thanks, Steve Langasek)
  * Add Ubuntu examples for Trusty (closes: #847061)

 -- Johannes Schauer <email address hidden> Mon, 05 Dec 2016 15:06:05 +0100

multistrap (2.2.5) unstable; urgency=medium

  * Remove Neil Williams from Uploaders

 -- Johannes Schauer <email address hidden> Mon, 05 Dec 2016 10:14:48 +0100

multistrap (2.2.4) unstable; urgency=medium

  * handle keyring download differently:
      - do not (re)install keyring package on the host system (closes: #787438 )
      - do not disable SecureApt when using fakeroot (closes: #846776)

 -- Johannes Schauer <email address hidden> Sun, 04 Dec 2016 01:37:28 +0100

multistrap (2.2.3) unstable; urgency=medium

  * The B-D-A header doesn't make any sense without Architecture:any packages
    to be built. Move them to B-D-I.

 -- Johannes Schauer <email address hidden> Sat, 03 Dec 2016 22:54:46 +0100

multistrap (2.2.2) unstable; urgency=medium

  * New maintainer (Closes: #835909)
  * Move development to dgit
  * Move B-D on po4a to Build-Depends-Arch (it's not needed for the clean
    target)
  * Bump debhelper compatibility level to 10
  * Switch debian/rules to dh and drop cdbs
  * Use dh_bash-completion to install bash completion script into the right
    location (fixes lintian warning about deprecated /etc/bash_completion.d/)
  * Do not try to feed GPG keybox database version 1 files to apt (closes:
    #845963)
  * Allow uppercase letters in paths (closes: #751896)
  * Allow shell special characters (including spaces) in paths (closes:
    #803365)
  * Stop creating /etc/dpkg/dpkg.cfg.d/multiarch (closes: #819103)

 -- Johannes Schauer <email address hidden> Sat, 03 Dec 2016 18:53:43 +0100