Merge lp:~lore-mattei/onehundredscopes/photo-precise into lp:~davidc3/onehundredscopes/photo

Proposed by Lorenzo Mattei on 2012-02-24
Status: Merged
Merged at revision: 10
Proposed branch: lp:~lore-mattei/onehundredscopes/photo-precise
Merge into: lp:~davidc3/onehundredscopes/photo
Diff against target: 30 lines (+4/-4)
2 files modified
debian/control (+3/-3)
photo.lens (+1/-1)
To merge this branch: bzr merge lp:~lore-mattei/onehundredscopes/photo-precise
Reviewer Review Type Date Requested Status
David Callé 2012-02-24 Pending
Review via email: mp+94522@code.launchpad.net

Description of the change

Updated lens to look for its icon in Unity 5 folder and updated package to require unity 5.

To post a comment you must log in.
David Callé (davidc3) wrote :

I'm sorry Lorenzo, but I won't have the time to review and merge it until monday.
I'm leaving for the week-end in two minutes...
I'll ping you on IRC when I'm back. Thanks!

Lorenzo Mattei (lore-mattei) wrote :

No problem at all David!
I'll wait your feedback and when these two will be ok I'll be happy to work on flickr-scope too...

Have a nice weekend!
Lorenzo

-----Messaggio originale-----
Da: <email address hidden> [mailto:<email address hidden>] Per conto di David Callé
Inviato: venerdì 24 febbraio 2012 12:35
A: Lorenzo Mattei
Oggetto: Re: [Merge] lp:~lore-mattei/onehundredscopes/photo-precise into lp:~davidc3/onehundredscopes/photo

I'm sorry Lorenzo, but I won't have the time to review and merge it until monday.
I'm leaving for the week-end in two minutes...
I'll ping you on IRC when I'm back. Thanks!
--
https://code.launchpad.net/~lore-mattei/onehundredscopes/photo-precise/+merge/94522
You are the owner of lp:~lore-mattei/onehundredscopes/photo-precise.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2012-01-08 15:28:04 +0000
+++ debian/control 2012-02-24 11:27:17 +0000
@@ -17,10 +17,10 @@
17Depends: ${shlibs:Depends},17Depends: ${shlibs:Depends},
18 ${misc:Depends},18 ${misc:Depends},
19 ${python:Depends},19 ${python:Depends},
20 gir1.2-unity-4.0,20 gir1.2-unity-5.0,
21 gir1.2-dee-0.5,21 gir1.2-dee-0.5,
22Recommends: unity-scope-shotwell,22Recommends: unity-scope-shotwell,
23 unity-scope-flickr23 unity-scope-flickr
24Description: Photo search plugin24Description: A Dash search plug-in to host photo providers
25 A lens to gather your photos form several sources (Shotwell, Flickr, etc.)25 A lens to host search engines dedicated to photos (Shotwell, Flickr, etc.)
2626
2727
=== modified file 'photo.lens'
--- photo.lens 2012-01-02 17:44:10 +0000
+++ photo.lens 2012-02-24 11:27:17 +0000
@@ -2,7 +2,7 @@
2DBusName=net.launchpad.lens.photo2DBusName=net.launchpad.lens.photo
3DBusPath=/net/launchpad/lens/photo3DBusPath=/net/launchpad/lens/photo
4Name=Photo4Name=Photo
5Icon=/usr/share/unity/4/lens-nav-photo.svg5Icon=/usr/share/unity/5/lens-nav-photo.svg
6Description=A Lens for Photos6Description=A Lens for Photos
7SearchHint=Search Photos7SearchHint=Search Photos
8Shortcut=p8Shortcut=p

Subscribers

People subscribed via source and target branches

to all changes: