[libreoffice] 03/03: Merge remote-tracking branch 'origin/master' into debian-experimental-6.0
Rene Engelhard
rene at moszumanska.debian.org
Sun Dec 3 21:26:15 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-6.0
in repository libreoffice.
commit af4cc3cb23b10d3ca4cb34fb4a2de1ad0d6aff1d
Merge: 73a933f 260ccea
Author: Rene Engelhard <rene at debian.org>
Date: Sun Dec 3 22:25:58 2017 +0100
Merge remote-tracking branch 'origin/master' into debian-experimental-6.0
changelog | 10 +++++++++-
control | 7 +------
control.in | 2 +-
libreoffice-mysql-connector.triggers.in | 1 -
libreoffice-wiki-publisher.triggers.in | 1 -
rules | 6 +++---
6 files changed, 14 insertions(+), 13 deletions(-)
diff --cc changelog
index 29c2dd6,5964f99..620c45a
--- a/changelog
+++ b/changelog
@@@ -1,30 -1,20 +1,38 @@@
-libreoffice (1:5.4.3-4) unstable; urgency=medium
+libreoffice (1:6.0.0~beta2~git20171130-1) UNRELEASED; urgency=medium
+ * debian/control.in: remove openjdk conflicts ...
+ * debian/rules: ... and make them Depends in JAVA_RUNTIME_DEPENDS for the
+ Java-using packages. Also allow openjdk-9 everywhere
+ This doesn't prevent usage of the "broken" JDK but otherwise we "break"
+ jodconverter/natbraille in testing... And linux 4.14.2-1 is also supposed to
+ fix the regression finally...
+ This also closes: #882436
+
- -- Rene Engelhard <rene at debian.org> Sat, 02 Dec 2017 01:01:41 +0100
+ * 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
-libreoffice (1:5.4.3-3) unstable; urgency=medium
+ -- Rene Engelhard <rene at debian.org> Mon, 27 Nov 2017 21:41:01 +0100
- * debian/patches/icu-60.diff: backport icu 60 support patch from master
+libreoffice (1:6.0.0~beta1-1) experimental; urgency=medium
+
+ * New upstream beta release
+
+ * debian/patches/ww8export-HAVE_MORE_FONTS.diff: move ...
+ * debian/patches/disable-tests-somehow-needing-more-fonts.diff: ... here
+ and patch also ooxmlexport4
* debian/rules:
+ - use (dh_)dwz and (if enabled) install the multifile file into
+ uno-libs3-dbgsym.
+ Thanks Matthias Klose for the hint.
+ Make *-dbgsym depend on uno-libs3-dbgsym which should contain the above
+ file and is recommended anyway because of the gdb helpers.
+ - be consequent and enable the junit tests on arm64 now that
+ those work.
+ - stop passing --disable-database-connectivity for no-Base archs
+ (closes: #874274)
+ - explicitly use and depend on openjdk 9 on i386 now that #876069 is fixed.
- replace some manual dpkg-parsechangelog calls with
$(DEB_VERSION) and $(DEB_DISTRIBUTION) and fix logic for
--disable-dependency-tracking
@@@ -44,30 -25,56 +52,30 @@@
- add versions to openjdk-{7,8}-jre-headless conflicts now that they are
also supposed to be fixed
* debian/control.{kde.}.in: suggest the "certificate managers" for gpg:
- gpa, seahorse, kleopatra | gpg
+ gpa, seahorse, kleopatra | kgpg
- -- Rene Engelhard <rene at debian.org> Sun, 26 Nov 2017 11:34:27 +0000
-
-libreoffice (1:5.4.3-2) unstable; urgency=medium
-
- * debian/patches/java9-*: remove ...
- * debian/patches/java9.diff: ... and merge into one patch again.
- * debian/patches/java9.diff: backport also missing tests fix from master.
- Also add -Dfile.encoding=UTF8 directly to JavaClassSet.mk
+ -- Rene Engelhard <rene at debian.org> Sat, 25 Nov 2017 17:17:54 +0000
- * debian/rules:
- - remove setting JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 again
- - disable junit tests on 32bit archs (i386/armhf) which fail ucb_complex
- with a libcurl-related SIGSEGV. At least upstream those are not ran
- (at least for armhf) anyway on those archs.
-
- -- Rene Engelhard <rene at debian.org> Mon, 13 Nov 2017 17:43:19 +0100
+libreoffice (1:6.0.0~alpha1-1) experimental; urgency=medium
-libreoffice (1:5.4.3-1) unstable; urgency=medium
+ [ Rene Engelhard ]
+ * New upstream alpha release
- * New upstream release
+ * debian/patches/tdf108963-test.diff: adapt test to what we get; the
+ text _is_ rotated on export, so...
- * debian/patches/java9-jawt.diff: add from master; find jawt with Java9 and
- also fix odk/settings/settings.mk for it
- * debian/patches/java9-rhino.diff: add from master; fix rhino build with Java9
+ * merge from Ubuntu, thanks Rico Tzschichholz:
+ - Add "elementary" style package
* debian/rules:
- - be consequent and enable the junit tests on armhf/arm64 now that
- those work.
- - stop passing --disable-database-connectivity for no-Base archs
- (closes: #874274)
- - explicitly use and depend on openjdk 9 on i386 now that #876069 is fixed.
- - set JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 in build-indep (needed for
- Java9 in reportbuilder)
- * debian/libreoffice-sdbc-firebird.maintscript: remove (redundant)
- $DPKG_MAINTSCRIPT_PACKAGE and update version (closes: #880426)
- * debian/rules, debian/libreoffice-common.maintscript: fix path in/for
- apparmor profiles (add missing /). mv_conffile the files to the new
- name...
- * debian/control.in: make -core conflict against openjdk-{6,7,8}-jre-headless
- on i386- -java-common would make more sense, but it's Arch: all..
-
- -- Rene Engelhard <rene at debian.org> Tue, 07 Nov 2017 20:59:01 +0100
-
-libreoffice (1:5.4.3~rc1-2) unstable; urgency=medium
+ - finally stop building -systray. GNOME 3.26 doesn't show it anymore,
+ and in 6.0 the feature is not completely removed yet but the UI for
+ setting it is already gone anyway....
- * upload to unstable
+ [ Rico Tzschichholz ]
+ * Add Kannada (kn) langpack
- -- Rene Engelhard <rene at debian.org> Tue, 24 Oct 2017 23:15:10 +0200
+ -- Rene Engelhard <rene at debian.org> Fri, 20 Oct 2017 13:42:40 +0000
libreoffice (1:5.4.3~rc1-1) experimental; urgency=medium
--
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