[Git][libreoffice-team/libreoffice/libreoffice][debian-experimental-6.0] 2 commits: back to libreoffice-6-0 branch; update patches
Rene Engelhard
rene at debian.org
Sat Jan 27 13:23:53 UTC 2018
Rene Engelhard pushed to branch debian-experimental-6.0 at Debian LibreOffice Maintainers / libreoffice / libreoffice
Commits:
e4f09d01 by Rene Engelhard at 2018-01-27T14:18:25+01:00
back to libreoffice-6-0 branch; update patches
- - - - -
a7499443 by Rene Engelhard at 2018-01-27T14:21:55+01:00
Merge branch 'debian-experimental-6.0' of salsa.debian.org:libreoffice-team/libreoffice/libreoffice into debian-experimental-6.0
- - - - -
6 changed files:
- changelog
- patches/apparmor-fixes.diff
- − patches/apparmor-updates.diff
- patches/disable-tests-somehow-needing-more-fonts.diff
- patches/series
- rules
Changes:
=====================================
changelog
=====================================
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:6.0.1~rc1~git20181013-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ -- Rene Engelhard <rene at frodo.fritz.box> Sat, 13 Jan 2018 13:34:41 +0100
+
libreoffice (1:6.0.0~rc3-1) experimental; urgency=medium
* New upstream release candidate
=====================================
patches/apparmor-fixes.diff
=====================================
--- a/patches/apparmor-fixes.diff
+++ b/patches/apparmor-fixes.diff
@@ -1,44 +1,7 @@
-diff --git a/sysui/desktop/apparmor/program.oosplash b/sysui/desktop/apparmor/program.oosplash
-index fef54b7ee384..333c0617aa86 100644
---- a/sysui/desktop/apparmor/program.oosplash
-+++ b/sysui/desktop/apparmor/program.oosplash
-@@ -1,19 +1,22 @@
- # ------------------------------------------------------------------
- #
- # 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>
- #
- # ------------------------------------------------------------------
-
- #include <tunables/global>
-
--profile libreoffice-oopslash INSTDIR-program/oosplash {
-+profile libreoffice-oopslash INSTDIR-program/oosplash {
- #include <abstractions/base>
-+ #include <abstractions/X>
-
- /etc/libreoffice/ r,
- /etc/libreoffice/** r,
diff --git a/sysui/desktop/apparmor/program.soffice.bin b/sysui/desktop/apparmor/program.soffice.bin
index a365f6297781..d3df2163d1f6 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
-@@ -1,7 +1,7 @@
- # ------------------------------------------------------------------
- #
- # Copyright (C) 2016 Canonical Ltd.
--# Copyright (C) 2017 Software in the Public Interest, Inc.
-+# 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
@@ -63,7 +63,7 @@
#include <tunables/global>
@@ -48,62 +11,15 @@ index a365f6297781..d3df2163d1f6 100644
#include <abstractions/audio>
#include <abstractions/bash>
-@@ -154,4 +154,8 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
- owner @{HOME}/.icons/*/cursors/* r,
+@@ -163,6 +163,9 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
/usr/share/*-fonts/conf.avail/*.conf r,
/usr/share/fonts-config/conf.avail/*.conf r,
-+
+
+ owner @{HOME}/.mozilla/firefox/profiles.ini r,
+ owner @{HOME}/.mozilla/firefox/*/secmod.db r,
+ owner @{HOME}/.mozilla/firefox/*/cert8.db r,
+ # there is abstractions/gnupg but that's just for gpg1...
+ profile gpg {
+ #include <abstractions/base>
}
-From 19181fd45735005aad7cb910ca1bf3dd7fb687fb Mon Sep 17 00:00:00 2001
-From: Vincas Dargis <vindrg at gmail.com>
-Date: Sun, 21 Jan 2018 16:16:43 +0200
-Subject: deb#887593 apparmor: allow reading device information
-
-* Add file read rule for paths like
-/sys/devices/virtual/block/dm-0/queue/rotational
-used by isRotational() in desktop/unx/source/pagenin.c.
-* Add file read rule for paths like
-/sys/dev/char/226:128/device/uevent
-used by libdrm.
-
-Change-Id: Ic41365b478c817b6766e25adadd6761fa03ff055
-Reviewed-on: https://gerrit.libreoffice.org/48265
-Tested-by: Rene Engelhard <rene at debian.org>
-Reviewed-by: Rene Engelhard <rene at debian.org>
-Tested-by: Jenkins <ci at libreoffice.org>
----
- sysui/desktop/apparmor/program.oosplash | 1 +
- sysui/desktop/apparmor/program.soffice.bin | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/sysui/desktop/apparmor/program.oosplash b/sysui/desktop/apparmor/program.oosplash
-index e044c1a..bcc0691 100644
---- a/sysui/desktop/apparmor/program.oosplash
-+++ b/sysui/desktop/apparmor/program.oosplash
-@@ -23,6 +23,7 @@ profile libreoffice-oopslash INSTDIR-program/oosplash {
- /etc/passwd r,
- /etc/nsswitch.conf r,
- /run/nscd/passwd r,
-+ /sys/devices/{virtual,pci[0-9]*}/**/queue/rotational r, # for isRotational() in desktop/unx/source/pagein.c
- /usr/lib{,32,64}/ure/bin/javaldx rmpux,
- /usr/share/libreoffice/program/* r,
- INSTDIR-program/** r,
-diff --git a/sysui/desktop/apparmor/program.soffice.bin b/sysui/desktop/apparmor/program.soffice.bin
-index ecc2498..113562c 100644
---- a/sysui/desktop/apparmor/program.soffice.bin
-+++ b/sysui/desktop/apparmor/program.soffice.bin
-@@ -170,6 +170,7 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
-
- #Likely moving to abstractions in the future
- owner @{HOME}/.icons/*/cursors/* r,
-+ /sys/devices/pci[0-9]*/**/{device,subsystem_device,subsystem_vendor,uevent,vendor} r, # for libdrm
- /usr/share/*-fonts/conf.avail/*.conf r,
- /usr/share/fonts-config/conf.avail/*.conf r,
-
---
-cgit v1.1
-
=====================================
patches/apparmor-updates.diff deleted
=====================================
--- a/patches/apparmor-updates.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/sysui/desktop/apparmor/program.soffice.bin b/sysui/desktop/apparmor/program.soffice.bin
-index 9c7ec3c2a3f7..cbed1b69d4a2 100644
---- a/sysui/desktop/apparmor/program.soffice.bin
-+++ b/sysui/desktop/apparmor/program.soffice.bin
-@@ -84,6 +84,8 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
- #include <abstractions/ibus>
- #include <abstractions/nameservice>
- #include <abstractions/gnome>
-+# GnuPG1 only...
-+# #include <abstractions/gnupg>
- #include <abstractions/python>
- #include <abstractions/p11-kit>
-
-@@ -124,6 +126,12 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
- /usr/bin/lpr rmPUx,
- /usr/bin/paperconf rmix,
- /usr/bin/gpgconf rmix,
-+ /usr/bin/gpg rmCx -> gpg,
-+ /usr/bin/gpgsm rmCx -> gpg,
-+ /usr/bin/gpa rix,
-+ /usr/bin/seahorse rix,
-+ /usr/bin/kgpg rix,
-+ /usr/bin/kleopatra rix,
-
- /dev/tty rw,
-
-@@ -156,4 +156,14 @@
- owner @{HOME}/.mozilla/firefox/profiles.ini r,
- owner @{HOME}/.mozilla/firefox/*/secmod.db r,
- owner @{HOME}/.mozilla/firefox/*/cert8.db r,
-+ # there is abstractions/gnupg but that's just for gpg1...
-+ profile gpg {
-+ #include <abstractions/base>
-+
-+ /usr/bin/gpgconf rm,
-+ /usr/bin/gpg rm,
-+ /usr/bin/gpgsm rm,
-+
-+ owner @{HOME}/.gnupg/* r,
-+ }
- }
=====================================
patches/disable-tests-somehow-needing-more-fonts.diff
=====================================
--- a/patches/disable-tests-somehow-needing-more-fonts.diff
+++ b/patches/disable-tests-somehow-needing-more-fonts.diff
@@ -74,7 +74,7 @@ index 0398e15e6ebe..cbfc0955842a 100644
void testTdf114536();
CPPUNIT_TEST_SUITE(SwUiWriterTest);
-@@ -457,7 +457,7 @@ public:
+@@ -456,7 +456,7 @@ public:
CPPUNIT_TEST(testTdf99689TableOfFigures);
CPPUNIT_TEST(testTdf99689TableOfTables);
CPPUNIT_TEST(testTdf113790);
=====================================
patches/series
=====================================
--- a/patches/series
+++ b/patches/series
@@ -37,6 +37,5 @@ apparmor-usrmerge.diff
revert-bd260a59cfdd050db3aa9a641ef0fa09efcedf5b.diff
poppler-0.62.diff
apparmor-fixes.diff
-apparmor-updates.diff
apparmor-complain.diff
temporary-buildfix.diff
=====================================
rules
=====================================
--- a/rules
+++ b/rules
@@ -73,8 +73,8 @@ GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
lo_sources_ver=$(shell grep AC_INIT $(SOURCE_TREE)/configure.ac | grep documentfoundation | cut -d, -f2 | sed -e 's,\[,,' -e 's,\],,')
# NOT in proper libreoffice-3-6 branch
# use ./g checkout -b tag-libreoffice-3.6.2.1 libreoffice-3.6.2.1
-GIT_TAG=libreoffice-$(lo_sources_ver)-buildfix1
-GIT_BRANCH=libreoffice-6-0-0
+GIT_TAG=libreoffice-$(lo_sources_ver)
+GIT_BRANCH=libreoffice-6-0
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/compare/429d275dceb33dd51af5b46ed84f971197a9b67f...a7499443b8b50140236d4efccacb578a86a22fb2
---
View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/compare/429d275dceb33dd51af5b46ed84f971197a9b67f...a7499443b8b50140236d4efccacb578a86a22fb2
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-openoffice-commits/attachments/20180127/f18a526e/attachment-0001.html>
More information about the Pkg-openoffice-commits
mailing list