Merge lp:~ken-vandine/ubuntu-html5-theme/0.1+13.10.20130916-0ubuntu2 into lp:ubuntu-html5-theme

[Ken VanDine]

Sync changes uploaded to the archive back to trunk

Sync changes uploaded to the archive back to trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:98
http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-ci/55/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2058
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-trusty-amd64-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-trusty-armhf-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1805
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2058
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2058/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-html5-theme-ci/55/rebuild

review: Approve (continuous-integration)

[Robert Bruce Park (robru)]

Hmmm, I thought I did this already, but I guess I'm thinking of a different package.

review: Approve

[Robert Bruce Park (robru)]

Wait, I did do this ;-)

review: Disapprove

Unmerged revisions

98. By Ken VanDine on 2014-01-07

Cherrypick upstream committed packaging fix, to resolve
cross-compilation co-installation: Mark ubuntu-html5-theme Multi-Arch:
foreign.
https://code.launchpad.net/~cjwatson/ubuntu-html5-theme/multiarch-foreign/+merge/194350

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-16 11:34:53 +0000
+++ debian/changelog	2014-01-07 19:07:37 +0000
@@ -1,3 +1,12 @@
+ubuntu-html5-theme (0.1+13.10.20130916-0ubuntu2) trusty; urgency=low
+
+  * Cherrypick upstream committed packaging fix, to resolve
+    cross-compilation co-installation: Mark ubuntu-html5-theme Multi-Arch:
+    foreign.
+    https://code.launchpad.net/~cjwatson/ubuntu-html5-theme/multiarch-foreign/+merge/194350
+
+ -- Dimitri John Ledkov <[e-mail]>  Mon, 06 Jan 2014 05:37:02 +0000
+
 ubuntu-html5-theme (0.1+13.10.20130916-0ubuntu1) saucy; urgency=low
 
   [ daker ]