Unity Grooveshark Scope

Merge lp:~davidc3/unity-scope-grooveshark/icon-and-description into lp:unity-scope-grooveshark

  1. icon-and-description
  2. Merge into trunk
Proposed by David Callé
Status: Merged
Merged at revision: 41
Proposed branch: lp:~davidc3/unity-scope-grooveshark/icon-and-description
Merge into: lp:unity-scope-grooveshark
Diff against target: 82 lines (+11/-14)
5 files modified
data/grooveshark.scope.in (+5/-5)
data/unity-scope-grooveshark.service (+1/-1)
debian/control (+2/-4)
setup.cfg (+1/-1)
setup.py (+2/-3)
To merge this branch: bzr merge lp:~davidc3/unity-scope-grooveshark/icon-and-description
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Michal Hruby (community) Approve
Review via email: mp+161146@code.launchpad.net

Commit message

Fix display icon and description

Description of the change

Fix display icon and description

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-scope-grooveshark-autolanding/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-grooveshark-raring-amd64-autolanding/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-grooveshark-raring-armhf-autolanding/1/console

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

FAILED: Continuous integration, rev:42
http://jenkins.qa.ubuntu.com/job/unity-scope-grooveshark-ci/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-grooveshark-raring-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-grooveshark-raring-armhf-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-grooveshark-ci/1/rebuild

review: Needs Fixing (continuous-integration)
lp:~davidc3/unity-scope-grooveshark/icon-and-description updated
43. By David Callé

Misc integration fixes

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

FAILED: Continuous integration, rev:43
http://jenkins.qa.ubuntu.com/job/unity-scope-grooveshark-ci/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-grooveshark-raring-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-grooveshark-raring-armhf-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-grooveshark-ci/2/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/grooveshark.scope.in'
2--- data/grooveshark.scope.in 2013-02-21 00:56:34 +0000
3+++ data/grooveshark.scope.in 2013-05-23 13:49:47 +0000
4@@ -1,15 +1,15 @@
5 [Scope]
6 DBusName=com.canonical.Unity.Scope.Music.Grooveshark
7 DBusPath=/com/canonical/unity/scope/music/grooveshark
8-Icon=
9+Icon=/usr/share/icons/unity-icon-theme/places/svg/service-grooveshark.svg
10 _Keywords=music;grooveshark;
11-RequiredMetadata=album[s];artist[s];
12-OptionalMetadata=album_id[u];album_uri[s];
13-Loader=/usr/lib/ubuntu-scopes/grooveshark/unity_grooveshark_daemon.py
14+RequiredMetadata=
15+OptionalMetadata=album_id[u];album_uri[s];album[s];artist[s];
16+Loader=/usr/share/unity-scopes/grooveshark/unity_grooveshark_daemon.py
17 RemoteContent=true
18 Type=music
19 _Name=Grooveshark
20-_Description=Find Grooveshark songs and albums
21+_Description=This is an Ubuntu search plugin that enables information from Grooveshark to be searched and displayed in the Dash underneath the Music header. If you do not wish to search this content source, you can disable this search plugin.
22 _SearchHint=Search Grooveshark
23
24 [Desktop Entry]
25
26=== modified file 'data/unity-scope-grooveshark.service'
27--- data/unity-scope-grooveshark.service 2013-01-09 10:41:41 +0000
28+++ data/unity-scope-grooveshark.service 2013-05-23 13:49:47 +0000
29@@ -1,3 +1,3 @@
30 [D-BUS Service]
31 Name=com.canonical.Unity.Scope.Music.Grooveshark
32-Exec=/usr/lib/ubuntu-scopes/grooveshark/unity_grooveshark_daemon.py
33+Exec=/usr/bin/python3 /usr/share/unity-scopes/scope-runner-dbus.py /usr/share/unity-scopes/grooveshark/unity_grooveshark_daemon.py
34
35=== modified file 'debian/control'
36--- debian/control 2013-02-12 18:39:34 +0000
37+++ debian/control 2013-05-23 13:49:47 +0000
38@@ -7,8 +7,7 @@
39 python3-distutils-extra,
40 pkg-config,
41 python3-nose,
42- gcalctool,
43- gir1.2-unity-5.0 (>= 6.8),
44+ gir1.2-unity-5.0 (>= 7),
45 gir1.2-dee-1.0,
46 gir1.2-glib-2.0,
47 Standards-Version: 3.9.3
48@@ -19,8 +18,7 @@
49 Depends: ${misc:Depends},
50 ${python3:Depends},
51 python3,
52- gcalctool,
53- gir1.2-unity-5.0 (>= 6.8),
54+ gir1.2-unity-5.0 (>= 7),
55 gir1.2-dee-1.0,
56 gir1.2-glib-2.0
57 Description: grooveshark scope for Unity
58
59=== modified file 'setup.cfg'
60--- setup.cfg 2013-02-12 18:39:34 +0000
61+++ setup.cfg 2013-05-23 13:49:47 +0000
62@@ -3,4 +3,4 @@
63
64 [build_i18n]
65 domain=unity-scope-grooveshark
66-desktop_files=[('share/unity/scopes', ('data/grooveshark.scope.in',))]
67+desktop_files=[('share/unity/scopes/music', ('data/grooveshark.scope.in',))]
68
69=== modified file 'setup.py'
70--- setup.py 2013-02-12 18:39:34 +0000
71+++ setup.py 2013-05-23 13:49:47 +0000
72@@ -11,8 +11,7 @@
73 license='GNU General Public License (GPL)',
74 data_files=[
75 ('share/dbus-1/services', ['data/unity-scope-grooveshark.service']),
76- ('share/icons/unity-icon-theme/places/svg', ['data/icons/service-grooveshark.svg']),
77- ('lib/ubuntu-scopes/grooveshark', ['src/unity_grooveshark_daemon.py']),
78- ('lib/ubuntu-scopes/grooveshark', ['src/__init__.py']),
79+# ('share/icons/unity-icon-theme/places/svg', ['data/icons/service-grooveshark.svg']),
80+ ('share/unity-scopes/grooveshark', ['src/unity_grooveshark_daemon.py']),
81 ], cmdclass={'build': build_extra.build_extra,
82 'build_i18n': build_i18n.build_i18n,})

Subscribers

People subscribed via source and target branches

to all changes: