Music Lens

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

  1. bump-control
  2. Merge into 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
=== modified file 'banshee.scope.in.in'
--- banshee.scope.in.in 2013-04-22 18:30:53 +0000
+++ banshee.scope.in.in 2013-04-24 17:05:29 +0000
@@ -1,7 +1,7 @@
1[Scope]1[Scope]
2DBusName=com.canonical.Unity.Scope.Music2DBusName=com.canonical.Unity.Scope.Music
3DBusPath=/com/canonical/unity/scope/banshee3DBusPath=/com/canonical/unity/scope/banshee
4Icon=@prefix@/share/unity/6/lens-nav-music.svg4Icon=@prefix@/share/unity/icons/lens-nav-music.svg
5QueryBinary=banshee5QueryBinary=banshee
6_Name=Music (Banshee)6_Name=Music (Banshee)
7_Description=Find artists, albums, and your favorite tracks7_Description=Find artists, albums, and your favorite tracks
88
=== modified file 'debian/control'
--- debian/control 2013-03-19 21:47:35 +0000
+++ debian/control 2013-04-24 17:05:29 +0000
@@ -16,7 +16,7 @@
16 liboauth-dev,16 liboauth-dev,
17 libdee-dev (>= 1.0.7),17 libdee-dev (>= 1.0.7),
18 libsqlite3-dev (>= 3.7.7),18 libsqlite3-dev (>= 3.7.7),
19 libunity-dev (>= 6.91),19 libunity-dev (>= 6.91.11),
20 libtdb-dev (>= 1.2.6),20 libtdb-dev (>= 1.2.6),
21 libgstreamer1.0-dev,21 libgstreamer1.0-dev,
22 libgstreamer-plugins-base1.0-dev22 libgstreamer-plugins-base1.0-dev
2323
=== modified file 'musicstore.scope.in.in'
--- musicstore.scope.in.in 2013-03-26 12:17:18 +0000
+++ musicstore.scope.in.in 2013-04-24 17:05:29 +0000
@@ -1,7 +1,7 @@
1[Scope]1[Scope]
2DBusName=com.canonical.Unity.Scope.MusicStore2DBusName=com.canonical.Unity.Scope.MusicStore
3DBusPath=/com/canonical/unity/scope/musicstore3DBusPath=/com/canonical/unity/scope/musicstore
4Icon=@prefix@/share/unity/6/lens-nav-music.svg4Icon=@prefix@/share/unity/icons/lens-nav-music.svg
5_Name=Music Store5_Name=Music Store
6_Description=Find artists, albums, and your favorite tracks6_Description=Find artists, albums, and your favorite tracks
7_SearchHint=Search Music Store7_SearchHint=Search Music Store
88
=== modified file 'rhythmbox.scope.in.in'
--- rhythmbox.scope.in.in 2013-04-22 18:30:53 +0000
+++ rhythmbox.scope.in.in 2013-04-24 17:05:29 +0000
@@ -1,7 +1,7 @@
1[Scope]1[Scope]
2DBusName=com.canonical.Unity.Scope.Music2DBusName=com.canonical.Unity.Scope.Music
3DBusPath=/com/canonical/unity/scope/rhythmbox3DBusPath=/com/canonical/unity/scope/rhythmbox
4Icon=@prefix@/share/unity/6/lens-nav-music.svg4Icon=@prefix@/share/unity/icons/lens-nav-music.svg
5QueryBinary=rhythmbox5QueryBinary=rhythmbox
6_Name=Music (Rhythmbox)6_Name=Music (Rhythmbox)
7_Description=Find artists, albums, and your favorite tracks7_Description=Find artists, albums, and your favorite tracks

Subscribers

People subscribed via source and target branches

to all changes: