Merge lp:~michael-sheldon/ubuntu-keyboard/replace-fonts-droid into lp:ubuntu-keyboard

[Michael Sheldon]

Depend on fonts-droid or fonts-droid-fallback, to allow for fonts-droid being removed in the future

Depend on fonts-droid or fonts-droid-fallback, to allow for fonts-droid being removed in the future

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:447
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/669/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6606
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/168
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/169
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/169/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/168
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5019
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6617
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6617/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27835

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/669/rebuild

review: Needs Fixing (continuous-integration)

[lp:~michael-sheldon/ubuntu-keyboard/replace-fonts-droid]

447. By Michael Sheldon on 2016-02-26

Depend on fonts-droid or fonts-droid-fallback

448. By Michael Sheldon on 2016-02-26

Switch order of fonts-droid/fonts-droid-fallback dependencies to clarify that fonts-droid-fallback is preferred in the future

[Ken VanDine (ken-vandine)]

Looks good

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:448
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/670/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6665/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/169
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/170
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/170/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/169
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5059/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6676
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6676/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27933

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/670/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2016-02-08 12:14:54 +0000
+++ debian/control	2016-02-26 15:06:38 +0000
@@ -54,7 +54,7 @@
 
 Package: ubuntu-keyboard-data
 Architecture: all
-Depends: fonts-droid,
+Depends: fonts-droid-fallback | fonts-droid,
          qtdeclarative5-ubuntu-ui-toolkit-plugin,
          ${misc:Depends},
 Description: Ubuntu on-screen keyboard data files