[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sysui/desktop

[Rene Engelhard]

 sysui/desktop/apparmor/program.oosplash |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit c75166942832c75ca7ab540dc4636ee0b18080cd
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Jan 18 23:11:38 2018 +0100

    deb#887593 add #include <abstractions/X> to oosplash apparmor profile
    
    This quashes
    
    commit 616af7d9bd2e75e4bf9224ef8301c7e6b1b4d972
    Author: Rene Engelhard <rene at debian.org>
    Date:   Thu Jan 18 23:11:38 2018 +0100
    
        deb#887593 add #include <abstractions/X> to oosplash apparmor profile
    
        Change-Id: Ib9595b1e0fe888a6698c3c508a24390d3798b3e4
    
    and parts of
    
    commit d4440ce6b5964d08be1e5841ed301112b260823d
    Author: Rene Engelhard <rene at debian.org>
    Date:   Thu Jan 18 23:19:46 2018 +0100
    
        update copyright years
    
        Change-Id: I634c1132265295f90f624a53b93dddb2b18eabd5
    
    Change-Id: If1409c4c9e0f27c95e1fb57e557153b358774da0
    Reviewed-on: https://gerrit.libreoffice.org/48239
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sysui/desktop/apparmor/program.oosplash b/sysui/desktop/apparmor/program.oosplash
index fef54b7ee384..e044c1afce26 100644
--- a/sysui/desktop/apparmor/program.oosplash
+++ b/sysui/desktop/apparmor/program.oosplash
@@ -1,12 +1,14 @@
 # ------------------------------------------------------------------
 #
 #    Copyright (C) 2016 Canonical Ltd.
+#    Copyright (C) 2018 Software in the Public Interest, Inc.
 #
 #    This Source Code Form is subject to the terms of the Mozilla Public
 #    License, v. 2.0. If a copy of the MPL was not distributed with this
 #    file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 #    Author: Bryan Quigley <bryan.quigley at canonical.com>
+#            Rene Engelhard <rene at debian.org>
 #
 # ------------------------------------------------------------------
 
@@ -14,6 +16,7 @@
 
 profile libreoffice-oopslash INSTDIR-program/oosplash {
   #include <abstractions/base>
+  #include <abstractions/X>
 
   /etc/libreoffice/                     r,
   /etc/libreoffice/**                   r,