ubuntu-touch-coreapps-reviewers team mailing list archive

[Bartosz Kosiorek <gang65@xxxxxxxxxxxxxx>]

Bartosz Kosiorek has proposed merging lp:~gang65/ubuntu-docviewer-app/ubuntu-docviewer-app-icon-fix into lp:ubuntu-docviewer-app.

Commit message:
Fix missing icon for desktop: #1468418  

Requested reviews:
  Ubuntu Document Viewer Developers (ubuntu-docviewer-dev)
Related bugs:
  Bug #1466518 in Ubuntu Document Viewer App: "Icon not shipped in the .deb package"
  https://bugs.launchpad.net/ubuntu-docviewer-app/+bug/1466518

For more details, see:
https://code.launchpad.net/~gang65/ubuntu-docviewer-app/ubuntu-docviewer-app-icon-fix/+merge/262911

Fix missing icon for desktop: #1468418  
-- 
Your team Ubuntu Document Viewer Developers is requested to review the proposed merge of lp:~gang65/ubuntu-docviewer-app/ubuntu-docviewer-app-icon-fix into lp:ubuntu-docviewer-app.

=== 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 <gang65@xxxxxxxxxxxxxx>  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 <LL@xxxxxx>\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 ""