Mir

Merge lp:~bregma/mir/lp-1483472 into lp:mir

  1. lp-1483472
  2. Merge into development-branch
Proposed by Stephen M. Webb
Status: Merged
Approved by: Stephen M. Webb
Approved revision: no longer in the source branch.
Merged at revision: 3260
Proposed branch: lp:~bregma/mir/lp-1483472
Merge into: lp:mir
Diff against target: 9 lines (+1/-1)
1 file modified
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~bregma/mir/lp-1483472
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Kevin DuBois (community) Approve
Alan Griffiths Abstain
Daniel van Vugt Approve
Mir CI Bot continuous-integration Approve
Review via email: mp+283523@code.launchpad.net

Commit message

debian/rules: remove the generated jquery.js script from the -doc package
(LP: #1483472)

Description of the change

Removes the generated jquery.js script from the -doc package because the system-supplied script is the right one to use.

To post a comment you must log in.
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:3257
https://mir-jenkins.ubuntu.com/job/mir-ci/118/
Executed test runs:
    None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/118/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/118/rebuild

review: Approve (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

OK *shrug*

review: Approve
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

I don't understand the stuff under debian enough to know

review: Abstain
Revision history for this message
Kevin DuBois (kdub) wrote :

alright, makes sense that lintian would be happier.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3257
http://jenkins.qa.ubuntu.com/job/mir-ci/6096/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5638
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4546
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5595
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/314
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/420
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/420/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/420
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/420/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5592
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5592/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/8033
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26898
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/310
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/310/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-xenial-touch/166
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26904

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/rules'
2--- debian/rules 2015-09-25 01:42:28 +0000
3+++ debian/rules 2016-01-21 17:53:28 +0000
4@@ -55,4 +55,4 @@
5 # accidentally.
6 -rm debian/tmp/usr/lib/*/libmirprotobuf.so
7 dh_install -p libmirplatform-dev -Xmesa --fail-missing
8- dh_install --remaining-packages --fail-missing
9+ dh_install --remaining-packages --fail-missing -Xjquery.js

Subscribers

People subscribed via source and target branches