Merge into trunk : bug-1443693 : Code : mediascanner2

Status:

Merged

Approved by:

Michi Henning on 2016-09-05

Approved revision:

331

Merged at revision:

332

Proposed branch:

lp://qastaging/~jamesh/mediascanner2/bug-1443693

Merge into:

lp://qastaging/mediascanner2

Diff against target:

12 lines (+7/-0)

1 file modified

debian/mediascanner2.0.dirs (+7/-0)

To merge this branch:

bzr merge lp://qastaging/~jamesh/mediascanner2/bug-1443693

Critical

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Michi Henning (community)		2016-08-31	Approve on 2016-09-05
unity-api-1-bot	continuous-integration		Needs Fixing on 2016-08-31
Review via email: mp+304438@code.qastaging.launchpad.net

Commit message

Add apparmor-easyprof hardware directories to package so AppArmor profile can compile when apparmor-easyprof-ubuntu isn't installed.

Description of the change

Add apparmor-easyprof hardware directories to package so AppArmor profile can compile when apparmor-easyprof-ubuntu isn't installed.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2016-08-31:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-mediascanner2-ci/6/rebuild

FAILED: Continuous integration, rev:331
https://jenkins.canonical.com/unity-api-1/job/lp-mediascanner2-ci/6/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/528/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/534
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/436
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/436
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/436
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/366
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/366/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/366
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/366/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/366
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/366/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/366
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/366/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/366
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/366/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/366/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/366
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/366/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/366
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/366/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/366
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/366/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-mediascanner2-ci/6/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Michi Henning (michihenning) wrote on 2016-09-05:

#

Looks good!

review: Approve

mediascanner2

Merge lp://qastaging/~jamesh/mediascanner2/bug-1443693 into lp://qastaging/mediascanner2

Commit message

Description of the change

Preview Diff

Subscribers