ubuntu-touch-coreapps-reviewers team mailing list archive

[Renato Araujo Oliveira Filho <renato.filho@xxxxxxxxxxxxx>]

Renato Araujo Oliveira Filho has proposed merging lp:~renatofilho/ubuntu-filemanager-app/rename_old_click into lp:ubuntu-filemanager-app with lp:~renatofilho/ubuntu-filemanager-app/new-debian as a prerequisite.

Requested reviews:
  Ubuntu File Manager Developers (ubuntu-filemanager-dev)

For more details, see:
https://code.launchpad.net/~renatofilho/ubuntu-filemanager-app/rename_old_click/+merge/319493
-- 
Your team Ubuntu File Manager Developers is requested to review the proposed merge of lp:~renatofilho/ubuntu-filemanager-app/rename_old_click into lp:ubuntu-filemanager-app.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-03-09 20:30:32 +0000
+++ CMakeLists.txt	2017-03-09 20:30:32 +0000
@@ -1,4 +1,4 @@
-project(com.ubuntu.filemanager C CXX)
+project(ubuntu-filemanager-app C CXX)
 cmake_minimum_required(VERSION 2.8.9)
 find_program(INTLTOOL_MERGE intltool-merge)
 find_program(INTLTOOL_EXTRACT intltool-extract)
@@ -117,7 +117,7 @@
     set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_NAME})
     set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE})
     set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
-    install(FILES ${CONTENT_HUB_JSON} DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/content-hub/peers/ RENAME com.ubuntu.filemanager)
+    install(FILES ${CONTENT_HUB_JSON} DESTINATION ${CMAKE_INSTALL_FULL__DATADIR}/content-hub/peers/ RENAME ubuntu-filemanager-app)
 endif(CLICK_MODE)
 
 file(GLOB_RECURSE I18N_SRC_FILES

=== modified file 'manifest.json.in'
--- manifest.json.in	2016-07-14 15:04:49 +0000
+++ manifest.json.in	2017-03-09 20:30:32 +0000
@@ -6,7 +6,7 @@
     "hooks": {
         "filemanager": {
             "apparmor": "filemanager.apparmor",
-            "desktop": "com.ubuntu.filemanager.desktop",
+            "desktop": "ubuntu-filemanager-app.desktop",
             "content-hub": "content-hub.json"
         }
     },

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2014-08-13 08:36:53 +0000
+++ po/CMakeLists.txt	2017-03-09 20:30:32 +0000
@@ -1,7 +1,7 @@
 include(FindGettext)
 find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext)
 
-set(DOMAIN ${PROJECT_NAME})
+set(DOMAIN com.ubuntu.filemanager)
 set(POT_FILE ${DOMAIN}.pot)
 file(GLOB PO_FILES *.po)
 

=== renamed file 'po/com.ubuntu.filemanager.pot' => 'po/ubuntu-filemanager-app.pot'
--- po/com.ubuntu.filemanager.pot	2016-07-18 22:55:32 +0000
+++ po/ubuntu-filemanager-app.pot	2017-03-09 20:30:32 +0000
@@ -18,11 +18,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../armhf-build/po/com.ubuntu.filemanager.desktop.in.in.h:1
-#: ../qbuild/po/com.ubuntu.filemanager.desktop.in.in.h:1
-#: ../sbuild/po/com.ubuntu.filemanager.desktop.in.in.h:1
+#: ../armhf-build/po/ubuntu-filemanager-app.desktop.in.in.h:1
+#: ../qbuild/po/ubuntu-filemanager-app.desktop.in.in.h:1
+#: ../sbuild/po/ubuntu-filemanager-app.desktop.in.in.h:1
 #: ../ssbuild/po/com.ubuntu.filemanager.desktop.in.in.h:1
-#: com.ubuntu.filemanager.desktop.in.in.h:1
+#: ubuntu-filemanager-app.desktop.in.in.h:1
 msgid "File Manager"
 msgstr ""
 

=== renamed file 'com.ubuntu.filemanager.desktop.in.in' => 'ubuntu-filemanager-app.desktop.in.in'