Merge lp:~mzanetti/unity8/patched-control into lp:unity8

[Michael Zanetti]

patch debian/control file before using it to make it work with mk-build-deps

 * Are there any related MPs required for this MP to build/function as expected? Please list.

no

 * Did you perform an exploratory manual test run of your code change and any related functionality?

yes

 * Did you make sure that your branch does not contain spurious tags?

yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

n/a

 * If you changed the UI, has there been a design review?

n/a

[Michał Sawicz (saviq)]

review: Needs Fixing

[lp:~mzanetti/unity8/patched-control]

1546. By Michael Zanetti on 2015-01-12

change it a bit

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1545
http://jenkins.qa.ubuntu.com/job/unity8-ci/5135/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/767
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/299
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/300
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/300
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/667
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/765
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/765/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16994

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1546
http://jenkins.qa.ubuntu.com/job/unity8-ci/5137/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/769
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/301
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/302
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/302
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/669
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/767
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/767/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16997

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

review: Needs Fixing

[lp:~mzanetti/unity8/patched-control]

1547. By Michael Zanetti on 2015-01-12

check on the control file, not the .deb package

[Michał Sawicz (saviq)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Y
 * Did CI run pass? If not, please explain why.
Unrelated fail :/
 * Did you make sure that the branch does not contain spurious tags?
Y

review: Approve

=== modified file 'build.sh'
--- build.sh	2014-11-14 17:47:00 +0000
+++ build.sh	2015-01-12 15:50:34 +0000
@@ -61,7 +61,10 @@
 }
 
 mk_build_deps() {
-    [ ! -f unity8-build-deps*deb -o $CODE_DIR/debian/control -nt unity8-build-deps*deb ] && mk-build-deps --install --root-cmd sudo $CODE_DIR/debian/control
+    if [ ! -f control -o $CODE_DIR/debian/control -nt control ]; then
+        sed 's/\:native//g' $CODE_DIR/debian/control > control
+        mk-build-deps --install --root-cmd sudo control
+    fi
 }
 
 if [ -f "/usr/bin/ccache" ] ; then