Merge lp:~abreu-alexandre/ubuntu-html5-theme/fix-any-architecture into lp:ubuntu-html5-theme

[Alexandre Abreu]

Fix all architecture to any in the debian/control

Fix all architecture to any in the debian/control

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:103
http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-ci/58/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2442
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-trusty-amd64-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-trusty-armhf-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2132
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2444
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2444/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Kyle Nitzsche (knitzsche)]

when I build this branch I see lintian errors:
E: ubuntu-html5-theme source: not-binnmuable-any-depends-all ubuntu-html5-container -> ubuntu-html5-theme
E: ubuntu-html5-container: missing-dependency-on-libc needed by usr/bin/ubuntu-html5-app-launcher

The second one can be "fixed" like as described hereL http://lintian.debian.org/tags/missing-dependency-on-libc.html

[Daniel Holbach (dholbach)]

'all' packages normally don't contain any architecture-specific code. Because it doesn't matter we build 'all' packages on i386 because that's where we used to have the most and fastest builders... I think. If we have arch-specific code we need to use 'any'.

[lp:~abreu-alexandre/ubuntu-html5-theme/fix-any-architecture]

104. By Alexandre Abreu on 2014-01-20

update debian/control deps

105. By Alexandre Abreu on 2014-01-20

update debian/control deps

[Alexandre Abreu (abreu-alexandre)]

updated

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:104
http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-ci/59/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2470
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-trusty-amd64-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-trusty-armhf-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2157
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2472
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2472/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:105
http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-ci/60/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2471
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-trusty-amd64-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-trusty-armhf-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2158
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2473
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2473/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Robert Bruce Park (robru)]

Lintian errors resolved, built successfully for me, thanks!

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-12-06 14:30:37 +0000
+++ debian/control	2014-01-20 15:47:38 +0000
@@ -60,8 +60,9 @@
  for Ubuntu. This package contains autopilot tests for it.
 
 Package: ubuntu-html5-container
-Architecture: all
+Architecture: any
 Depends: ${misc:Depends},
+         ${shlibs:Depends},
          ${python:Depends},
          dpkg-dev,
          libqt5webkit5-qmlwebkitplugin,
@@ -69,7 +70,7 @@
          qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-ubuntu-ui-extras-browser-plugin,
          qmlscene,
-         ubuntu-html5-theme (= ${binary:Version}),
+         ubuntu-html5-theme (= ${source:Version}),
 Description: Ubuntu HTML5 QML container component for HTML5 touch apps.
  This package contains the Ubuntu HTML5 QML component used to embed HTML5
  apps at runtime.

=== modified file 'debian/ubuntu-html5-theme-examples.install'
--- debian/ubuntu-html5-theme-examples.install	2013-11-27 16:33:23 +0000
+++ debian/ubuntu-html5-theme-examples.install	2014-01-20 15:47:38 +0000
@@ -1,3 +1,3 @@
 examples/html5-theme/* usr/share/ubuntu-html5-theme/0.1/examples
 examples/html5-theme/ubuntu-html5-ui-gallery.desktop usr/share/applications
-examples/container/* usr/share/ubuntu-html5-container/examples
\ No newline at end of file
+examples/container/* usr/share/ubuntu-html5-container/examples