Music Lens

Merge lp:~stolowski/unity-lens-music/fix-scope-ids into lp:~unity-team/unity-lens-music/libunity7-compatible

  1. fix-scope-ids
  2. Merge into libunity7-compatible
Proposed by Paweł Stołowski
Status: Merged
Approved by: Michal Hruby
Approved revision: 148
Merged at revision: 146
Proposed branch: lp:~stolowski/unity-lens-music/fix-scope-ids
Merge into: lp:~unity-team/unity-lens-music/libunity7-compatible
Diff against target: 58 lines (+8/-8)
4 files modified
Makefile.am (+2/-2)
configure.ac (+2/-2)
debian/unity-lens-music.install (+2/-2)
po/POTFILES.in (+2/-2)
To merge this branch: bzr merge lp:~stolowski/unity-lens-music/fix-scope-ids
Reviewer Review Type Date Requested Status
Michal Hruby (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+160181@code.launchpad.net

Commit message

Fixed scope ids.

Description of the change

Fixed scope ids.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:146
http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-music-libunity7-compatible-ci/10/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-music-libunity7-compatible-raring-amd64-ci/10/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-lens-music-libunity7-compatible-ci/10/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michal Hruby (mhr3) wrote :

Missing configure.ac changes.

review: Needs Fixing
lp:~stolowski/unity-lens-music/fix-scope-ids updated
147. By Paweł Stołowski

Updated configure.ac and debian install file.

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

FAILED: Continuous integration, rev:147
http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-music-libunity7-compatible-ci/11/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-music-libunity7-compatible-raring-amd64-ci/11/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-lens-music-libunity7-compatible-ci/11/rebuild

review: Needs Fixing (continuous-integration)
lp:~stolowski/unity-lens-music/fix-scope-ids updated
148. By Paweł Stołowski

Updated POTFILES.in.

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

PASSED: Continuous integration, rev:148
http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-music-libunity7-compatible-ci/12/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-music-libunity7-compatible-raring-amd64-ci/12

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-lens-music-libunity7-compatible-ci/12/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michal Hruby (mhr3) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2013-03-14 18:45:38 +0000
3+++ Makefile.am 2013-04-23 08:46:26 +0000
4@@ -4,8 +4,8 @@
5 # Install the music.lens and musicstore.scope files
6 #
7 scope_in_files = \
8- music-banshee.scope.in \
9- music-rhythmbox.scope.in \
10+ banshee.scope.in \
11+ rhythmbox.scope.in \
12 musicstore.scope.in
13 scopedir = $(SCOPESDIR)/music
14 scope_DATA = $(scope_in_files:.scope.in=.scope)
15
16=== renamed file 'music-banshee.scope.in.in' => 'banshee.scope.in.in'
17=== modified file 'configure.ac'
18--- configure.ac 2013-03-19 21:47:35 +0000
19+++ configure.ac 2013-04-23 08:46:26 +0000
20@@ -141,8 +141,8 @@
21 #####################################################
22 AC_CONFIG_FILES([
23 Makefile
24- music-banshee.scope.in
25- music-rhythmbox.scope.in
26+ banshee.scope.in
27+ rhythmbox.scope.in
28 musicstore.scope.in
29 data/Makefile
30 src/Makefile
31
32=== modified file 'debian/unity-lens-music.install'
33--- debian/unity-lens-music.install 2013-03-15 13:11:43 +0000
34+++ debian/unity-lens-music.install 2013-04-23 08:46:26 +0000
35@@ -2,5 +2,5 @@
36 usr/lib/*/unity-lens-music/music-preview-player
37 usr/share/dbus-1/services/unity-scope-music.service
38 usr/share/dbus-1/services/music-preview-player.service
39-usr/share/unity/scopes/music/music-banshee.scope
40-usr/share/unity/scopes/music/music-rhythmbox.scope
41+usr/share/unity/scopes/music/banshee.scope
42+usr/share/unity/scopes/music/rhythmbox.scope
43
44=== modified file 'po/POTFILES.in'
45--- po/POTFILES.in 2013-03-13 14:29:32 +0000
46+++ po/POTFILES.in 2013-04-23 08:46:26 +0000
47@@ -5,7 +5,7 @@
48 src/rhythmbox-scope.vala
49 src/simple-scope.vala
50 src/musicstore-scope.vala
51-[type: gettext/ini]music-banshee.scope.in.in
52-[type: gettext/ini]music-rhythmbox.scope.in.in
53+[type: gettext/ini]banshee.scope.in.in
54+[type: gettext/ini]rhythmbox.scope.in.in
55 [type: gettext/ini]musicstore.scope.in.in
56
57
58=== renamed file 'music-rhythmbox.scope.in.in' => 'rhythmbox.scope.in.in'

Subscribers

People subscribed via source and target branches

to all changes: