[libreoffice] 01/01: Merge remote-tracking branch 'origin/master' into debian-experimental-6.0
Rene Engelhard
rene at moszumanska.debian.org
Tue Nov 7 07:16:05 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 e0eed8bf230745e5f34cd7ba0d37dc3d5099cb53
Merge: 5d75c05 cbf6569
Author: Rene Engelhard <rene at debian.org>
Date: Tue Nov 7 08:15:28 2017 +0100
Merge remote-tracking branch 'origin/master' into debian-experimental-6.0
changelog | 12 +++++++++++-
control | 3 ++-
libreoffice-common.maintscript | 6 +++++-
patches/fix-JVM_ONE_PATH_CHECK.diff | 15 ++++++++++++++
patches/series | 1 +
rules | 39 ++++++++++++++++++++++++-------------
6 files changed, 59 insertions(+), 17 deletions(-)
diff --cc changelog
index a512403,dea04aa..ccd8008
--- a/changelog
+++ b/changelog
@@@ -1,40 -1,36 +1,50 @@@
-libreoffice (1:5.4.3-1) unstable; urgency=medium
+libreoffice (1:6.0.0~beta1~git20171106-1) UNRELEASED; urgency=medium
- * New upstream release
-
- * debian/patches/java9-jawt.diff: add from master; find jawt with Java9
- * debian/patches/java9-jawt.rhino: add from master; fix rhino build with Java9
+ * New upstream snapshot
* 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 armhf/arm64 now that
those work.
+ - stop passing --disable-database-connectivity for no-Base archs
+ (closes: #874274)
+ - explicitly use openjdk 9 on i386 now that #876069 is fixed. Allow
+ it as the only one by explicitly using --with-jvm-path
+ - set JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 in build-indep (needed for
+ Java9 in reportbuilder)
+ - make testsuite failures on i386 fatal again
- * debian/rules, debian/shlibs.override.mysql-connector-c++:
- temporarily force a lower dependency on libmysqlcppconn7v5, works
- 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/for
+ apparmor profiles (add missing /). mv_conffile the files to the new
+ name...
- -- Rene Engelhard <rene at debian.org> Tue, 31 Oct 2017 13:14:13 +0000
+ -- Rene Engelhard <rene at debian.org> Tue, 07 Nov 2017 07:59:37 +0100
-libreoffice (1:5.4.3~rc1-2) unstable; urgency=medium
+libreoffice (1:6.0.0~alpha1-1) experimental; urgency=medium
+
+ [ Rene Engelhard ]
+ * New upstream alpha release
+
+ * debian/patches/tdf108963-test.diff: adapt test to what we get; the
+ text _is_ rotated on export, so...
+
+ * merge from Ubuntu, thanks Rico Tzschichholz:
+ - Add "elementary" style package
+
+ * debian/rules:
+ - 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
diff --cc control
index 8e6061b,4157c99..ba295dd
--- a/control
+++ b/control
@@@ -15,8 -15,7 +15,8 @@@ Build-Depends: ant (>= 1.7.0) [!hppa !i
coinor-libcoinmp-dev (>= 1.8.3-2),
coinor-libcoinutils-dev (>= 2.10.14+repack1-1),
debhelper (>= 10),
+ debhelper (>= 10.10.4),
- default-jdk (>= 1:1.6) [!hppa !mips64 !s390 !sparc],
+ default-jdk (>= 1:1.6) [!hppa !mips64 !s390 !sparc !i386],
default-jdk (>= 2:1.7-52.1) [kfreebsd-any],
default-jdk (>= 2:1.8-55) [sparc64],
default-libmysqlclient-dev,
@@@ -148,6 -148,8 +148,7 @@@
locales [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
lp-solve (>= 5.5.0.13-5+b1),
maven-repo-helper,
- opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1-2) [amd64 i386],
+ openjdk-9-jdk (>= 9.0.1+11-1) [i386],
pkg-config,
pstoedit [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
python3,
diff --cc patches/series
index 063d940,0f944d9..2865d3b
--- a/patches/series
+++ b/patches/series
@@@ -30,5 -31,10 +30,6 @@@ no-openssl.dif
disable-some-sc-tests-with-internal-cppunit.diff
cppunit-optional.diff
disable-unused-test-programs.diff
-gb_SUPPRESS_TESTS.diff
-stop-shipping-mimelnk-desktop-files.diff
-icu-no-icu-config.diff
ww8export-HAVE_MORE_FONTS.diff
+tdf108963-test.diff
+ fix-JVM_ONE_PATH_CHECK.diff
-java9-jawt.diff
-java9-rhino.diff
diff --cc rules
index a2f2051,d34e02c..55c0686
--- a/rules
+++ b/rules
@@@ -1990,9 -2014,11 +2001,9 @@@ endi
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) \
MARIADBCONFIG=$(MARIADBCONFIG) \
FIREBIRD_CFLAGS=$(FIREBIRD_CFLAGS) FIREBIRD_LIBS=$(FIREBIRD_LIBS) \
- OPENCOLLADA_CFLAGS=$(OPENCOLLADA_CFLAGS) OPENCOLLADA_LIBS=$(OPENCOLLADA_LIBS) \
- COLLADA2GLTF_CFLAGS=$(COLLADA2GLTF_CFLAGS) COLLADA2GLTF_LIBS=$(COLLADA2GLTF_LIBS) \
./autogen.sh $(CONFIGURE_FLAGS) $(CONFIGURE_FLAGS_INDEP)
- PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build-nocheck
+ PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 $(MAKE) build-nocheck
ifeq "$(BUILD_TEST_PACKAGE)" "y"
ifeq "$(ENABLE_JUNIT4)" "y"
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) Jar_{OOoRunner,test,ConnectivityTools}
--
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