Merge lp:~bfiller/address-book-app/fix-desktop-file into lp:address-book-app

Proposed by Bill Filler
Status: Superseded
Proposed branch: lp:~bfiller/address-book-app/fix-desktop-file
Merge into: lp:address-book-app
Diff against target: 36 lines (+2/-3)
2 files modified
data/address-book-app.desktop.in (+0/-1)
src/artwork/CMakeLists.txt (+2/-2)
To merge this branch: bzr merge lp:~bfiller/address-book-app/fix-desktop-file
Reviewer Review Type Date Requested Status
Renato Araujo Oliveira Filho (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+171949@code.launchpad.net

This proposal has been superseded by a proposal from 2013-06-28.

Commit message

fix desktop file so app will display in lens, use temporary png for icon as svg was not valid

Description of the change

fix desktop file so app will display in lens, use temporary png for icon as svg was not valid

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
3. By Bill Filler

merge from trunk

Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

looks good

review: Approve
4. By Bill Filler

fix debian/install

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/address-book-app.desktop.in'
2--- data/address-book-app.desktop.in 2013-06-27 20:05:52 +0000
3+++ data/address-book-app.desktop.in 2013-06-28 13:44:28 +0000
4@@ -2,7 +2,6 @@
5 Encoding=UTF-8
6 Version=1.0
7 Terminal=false
8-NoDisplay=true
9 Type=Application
10 Name=tr("Address Book")
11 GenericName=tr("Address Book")
12
13=== modified file 'src/artwork/CMakeLists.txt'
14--- src/artwork/CMakeLists.txt 2013-06-27 20:05:52 +0000
15+++ src/artwork/CMakeLists.txt 2013-06-28 13:44:28 +0000
16@@ -1,5 +1,5 @@
17 set(ADDRESS_BOOK_APP_ICON
18- address-book-app.svg
19+ address-book-app.png
20 )
21
22 set(ADDRESS_BOOK_APP_ARTWORK
23@@ -11,7 +11,7 @@
24 )
25
26 install(FILES ${ADDRESS_BOOK_APP_ICON}
27- DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps
28+ DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/48x48/apps
29 )
30
31 install(FILES ${ADDRESS_BOOK_APP_ARTWORK}
32
33=== added file 'src/artwork/address-book-app.png'
34Binary files src/artwork/address-book-app.png 1970-01-01 00:00:00 +0000 and src/artwork/address-book-app.png 2013-06-28 13:44:28 +0000 differ
35=== removed file 'src/artwork/address-book-app.svg'
36Binary files src/artwork/address-book-app.svg 2013-06-27 20:05:52 +0000 and src/artwork/address-book-app.svg 1970-01-01 00:00:00 +0000 differ

Subscribers

People subscribed via source and target branches