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/new-debian into lp:ubuntu-filemanager-app.

Commit message:
new debian release.

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

For more details, see:
https://code.launchpad.net/~renatofilho/ubuntu-filemanager-app/new-debian/+merge/319364

*********************** DO NOT MERGE IT YET ******************************

-- 
Your team Ubuntu File Manager Developers is requested to review the proposed merge of lp:~renatofilho/ubuntu-filemanager-app/new-debian into lp:ubuntu-filemanager-app.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-07-14 15:04:49 +0000
+++ CMakeLists.txt	2017-03-09 20:09:08 +0000
@@ -117,6 +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)
 endif(CLICK_MODE)
 
 file(GLOB_RECURSE I18N_SRC_FILES

=== added directory 'debian/apparmor'
=== added file 'debian/apparmor/ubuntu-filemanager-app'
--- debian/apparmor/ubuntu-filemanager-app	1970-01-01 00:00:00 +0000
+++ debian/apparmor/ubuntu-filemanager-app	2017-03-09 20:09:08 +0000
@@ -0,0 +1,15 @@
+# vim:syntax=apparmor
+#include <tunables/global>
+
+# Mostly unconfined. Don't allow capability or any mount rules. Also ensure that
+# exec inherits from this profile
+profile ubuntu-filemanager-app (attach_disconnected) {
+  network,
+  / rwkl,
+  /** rwlkm,
+  /** pix,
+  dbus,
+  signal,
+  ptrace,
+  unix,
+}

=== modified file 'debian/changelog'
--- debian/changelog	2015-12-19 07:34:45 +0000
+++ debian/changelog	2017-03-09 20:09:08 +0000
@@ -1,8 +1,12 @@
-ubuntu-filemanager-app (0.4ubuntu1) UNRELEASED; urgency=medium
+ubuntu-filemanager-app (0.4ubuntu2) UNRELEASED; urgency=medium
 
+  [ Girish Rawat ]
   * Improved READMEs
 
- -- Girish Rawat <emailgirishrawat@xxxxxxxxx>  Sat, 19 Dec 2015 13:03:56 +0530
+  [ renato ]
+  * 
+
+ -- Renato Araujo Oliveira Filho <renato.filho@xxxxxxxxxxxxx>  Wed, 08 Mar 2017 16:28:53 -0300
 
 ubuntu-filemanager-app (0.4) wily; urgency=medium
 

=== modified file 'debian/control'
--- debian/control	2015-06-26 19:36:32 +0000
+++ debian/control	2017-03-09 20:09:08 +0000
@@ -3,6 +3,8 @@
 Maintainer: Ubuntu App Cats <ubuntu-touch-coreapps@xxxxxxxxxxxxxxxxxxx>
 Build-Depends: cmake,
                debhelper (>= 9),
+               dh-apparmor,
+               dh-translations,
                intltool,
                qtbase5-dev,
                qtdeclarative5-dev,
@@ -22,9 +24,9 @@
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+         qml-module-pamauthentication0.1 | qtdeclarative5-fm-pamauthentication0.1,
          qtdeclarative5-nemo-qml-plugin-folderlistmodel,
          qtdeclarative5-placesmodel0.1,
-         qtdeclarative5-fm-pamauthentication0.1,
          qtdeclarative5-archives0.1,
          qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-u1db1.0,

=== modified file 'debian/rules'
--- debian/rules	2014-09-08 10:45:41 +0000
+++ debian/rules	2017-03-09 20:09:08 +0000
@@ -9,3 +9,7 @@
 
 override_dh_auto_configure:
 	dh_auto_configure -- -DCLICK_MODE=OFF
+
+override_dh_install:
+	dh_install --fail-missing
+	dh_apparmor -pubuntu-filemanager-app --profile-name=ubuntu-filemanager-app

=== modified file 'debian/ubuntu-filemanager-app.install'
--- debian/ubuntu-filemanager-app.install	2014-02-04 14:25:27 +0000
+++ debian/ubuntu-filemanager-app.install	2017-03-09 20:09:08 +0000
@@ -1,2 +1,3 @@
 usr/bin/*
 usr/share/*
+debian/apparmor/ubuntu-filemanager-app etc/apparmor.d