Merge lp:~mhall119/ubuntu-app-reviews/vm-lens into lp:~dholbach/ubuntu-app-reviews/vm-lens

Proposed by Michael Hall
Status: Merged
Merged at revision: 11
Proposed branch: lp:~mhall119/ubuntu-app-reviews/vm-lens
Merge into: lp:~dholbach/ubuntu-app-reviews/vm-lens
Diff against target: 54 lines (+6/-6)
4 files modified
debian/rules (+2/-2)
extras-unity-lens-vm.lens (+1/-1)
setup.py (+2/-2)
unity_lens_vm/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~mhall119/ubuntu-app-reviews/vm-lens
Reviewer Review Type Date Requested Status
Daniel Holbach Approve
Review via email: mp+110598@code.launchpad.net

Description of the change

Fix .lens file install directory name and rename the lens icon from .svg to .png

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

You are a hero! Thanks so much! :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/rules'
2--- debian/rules 2012-06-12 17:24:15 +0000
3+++ debian/rules 2012-06-15 18:55:24 +0000
4@@ -15,5 +15,5 @@
5
6 override_dh_gencontrol:
7 dh_gencontrol
8- cp unity-lens-vm.svg ../unity-lens-vm.svg
9- dpkg-distaddfile unity-lens-vm.svg raw-meta-data -
10+ cp unity-lens-vm.png ../unity-lens-vm.png
11+ dpkg-distaddfile unity-lens-vm.png raw-meta-data -
12
13=== modified file 'extras-unity-lens-vm.lens'
14--- extras-unity-lens-vm.lens 2012-06-15 13:46:56 +0000
15+++ extras-unity-lens-vm.lens 2012-06-15 18:55:24 +0000
16@@ -2,7 +2,7 @@
17 DBusName=unity.singlet.lens.vm
18 DBusPath=/unity/singlet/lens/vm
19 Name=Vm
20-Icon=/opt/extras.ubuntu.com/unity-lens-vm/unity-lens-vm.svg
21+Icon=/opt/extras.ubuntu.com/unity-lens-vm/unity-lens-vm.png
22 Description=VM Lens
23 SearchHint=Search Vm
24 #Shortcut=c
25
26=== modified file 'setup.py'
27--- setup.py 2012-06-14 14:39:26 +0000
28+++ setup.py 2012-06-15 18:55:24 +0000
29@@ -65,9 +65,9 @@
30 #long_description='Here a longer description',
31 #url='https://launchpad.net/unity-lens-vm',
32 data_files=[
33- ('share/unity/lenses/extra-unity-lens-vm', ['extras-unity-lens-vm.lens']),
34+ ('share/unity/lenses/extras-unity-lens-vm', ['extras-unity-lens-vm.lens']),
35 ('share/dbus-1/services', ['extras-unity-lens-vm.service']),
36- ('/opt/extras.ubuntu.com/unity-lens-vm', ['unity-lens-vm.svg']),
37+ ('/opt/extras.ubuntu.com/unity-lens-vm', ['unity-lens-vm.png']),
38 ('/opt/extras.ubuntu.com/unity-lens-vm', ['bin/unity-lens-vm']),
39 ],
40 cmdclass={"build": build_extra.build_extra, 'install': InstallAndUpdateDataDirectory}
41
42=== renamed file 'unity-lens-vm.svg' => 'unity-lens-vm.png'
43=== modified file 'unity_lens_vm/__init__.py'
44--- unity_lens_vm/__init__.py 2012-06-12 11:19:04 +0000
45+++ unity_lens_vm/__init__.py 2012-06-15 18:55:24 +0000
46@@ -35,7 +35,7 @@
47 name = 'vm'
48 description = 'VM Lens'
49 search_hint = 'Search VMs'
50- icon = 'unity-lens-vm.svg'
51+ icon = 'unity-lens-vm.png'
52 search_on_blank=True
53
54 vbox_category = IconViewCategory("VirtualBox VMs", 'virtualbox')

Subscribers

People subscribed via source and target branches

to all changes: