Merge lp:~submarine/ubuntu-scopes/colourlovers-dont-ship-service-icon into lp:~submarine/ubuntu-scopes/colourlovers

Proposed by David Callé
Status: Merged
Approved by: Ken VanDine
Approved revision: 23
Merged at revision: 23
Proposed branch: lp:~submarine/ubuntu-scopes/colourlovers-dont-ship-service-icon
Merge into: lp:~submarine/ubuntu-scopes/colourlovers
Diff against target: 11 lines (+0/-1)
1 file modified
setup.py (+0/-1)
To merge this branch: bzr merge lp:~submarine/ubuntu-scopes/colourlovers-dont-ship-service-icon
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Ken VanDine Approve
Review via email: mp+154503@code.launchpad.net

Commit message

Don't install service icon. It exists in unity-asset-pool.

Description of the change

Don't install service icon. It exists in unity-asset-pool.

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks good

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 'setup.py'
--- setup.py 2013-03-14 12:27:35 +0000
+++ setup.py 2013-03-20 20:32:26 +0000
@@ -11,7 +11,6 @@
11 license='GNU General Public License (GPL)',11 license='GNU General Public License (GPL)',
12 data_files=[12 data_files=[
13 ('share/dbus-1/services', ['data/unity-scope-colourlovers.service']),13 ('share/dbus-1/services', ['data/unity-scope-colourlovers.service']),
14 ('share/icons/unity-icon-theme/places/svg', ['data/icons/service-colourlovers.svg']),
15 ('share/unity-scopes/colourlovers', ['src/unity_colourlovers_daemon.py']),14 ('share/unity-scopes/colourlovers', ['src/unity_colourlovers_daemon.py']),
16 ('share/unity-scopes/colourlovers', ['src/__init__.py']),15 ('share/unity-scopes/colourlovers', ['src/__init__.py']),
17 ], cmdclass={'build': build_extra.build_extra,16 ], cmdclass={'build': build_extra.build_extra,

Subscribers

People subscribed via source and target branches

to all changes: