Merge lp:~fboucault/qtcreator-plugin-ubuntu/overlay_for_xenial into lp:qtcreator-plugin-ubuntu

[Florian Boucault]

LXD image build: add overlay for Xenial too

LXD image build: add overlay for Xenial too

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:461
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/47/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4311/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/47/rebuild

review: Needs Fixing (continuous-integration)

[Zoltan Balogh (bzoltan)]

thanks, merged

review: Approve

=== modified file 'share/qtcreator/ubuntu/scripts/usdk-target-build'
--- share/qtcreator/ubuntu/scripts/usdk-target-build	2016-07-06 09:18:16 +0000
+++ share/qtcreator/ubuntu/scripts/usdk-target-build	2016-07-08 08:54:35 +0000
@@ -526,7 +526,7 @@
                 # Pull down signature requirements
                 apt-get -y --force-yes install gnupg ubuntu-keyring
             """).format(target_arch=self.target_arch))
-            if self.series == "vivid":
+            if self.series == "vivid" or self.series == "xenial":
                 finish.write(dedent("""\
                     apt-get -y --force-yes install software-properties-common
                     add-apt-repository -y ppa:{ppa}