[libreoffice] 02/03: fix path in apparmor profiles (add missing /). mv_conffile the files to the new name...

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit 6a18e204a466269983f90db5c97be961fbddc577
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Nov 6 21:52:37 2017 +0100

    fix path in apparmor profiles (add missing /). mv_conffile the files to the new name...
---
 changelog                      | 5 ++++-
 libreoffice-common.maintscript | 6 +++++-
 rules                          | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/changelog b/changelog
index e8f1b9d..e8aa3f4 100644
--- a/changelog
+++ b/changelog
@@ -12,8 +12,11 @@ libreoffice (1:5.4.3-1) unstable; urgency=medium
     also with 1.1.7 and we don't get blocked by mariadb-10.1...
   * debian/libreoffice-sdbc-firebird.maintscript: remove (redundant)
     $DPKG_MAINTSCRIPT_PACKAGE and update version (closes: #880426)
+  * debian/rules, debian/libreoffice-common.maintscript: fix path in
+    apparmor profiles (add missing /). mv_conffile the files to the new
+    name...
 
- -- Rene Engelhard <rene at debian.org>  Sat, 04 Nov 2017 00:50:12 +0000
+ -- Rene Engelhard <rene at debian.org>  Mon, 06 Nov 2017 07:30:33 +0100
 
 libreoffice (1:5.4.3~rc1-2) unstable; urgency=medium
 
diff --git a/libreoffice-common.maintscript b/libreoffice-common.maintscript
index 7a27689..0c3e87d 100644
--- a/libreoffice-common.maintscript
+++ b/libreoffice-common.maintscript
@@ -1 +1,5 @@
-rm_conffile /etc/bash_completion.d/libreoffice.sh 1:5.1.1~rc1-1 $DPKG_MAINTSCRIPT_PACKAGE
+mv_conffile /etc/apparmor.d/usr.lib.libreofficeprogram.oosplash /etc/apparmor.d/usr.lib.libreoffice.program.oosplash 1:5.4.3-1
+mv_conffile /etc/apparmor.d/usr.lib.libreofficeprogram.senddoc /etc/apparmor.d/usr.lib.libreoffice.program.senddoc 1:5.4.3-1
+mv_conffile /etc/apparmor.d/usr.lib.libreofficeprogram.soffice.bin /etc/apparmor.d/usr.lib.libreoffice.program.soffice.bin 1:5.4.3-1
+mv_conffile /etc/apparmor.d/usr.lib.libreofficeprogram.xpdfimport /etc/apparmor.d/usr.lib.libreoffice.program.xpdfimport 1:5.4.3-1
+
diff --git a/rules b/rules
index d065d22..4705297 100755
--- a/rules
+++ b/rules
@@ -3232,7 +3232,7 @@ endif
 
 ifeq "$(INSTALL_APPARMOR_PROFILES)" "y"
 	mkdir -p $(PKGDIR)-common/etc/apparmor.d
-	./sysui/desktop/share/apparmor.sh /$(OODIR) sysui/desktop/apparmor/ \
+	./sysui/desktop/share/apparmor.sh /$(OODIR)/ sysui/desktop/apparmor/ \
 			$(PKGDIR)-common/etc/apparmor.d/ false
 endif
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git