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)

[Renato Araujo Oliveira Filho (renatofilho)]

looks good

review: Approve

[Sergio Schvezov (sergiusens)]

address-book-app.png

also needs to be changed in debian/addres-book-app.install

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/5/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-amd64-ci/5/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/5/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-i386-ci/5/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~bfiller/address-book-app/fix-desktop-file/+merge/172037/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/address-book-app-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-i386-ci/6

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

review: Needs Fixing (continuous-integration)

[Sergio Schvezov (sergiusens)]

ok, jenkins built fine now and I added the commit message for it to land

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== 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 14:01:26 +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 'debian/address-book-app.install'
--- debian/address-book-app.install	2013-06-27 23:14:17 +0000
+++ debian/address-book-app.install	2013-06-28 14:01:26 +0000
@@ -1,4 +1,4 @@
 usr/bin/address-book-app
 usr/share/address-book-app
 usr/share/applications/address-book-app.desktop
-usr/share/icons/hicolor/scalable/apps/address-book-app.svg
+usr/share/icons/hicolor/48x48/apps/address-book-app.png

=== modified file 'src/artwork/CMakeLists.txt'
--- src/artwork/CMakeLists.txt	2013-06-27 20:05:52 +0000
+++ src/artwork/CMakeLists.txt	2013-06-28 14:01:26 +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 14:01:26 +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