[libreoffice] 01/01: Merge branch 'master' into debian-stretch-backports
Rene Engelhard
rene at moszumanska.debian.org
Wed Dec 20 17:55:15 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-stretch-backports
in repository libreoffice.
commit 6b7c7221e1d43162661b685e4205bbfd85c7e7ff
Merge: 603b941 c891290
Author: Rene Engelhard <rene at rene-engelhard.de>
Date: Wed Dec 20 18:54:56 2017 +0100
Merge branch 'master' into debian-stretch-backports
README.Debian | 18 +++++
changelog | 54 ++++++++++++--
control | 25 ++++---
control.in | 5 +-
...rol.reportdesign.in => control.reportbuilder.in | 2 +-
copyright | 13 ++++
libreoffice-common.postinst.in | 10 +++
libreoffice-common.triggers.in | 3 +-
patches/apparmor-complain.diff | 26 +++++++
patches/apparmor-fixes.diff | 29 ++++++++
patches/apparmor-updates.diff | 25 +++++++
patches/apparmor-usrmerge.diff | 84 +++++++++++++++++++++
patches/series | 4 +
rules | 87 ++++++++++++----------
shell-lib-lool.sh | 5 ++
15 files changed, 326 insertions(+), 64 deletions(-)
diff --cc changelog
index 485a209,882cc4c..9f7a77c
--- a/changelog
+++ b/changelog
@@@ -1,24 -1,46 +1,62 @@@
- libreoffice (1:5.4.3-4~bpo9+2) stretch-backports; urgency=medium
-
- * revert one more change to actually add a default-jdk build-dep for i386...
-
- -- Rene Engelhard <rene at debian.org> Sun, 10 Dec 2017 01:20:09 +0100
-
- libreoffice (1:5.4.3-4~bpo9+1) stretch-backports; urgency=medium
++libreoffice (1:5.4.4-4~bpo9+1) stretch-backports; urgency=medium
+
+ * Rebuild for stretch-backports.
+
+ * tarballs/*, debian/source/include-binaries: include needed internal
+ stuff
+
+ * revert Java9 hacks. openjdk-9 is fixed (in sid), openjdk-8 is supposed to
+ be fixed (in sid and some future stretch security update) and linux is
+ also fixed in jessie (8.10) and stretch (9.3). Build with default Java
+ (again)
+ This doesn't cause a regression since stretch-backports/i386 was affected
+ by this regression anyway and this makes a backport possible...
+
- -- Rene Engelhard <rene at debian.org> Tue, 05 Dec 2017 21:33:47 +0100
++ -- Rene Engelhard <rene at frodo.fritz.box> Wed, 20 Dec 2017 18:54:48 +0100
++
+ libreoffice (1:5.4.4-1) unstable; urgency=medium
+
+ [ Rene Engelhard ]
+ * New upstream release
+ - colours referenced cells again (closes: #883254)
+ - doesn't crash anymore when clicking in the Input Line of a
+ protected cell (closes: #884149)
+
+ * debian/patches/apparmor-complain.diff: set complain mode for oosplash
+ and soffice.bin profiles
+ * debian/patches/apparmor-usrmerge.diff: allow also /usr/bin/dash (etc.)
+ - usrmerge...
+ * debian/patches/apparmor-updates.diff: updates to the apparmor profiles
+ (allow /usr/bin/gpgconf)
+ * debian/patches/apparmor-fixes.diff: fixes to the apparmor profiles...
+
+ * debian/libreoffice-common.{triggers,postinst}.in,
+ debian/shell-lib-lool.sh: add trigger updating LOOLs systemplate
+ * debian/libreoffice-common.triggers.in: switch to interest-noawait triggers
+
+ * debian/rules:
+ - stop installing disabled symlinks for apparmor (closes: #883800)
+ - actually install the OpenSymbol fontconfig snippet into a
+ /etc/fonts.d/30_opensymbol.conf
+ - change BRAND_BASE_DIR in fundamentalrc so that we don't get
+ /usr/lib/libreoffice/program/../program/xpdfimport calls. We know
+ the path and the apparmor profile doesn't allow this
+ - stop passing --disable-report-builder to build-archs configure since
+ even though it's built the report builder doesn't work then. Move
+ from Build-Depends-Indep: to Build-Depends: again (closes: #875688);
+ * debian/rules, debian/control*.in:
+ s/REPORTDESIGN/REPORTBUILDER/ and
+ control.reportdesign.in -> control.reportbuilder.in while we're at it
+ * debian/control.in: add gnupg to Suggests
+ * debian/copyright:
+ - mention sysui/desktop/apparmor/* copyright/license
+ - mention icon_themes/elementary*/* copyright/license
+
+ [ intrigeri ]
+ * debian/README.Debian: document how to debug and customize the included
+ AppArmor profiles
+
+ -- Rene Engelhard <rene at debian.org> Fri, 15 Dec 2017 00:29:20 +0100
libreoffice (1:5.4.3-4) unstable; urgency=medium
diff --cc control
index e2bfb26,3eca426..d5e1883
--- a/control
+++ b/control
@@@ -60,6 -59,8 +61,7 @@@ Build-Depends: ant (>= 1.7.0) [!hppa !i
libclucene-dev (>= 2.3.3.4-4.1),
libcmis-dev (>= 0.5.0-3),
libcollada2gltfconvert-dev (>= 20140924-2)[amd64 i386],
+ libcommons-logging-java [!hppa !ia64 !mips64 !s390 !sparc],
- libcppunit-dev (>= 1.14) [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
libcups2-dev,
libcurl4-gnutls-dev,
libdbus-glib-1-dev (>= 0.70),
@@@ -108,17 -117,24 +115,21 @@@
libnss3-dev (>= 3.12.3),
libo3dgc-dev (>= 0~20131011-2) [amd64 i386],
libodfgen-dev (>= 0.1),
- liborcus-dev (>= 0.12),
libpagemaker-dev,
libpcre3-dev [amd64 i386],
+ libpentaho-reporting-flow-engine-java (>= 0.9.4) [!hppa !ia64 !mips64 !s390 !sparc],
libpng-dev,
libpoppler-cpp-dev,
libpoppler-dev (>= 0.12.0),
libpoppler-private-dev,
libpq-dev (>= 9.0~),
librdf0-dev (>= 1.0.16-2),
+ librepository-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc],
librevenge-dev,
+ libsac-java [!hppa !ia64 !mips64 !s390 !sparc],
libsane-dev,
+ libserializer-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc],
libsm-dev,
- libstaroffice-dev,
- libstaroffice-dev (>= 0.0.3) <!nocheck>,
libsuitesparse-dev (>= 1:3.4.0),
libvisio-dev (>= 0.1),
libvlc5 (>= 2.0.8),
@@@ -129,8 -147,10 +140,9 @@@
libxext-dev,
libxinerama-dev,
libxkbfile-dev,
+ libxml-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc],
libxml2-dev (>= 2.8),
libxml2-utils,
- libxmlsec1-dev (>= 1.2.24),
libxrandr-dev,
libxrender-dev,
libxslt1-dev,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
More information about the Pkg-openoffice-commits
mailing list