[libreoffice] 02/04: Merge remote-tracking branch 'origin/debian-experimental-5.2' into debian-experimental-5.3
Rene Engelhard
rene at moszumanska.debian.org
Tue Nov 8 05:22:13 UTC 2016
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.3
in repository libreoffice.
commit cec57efd4a35d698145026183594fdd3a351c402
Merge: a0cdf28 435668c
Author: Rene Engelhard <rene at debian.org>
Date: Mon Nov 7 20:59:01 2016 +0100
Merge remote-tracking branch 'origin/debian-experimental-5.2' into debian-experimental-5.3
Conflicts:
changelog
control
patches/series
rules
tests/control
changelog | 2 +
control | 3 +-
patches/disable-flaky-tests.diff | 4 +-
patches/no-openssl.diff | 333 +++++++++++++++++++++++++++++++++++++++
patches/series | 1 +
rules | 4 -
tests/control | 2 +-
7 files changed, 340 insertions(+), 9 deletions(-)
diff --cc changelog
index bf7b95b,5059362..ab0b88d
--- a/changelog
+++ b/changelog
@@@ -6,44 -21,19 +6,46 @@@ libreoffice (1:5.3.0~beta1~git20161101-
* build-against-shared-lpsolve.diff: ... this to make the purpose more clear
* debian/patches/fix-system-lpsolve-build.diff: add new one adding
-llpsolve55_pic test/linkage (disabled)
++ * debian/patches/no-openssl.diff: don't uselessly check for openssl and
++ don't require openssl in postgresql-sdbc-impl, not (directly) used
- * debian/control.in:
- - remove -sdbc-firebird Recommends: in -base-drivers
- (closes: #842316, #841253) and the mentioning from the Desciption
+ * debian/scripts/get_libvlc_dep.sh: fix to work again (also) with
+ new multiarchified libvlc5
+
+ * debian/rules:
+ - don't install ChangeLog (now done automatically by dh compat >= 7) as
+ it doubles -common/-core size and increases font-opensymbol *by 10*
- -- Rene Engelhard <rene at debian.org> Mon, 31 Oct 2016 23:20:33 +0100
+ -- Rene Engelhard <rene at debian.org> Mon, 24 Oct 2016 23:06:23 +0200
-libreoffice (1:5.2.3~rc1-4) unstable; urgency=medium
+libreoffice (1:5.3.0~alpha1-1) experimental; urgency=medium
- * debian/scripts/get_libvlc_dep.sh: fix to work again (also) with
- new multiarchified libvlc5
+ * New upstream alpha release
+ - fixes typo in VCL.xcu; s/Tino/Tinos/ (closes: #834580)
+ - fixes (experimental) Gtk print dialog crash (closes: #839701)
+ - fixes copy paste cells between two tables of two documents with Gtk3
+ (closes: #834622)
+ - fixes tooltips when dragging/filling cells with Gtk3 (closes: #831977)
+
+ * debian/control.{lang,help}.in: use ${help-l10n-virtual-version} as
+ versioned Provides
+ * debian/rules, debian/control.transitionals.in: remove jessie->stretch
+ transitionals again
+ * debian/rules, control.gcj.in: cleanup:
+ - remove support for gcj (and thus building -gcj "native") completely;
+ removed upstream; and also openjdk-9 apparently will drop support for
+ source/target 1.5 (which gcj only supports) and gcc-7 apparently even
+ will drop gcj, too
+ (also the officeotron/odfvalidator stuff fails because due to the java-gcj
+ in the path for safety reasons it picks up gcj..)
+ - use java6_architectures for computing OOO_JAVA_ARCHS
+ * debian/copyright: add schema/*/* to Files-Excluded: :/
+ * debian/uno-libs3.symbols: update
+ * debian/rules:
+ - bump dh compat to 10
+ - re-enable firebird (closes: #841253)
- -- Rene Engelhard <rene at debian.org> Fri, 21 Oct 2016 23:56:08 +0200
+ -- Rene Engelhard <rene at debian.org> Thu, 20 Oct 2016 15:46:34 +0200
libreoffice (1:5.2.3~rc1-3) unstable; urgency=medium
diff --cc control
index bea2002,2b8925d..8e4404d
--- a/control
+++ b/control
@@@ -109,8 -112,6 +109,7 @@@ Build-Depends: ant (>= 1.7.0) [!hppa !i
librevenge-dev,
libsane-dev,
libsm-dev,
- libssl-dev (>= 0.9.8),
+ libstaroffice-dev,
libsuitesparse-dev (>= 1:3.4.0),
libvisio-dev (>= 0.1),
libvlc5,
@@@ -181,7 -184,7 +180,7 @@@ Build-Conflicts: amd-libopencl1
Standards-Version: 3.9.4
Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
--Bugs:
++Bugs: mailto:debian-openoffice at lists.debian.org
Homepage: http://www.libreoffice.org
Package: libreoffice
diff --cc patches/series
index 1eb7c62,01fc217..6400d75
--- a/patches/series
+++ b/patches/series
@@@ -28,4 -29,8 +28,5 @@@ hppa-is-32bit.dif
rsc-no-error-about-unknown-switch.diff
debian-branding.diff
no-packagekit-per-default.diff
-sparc64.diff
-startcenter-grey-out-not-installed.diff
-show-vcl-backend-in-about.diff
+system-officeotron-and-odfvalidator.diff
+ no-openssl.diff
diff --cc rules
index e37e773,26f8f73..e4dd02b
--- a/rules
+++ b/rules
@@@ -807,12 -864,9 +806,9 @@@ els
BUILD_DEPS += , coinor-libcoinmp-dev $(COINMP_MINVER), coinor-libcoinutils-dev $(COINUTILS_MINVER), libbz2-dev
endif
- ifneq (,$(filter openssl, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libssl-dev (>= 0.9.8)
- endif
OPENCL_SUGGESTS := ocl-icd-libopencl1
-ifeq "$(shell echo $(BUILD_DBGSYM_PACKAGES)$(BUILD_DBG_PACKAGE) | grep -q y && echo true)" "true"
+ifeq "$(BUILD_DBGSYM_PACKAGES)" "y"
ifneq (,$(findstring i386,$(DEB_HOST_ARCH)))
SMALL_SYMBOLS = n
else
diff --cc tests/control
index 7faf8c1,2c5b0cc..c13baec
--- a/tests/control
+++ b/tests/control
@@@ -1,5 -1,5 +1,5 @@@
Tests: junit-subsequentcheck
- Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg [...]
-Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libarchive-zip-perl, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~ [...]
++Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg [...]
Tests: pyuno-import
Depends: python3-uno
--
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