Merge lp:~mhr3/unity-lens-music/bump-control into lp:~unity-team/unity-lens-music/libunity7-compatible

Proposed by Michal Hruby
Status: Merged
Approved by: Andrea Azzarone
Approved revision: 149
Merged at revision: 148
Proposed branch: lp:~mhr3/unity-lens-music/bump-control
Merge into: lp:~unity-team/unity-lens-music/libunity7-compatible
Diff against target: 51 lines (+4/-4)
4 files modified
banshee.scope.in.in (+1/-1)
debian/control (+1/-1)
musicstore.scope.in.in (+1/-1)
rhythmbox.scope.in.in (+1/-1)
To merge this branch: bzr merge lp:~mhr3/unity-lens-music/bump-control
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Andrea Azzarone (community) Approve
Review via email: mp+160710@code.launchpad.net

Commit message

Bump control file, fix icon paths.

Description of the change

Bump control file, fix icon paths.

To post a comment you must log in.
Revision history for this message
Andrea Azzarone (azzar1) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'banshee.scope.in.in'
2--- banshee.scope.in.in 2013-04-22 18:30:53 +0000
3+++ banshee.scope.in.in 2013-04-24 17:05:29 +0000
4@@ -1,7 +1,7 @@
5 [Scope]
6 DBusName=com.canonical.Unity.Scope.Music
7 DBusPath=/com/canonical/unity/scope/banshee
8-Icon=@prefix@/share/unity/6/lens-nav-music.svg
9+Icon=@prefix@/share/unity/icons/lens-nav-music.svg
10 QueryBinary=banshee
11 _Name=Music (Banshee)
12 _Description=Find artists, albums, and your favorite tracks
13
14=== modified file 'debian/control'
15--- debian/control 2013-03-19 21:47:35 +0000
16+++ debian/control 2013-04-24 17:05:29 +0000
17@@ -16,7 +16,7 @@
18 liboauth-dev,
19 libdee-dev (>= 1.0.7),
20 libsqlite3-dev (>= 3.7.7),
21- libunity-dev (>= 6.91),
22+ libunity-dev (>= 6.91.11),
23 libtdb-dev (>= 1.2.6),
24 libgstreamer1.0-dev,
25 libgstreamer-plugins-base1.0-dev
26
27=== modified file 'musicstore.scope.in.in'
28--- musicstore.scope.in.in 2013-03-26 12:17:18 +0000
29+++ musicstore.scope.in.in 2013-04-24 17:05:29 +0000
30@@ -1,7 +1,7 @@
31 [Scope]
32 DBusName=com.canonical.Unity.Scope.MusicStore
33 DBusPath=/com/canonical/unity/scope/musicstore
34-Icon=@prefix@/share/unity/6/lens-nav-music.svg
35+Icon=@prefix@/share/unity/icons/lens-nav-music.svg
36 _Name=Music Store
37 _Description=Find artists, albums, and your favorite tracks
38 _SearchHint=Search Music Store
39
40=== modified file 'rhythmbox.scope.in.in'
41--- rhythmbox.scope.in.in 2013-04-22 18:30:53 +0000
42+++ rhythmbox.scope.in.in 2013-04-24 17:05:29 +0000
43@@ -1,7 +1,7 @@
44 [Scope]
45 DBusName=com.canonical.Unity.Scope.Music
46 DBusPath=/com/canonical/unity/scope/rhythmbox
47-Icon=@prefix@/share/unity/6/lens-nav-music.svg
48+Icon=@prefix@/share/unity/icons/lens-nav-music.svg
49 QueryBinary=rhythmbox
50 _Name=Music (Rhythmbox)
51 _Description=Find artists, albums, and your favorite tracks

Subscribers

People subscribed via source and target branches

to all changes: