[libreoffice] 01/01: Merge remote-tracking branch 'origin/master' into debian-experimental-5.2
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.
commit 1c6194fbcf3ecac4a9c783df83cf7fa1bcbb86d5
Merge: cf22fb2 d5e3c05
Author: Rene Engelhard <rene@debian.org>
Date: Thu May 26 20:59:19 2016 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.2
changelog | 3 ++-
control | 2 +-
rules | 6 +-----
tests/control | 2 +-
4 files changed, 5 insertions(+), 8 deletions(-)
diff --cc changelog
index b974503,bd9204c..9737e6b
--- a/changelog
+++ b/changelog
@@@ -1,28 -1,17 +1,29 @@@
-libreoffice (1:5.1.3-2) UNRELEASED; urgency=medium
-
- * debian/patches/mdds-1.2.0.diff: remove obsolete internal patches...
- * debian/patches/liborcus-0.11.diff: remove Mac OS and Windows-specific
- hunks which do not apply...
+libreoffice (1:5.2.0~beta1-1) experimental; urgency=medium
+
+ * New upstream beta release
+ - fixes SVG t(ext s)pan import (closes: #665094)
+ - fixes Impress slowing down with -gtk(3) and accessibility
+ (closes: #824035)
+
+ * debian/rules, debian/control.gtk3.in, debian/*.links: move
+ liblibreofficekitgtk.so into an own package, as we have
+ libreofficekit-{dev,data} anyway. Make liblibreofficekitgtk depend on
+ libreofficekit-data
+ * debian/rules, debian/control.in, debian/libreoffice-gtk.*: rename -gtk
+ to -gtk2
+ * debian/control.sdk.in, debian/rules: move arch-indep SDK stuff into new
+ -dev-common. Move g++-mingw-w64-i686 to BUILD_DEPS_INDEP and only try to
+ (re)build unowinreg.dll in build-indep. Remove arch-qualifiers.
+ * debian/uno-libs3.symbols: update
+ * debian/tests/control.in, debian/tests/sdk-examples: remove unowinreg.dll
+ special-casing, we now have unowinreg.dll in a Arch: all. Depend on that.
* debian/rules:
+ - add initial build profile support: nodoc and nocheck
- - move GTK3_MINVER setting down in rules so the conditional gets honoured
+ - move GTK3_MINVER setting down in rules so the conditional gets honoured;
+ gtk3 3.20 is available anywhere in stretch/sid so revert bump to >= 3.20
- migrate from --ddeb-migration to --dbgsym-migration
- * debian/source/include-binaries, tarballs/mdds-1.2.0.tar.bz2: add
- forgotten mdds-1.2.0.tar.bz2
-
* debian/libreoffice-calc.lintian-overrides: (temporerily) readd
libreoffice-calc: binary-or-shlib-defines-rpath override
diff --cc tests/control
index 82ecbc9,ff5cb80..daceace
--- 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, 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, 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, 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~ [...]
Tests: pyuno-import
Depends: python3-uno
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: