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

[Bill Filler]

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

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/4/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-amd64-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-i386-ci/4/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/address-book-app-ci/4/rebuild

review: Needs Fixing (continuous-integration)

[lp:~bfiller/address-book-app/fix-desktop-file]

3. By Bill Filler on 2013-06-28

merge from trunk

[Renato Araujo Oliveira Filho (renatofilho)]

looks good

review: Approve

[lp:~bfiller/address-book-app/fix-desktop-file]

4. By Bill Filler on 2013-06-28

fix debian/install

Unmerged revisions

=== modified file 'data/address-book-app.desktop.in'
--- data/address-book-app.desktop.in	2013-06-27 20:05:52 +0000
+++ data/address-book-app.desktop.in	2013-06-28 13:44:28 +0000
@@ -2,7 +2,6 @@
 Encoding=UTF-8
 Version=1.0
 Terminal=false
-NoDisplay=true
 Type=Application
 Name=tr("Address Book")
 GenericName=tr("Address Book")
 
=== modified file 'src/artwork/CMakeLists.txt'
--- src/artwork/CMakeLists.txt	2013-06-27 20:05:52 +0000
+++ src/artwork/CMakeLists.txt	2013-06-28 13:44:28 +0000
@@ -1,5 +1,5 @@
 set(ADDRESS_BOOK_APP_ICON
-	address-book-app.svg
+	address-book-app.png
 )
 
 set(ADDRESS_BOOK_APP_ARTWORK
@@ -11,7 +11,7 @@
 )
 
 install(FILES ${ADDRESS_BOOK_APP_ICON}
-    DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps
+    DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/48x48/apps
 )
 
 install(FILES ${ADDRESS_BOOK_APP_ARTWORK}
 
=== added file 'src/artwork/address-book-app.png'
 Binary 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
=== removed file 'src/artwork/address-book-app.svg'
 Binary 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