Unity Media Scanner Scope

Merge lp://staging/~jamesh/unity-scope-mediascanner/remove-old-scope into lp://staging/unity-scope-mediascanner

  1. remove-old-scope
  2. Merge into trunk
Proposed by James Henstridge
Status: Merged
Approved by: Paweł Stołowski
Approved revision: 138
Merged at revision: 158
Proposed branch: lp://staging/~jamesh/unity-scope-mediascanner/remove-old-scope
Merge into: lp://staging/unity-scope-mediascanner
Diff against target: 1702 lines (+1/-1553)
19 files modified
CMakeLists.txt (+0/-6)
data/CMakeLists.txt (+0/-35)
data/music/mediascanner.scope.in (+0/-17)
data/unity-scope-mediascanner.service.in (+0/-3)
data/video/mediascanner.scope.in (+0/-15)
debian/control (+0/-12)
debian/unity-scope-mediascanner.install (+0/-3)
debian/unity-scope-mediascanner2.install (+0/-9)
oldscope/CMakeLists.txt (+0/-17)
oldscope/base-scope.cpp (+0/-192)
oldscope/main.cpp (+0/-81)
oldscope/music-scope.cpp (+0/-263)
oldscope/scope.h (+0/-60)
oldscope/video-scope.cpp (+0/-155)
tests/CMakeLists.txt (+1/-19)
tests/test-old-scope.cpp (+0/-417)
tests/test-with-mediascanner.py (+0/-151)
tests/utils.cpp (+0/-77)
tests/utils.h (+0/-21)
To merge this branch: bzr merge lp://staging/~jamesh/unity-scope-mediascanner/remove-old-scope
Reviewer Review Type Date Requested Status
Paweł Stołowski (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+229420@code.staging.launchpad.net

Commit message

Remove the Unity 7 scope.

Description of the change

Remove the old Unity 7 scope: we only kept it around to ease the transition to the new scopes architecture in Unity 8.

That transition has occurred, and the scope is not being used on the desktop, so it seems like a good time to remove it.

To post a comment you must log in.
lp://staging/~jamesh/unity-scope-mediascanner/remove-old-scope updated
135. By James Henstridge

Remove the scope and D-Bus service files associated with the old scope.

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

FAILED: Continuous integration, rev:134
http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-ci/128/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-amd64-ci/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-armhf-ci/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-i386-ci/30/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-mediascanner-ci/128/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:135
http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-ci/129/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-amd64-ci/31/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-armhf-ci/31/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-i386-ci/31/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-mediascanner-ci/129/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~jamesh/unity-scope-mediascanner/remove-old-scope updated
136. By James Henstridge

Add back libglib2.0-dev requirement: gio is referenced in the
mediascanner-2.0 pkg-config file.

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

FAILED: Continuous integration, rev:136
http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-ci/130/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-amd64-ci/32/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-armhf-ci/32/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-i386-ci/32/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-mediascanner-ci/130/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~jamesh/unity-scope-mediascanner/remove-old-scope updated
137. By James Henstridge

Remove .install file, since we only have a single binary package now.

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

FAILED: Continuous integration, rev:137
http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-ci/131/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-amd64-ci/33/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-armhf-ci/33/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-i386-ci/33/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-mediascanner-ci/131/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~jamesh/unity-scope-mediascanner/remove-old-scope updated
138. By James Henstridge

Merge from trunk, fixing conflicts

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

PASSED: Continuous integration, rev:138
http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-ci/132/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-amd64-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-armhf-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-i386-ci/34

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-mediascanner-ci/132/rebuild

review: Approve (continuous-integration)
Revision history for this message
Paweł Stołowski (stolowski) wrote :

Looks good, thanks! +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: