[libreoffice] 01/02: Merge remote-tracking branch 'origin/debian-experimental-5.2' into debian-experimental-5.3
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 7d7261e87802e1a3ba9d94e3e303a4938c50d1f7
Merge: badefd1 3f04604
Author: Rene Engelhard <rene@debian.org>
Date: Thu Aug 11 20:48:43 2016 +0200
Merge remote-tracking branch 'origin/debian-experimental-5.2' into debian-experimental-5.3
changelog | 28 +++++++++++--
control | 67 ++++++++++++++++--------------
control.gtk2.in | 21 ++++++++++
control.in | 28 ++-----------
control.nlpsolver.in | 2 +
control.systray.in | 12 ++++++
patches/make-package-modules-not-suck.diff | 32 ++++++++------
rules | 52 +++++++++++++++--------
shlibs.override.libcmis | 2 +
tests/control | 2 +-
10 files changed, 156 insertions(+), 90 deletions(-)
diff --cc changelog
index d5cc581,022d884..02d4eb3
--- a/changelog
+++ b/changelog
@@@ -1,17 -1,30 +1,39 @@@
+libreoffice (1:5.3.0~alpha0~git20160805-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ * debian/control.{lang,help}.in: use ${help-l10n-virtual-version} as
+ versioned Provides
+
+ -- Rene Engelhard <rene@debian.org> Thu, 26 May 2016 20:00:57 +0200
+
- libreoffice (1:5.2.1~rc1~git20160730-1) UNRELEASED; urgency=medium
-
- * new upstream snapshot
-
- -- Rene Engelhard <rene@debian.org> Sat, 30 Jul 2016 15:31:55 +0200
+ libreoffice (1:5.2.1~rc1-1) UNRELEASED; urgency=medium
+
+ * new upstream release candidate
+
+ * debian/patches/make-package-modules-not-suck.diff: move animcore into
+ DRAW (closes: #833181)
+
+ * debian/control.nlpsolver.in: fix override disparity , use old values
+ (math/extra)
+ * debian/rules, debian/shlibs.override.libcmis: bump libcmis dependency
+ to (>= 0.5.1+git20160603) to assure the advertised google 2-factor-auth
+ stuff is present
+ * debian/control.in:
+ - update libroffice-gtk mentioning in libreoffice's
+ description to say gtk(2|3) (closes: #833694) - thanks Vincent Levebre
+ - remove mention of Quickstarter from libreoffice and libreoffice-gtk2
+ descriptions; gone there since some time
+ - add Replaces:/Breaks: for libanimcorelo.so move
+ * debian/control.systray.in, debian/rules: install the systray stuff into a
+ new -systray package (if enabled)
+ * debian/control.lang.in: suggest libreoffice-hyphenation-fi at -l10n-fi
+ (provided by libreoffice-voikko)
+ * debian/rules:
+ - clean up test disabling, disable on sparc64. Add missing <!nocheck>
+ for junit4
+
+ -- Rene Engelhard <rene@debian.org> Thu, 11 Aug 2016 20:30:24 +0200
libreoffice (1:5.2.0-1) unstable; urgency=medium
diff --cc control
index ecd09bc,7150a81..1089c93
--- a/control
+++ b/control
@@@ -37,10 -37,10 +37,10 @@@ Build-Depends: ant (>= 1.7.0) [!mips64]
gperf,
java-common (>= 0.49),
javahelper (>= 0.37~),
- junit4 (>= 4.8.2-2) [!kfreebsd-any],
+ junit4 (>= 4.8.2-2) [!hppa !ia64 !s390 !sparc !sparc64] <!nocheck>,
kdelibs5-dev (>= 4:4.3.4),
libabw-dev (>= 0.1),
- libarchive-zip-perl,
+ libarchive-zip-perl [!mips64],
libavahi-client-dev,
libbluetooth-dev [linux-any],
libboost-date-time-dev (>= 1.58),
@@@ -1698,9 -1675,9 +1678,9 @@@ Architecture: al
Pre-Depends: ${misc:Pre-Depends}
Depends: libreoffice-common, locales | locales-all, ${misc:Depends}
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-fi
-Provides: libreoffice-l10n-${help-l10n-virtual-version}
+Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
Suggests: hunspell-dictionary-fi | myspell-dictionary-fi | libreoffice-spellcheck-fi,
- hyphen-fi,
+ hyphen-fi | libreoffice-hyphenation-fi,
libreoffice-grammarcheck-fi,
libreoffice-help-fi,
mythes-fi
diff --cc tests/control
index cc78fd4,87b03c1..6c259ac
--- 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
Reply to: