[libreoffice] 01/01: Merge remote-tracking branch 'origin/debian-experimental-5.1' 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 b1c76b6e6365a7a8e9a3ec76941f55d2d98827e3
Merge: c55f2de a2eed74
Author: Rene Engelhard <rene@debian.org>
Date: Tue Apr 19 20:32:57 2016 +0200
Merge remote-tracking branch 'origin/debian-experimental-5.1' into debian-experimental-5.2
Conflicts:
changelog
tests/control
changelog | 13 ++++++++++++-
control | 2 +-
rules | 7 ++++++-
tests/control | 2 +-
4 files changed, 20 insertions(+), 4 deletions(-)
diff --cc changelog
index 284b8bb,1b54ca9..e955be3
--- a/changelog
+++ b/changelog
@@@ -1,23 -1,20 +1,34 @@@
- libreoffice (1:5.2.0~alpha1~git20160411-1) UNRELEASED; urgency=medium
-libreoffice (1:5.1.3~rc1~git20160419-1) UNRELEASED; urgency=medium
++libreoffice (1:5.2.0~alpha1~git20160418-1) UNRELEASED; urgency=medium
* New upstream snapshot
-
- -- Rene Engelhard <rene@debian.org> Sat, 02 Apr 2016 12:48:35 +0200
+ - fixes SVG t(ext s)pan import (closes: #665094)
+
+ * 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.
+
+ -- Rene Engelhard <rene@debian.org> Thu, 26 Nov 2015 10:37:57 +0100
+ libreoffice (1:5.1.2-5) UNRELEASED; urgency=medium
+
+ * debian/patches/remove-obsolete-dictmgr-include.diff: as name says;
+ from libreoffice-5-1 branch. Fix build with hunspell 1.4
+
+ * debian/rules:
+ - (temporarily) bump libgtk-3-dev build-dep to >= 3.20~ to ensure
+ we build against 3.20
+
+ -- Rene Engelhard <rene@debian.org> Tue, 19 Apr 2016 20:02:18 +0200
+
libreoffice (1:5.1.2-4) unstable; urgency=medium
* debian/patches/fix-list-and-comboboxes-with-gtk3-3-20-2.diff:
diff --cc tests/control
index c3cb809,8922285..a1e8ecb
--- 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: