Merge lp:~gang65/ubuntu-docviewer-app/ubuntu-docviewer-app-icon-fix into lp:ubuntu-docviewer-app/trunk

[Bartosz Kosiorek]

Fix missing icon for desktop: #1468418

Fix missing icon for desktop: #1468418

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:154
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/224/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3009
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3009/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/121
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-vivid-amd64-ci/127

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/224/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

Looks good, and after testing it, works well too. Thanks!

Just a couple of notes that should not block this from landing:

1) On debian/changelog, you can use the "(LP: #<bug number>)" syntax to mark bugs as closed, instead of a URL. See [1] for details.

2) While building the package, Lintian complains with the following errors and warnings:

W: ubuntu-docviewer-app source: diff-contains-bzr-control-dir .bzr
E: ubuntu-docviewer-app source: build-depends-on-metapackage build-depends: qt5-default
E: ubuntu-docviewer-app: missing-dependency-on-libc needed by usr/bin/ubuntu-docviewer-app and 2 others
W: ubuntu-docviewer-app: binary-without-manpage usr/bin/ubuntu-docviewer-app
W: ubuntu-docviewer-app: desktop-mime-but-no-exec-code usr/share/applications/com.ubuntu.docviewer.desktop

I've not looked at all of them, but I think the last one [2] could be fixed by specifying an argument to the Exec line in the .desktop file.

[1] http://packaging.ubuntu.com/html/fixing-a-bug-example.html
[2] https://lintian.debian.org/tags/desktop-mime-but-no-exec-code.html

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-04-20 16:24:06 +0000
+++ CMakeLists.txt	2015-06-24 20:52:38 +0000
@@ -83,7 +83,7 @@
             OUTPUT_STRIP_TRAILING_WHITESPACE
     )
     set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_NAME})
-    set(ICON "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON}")
+    set(ICON "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE}")
     set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
     set(APPLICATION_DIR ${CMAKE_INSTALL_DATADIR}/accounts/applications)
 endif(CLICK_MODE)

=== modified file 'debian/changelog'
--- debian/changelog	2015-02-23 12:49:52 +0000
+++ debian/changelog	2015-06-24 20:52:38 +0000
@@ -1,3 +1,12 @@
+ubuntu-docviewer-app (0.3.154) vivid; urgency=medium
+
+  * Fix missing icon for desktop: #1468418  
+  * Add SD Card support
+  * Code re-factoring. http://pad.lv/1445011
+  * Added tests. http://pad.lv/1418652
+
+ -- Bartosz Kosiorek <[e-mail]>  Wed, 24 Jun 2015 22:51:47 +0100
+
 ubuntu-docviewer-app (0.3.0) utopic; urgency=medium
 
   * Improved content-hub support

=== modified file 'po/com.ubuntu.docviewer.pot'
--- po/com.ubuntu.docviewer.pot	2015-06-22 17:04:27 +0000
+++ po/com.ubuntu.docviewer.pot	2015-06-24 20:52:38 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-22 19:03+0200\n"
+"POT-Creation-Date: 2015-06-24 22:48+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -33,7 +33,7 @@
 msgstr ""
 
 #: ../src/app/docviewer-application.cpp:171
-#: /home/stefano/Progetti/docviewer/build-document-page-filters-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:1
 msgid "Document Viewer"
 msgstr ""
 
@@ -380,6 +380,6 @@
 msgid "Open"
 msgstr ""
 
-#: /home/stefano/Progetti/docviewer/build-document-page-filters-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/m/dev/core/ubuntu-docviewer-app-icon-fix/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr ""