[libreoffice] 04/04: 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 1b8dbab46c69948e457a8f4919d52ce1d2678358
Merge: 7b8c6f4 7727261
Author: Rene Engelhard <rene@debian.org>
Date: Thu Jul 14 18:48:49 2016 +0200
Merge remote-tracking branch 'origin/debian-experimental-5.2' into debian-experimental-5.3
changelog | 49 +-
control | 88 +-
control.in | 4 +-
control.nlpsolver.in | 13 +
patches/series | 1 +
patches/sparc64.diff | 2180 +++++++++++++++++++++++++++++++++++++++++++++++
rules | 89 +-
scripts/gid2pkgdirs.sh | 1 +
scripts/joinctrl.py | 14 +-
source/include-binaries | 1 +
tests/control | 2 +-
vars.sparc64 | 1 +
12 files changed, 2363 insertions(+), 80 deletions(-)
diff --cc changelog
index 8cd532e,431a6fa..9bc905d
--- a/changelog
+++ b/changelog
@@@ -1,12 -1,48 +1,57 @@@
+libreoffice (1:5.3.0~alpha0~git20160714-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.0~rc2-2) UNRELEASED; urgency=medium
+
+ * debian/rules:
+ - use (more) dh_* -a instead of deprecated -s
+
+ * debian/rules, debian/scripts/joinctrl.py: use $(PYTHON) (so python3),
+ "python" isn't pulled in (implicitely) anymore; update build-deps
+
+ -- Rene Engelhard <rene@debian.org> Thu, 14 Jul 2016 13:18:38 +0200
+
+ libreoffice (1:5.2.0~rc2-1) experimental; urgency=medium
+
+ * new upstream release candidate
+
+ * debian/rules:
+ - use dh_listpackages -a instead of deprecated -s
+
+ -- Rene Engelhard <rene@debian.org> Thu, 07 Jul 2016 08:18:31 +0200
+
+ libreoffice (1:5.2.0~rc1-1) experimental; urgency=medium
+
+ * new upstream release candidate
+ - scales gtk3 smooth scaling events... (closes: #826654)
+
+ * debian/patches/sparc64.diff: add sparc64 port, thanks James Clarke
+
+ * debian/vars.sparc64: add
+ * debian/rules: add sparc64 support again
+
+ * debian/control.in:
+ - move ttf-liberation-fonts recommends to -common (closes: #747132)
+ - move libpaper-utils recommends to -core
+
+ * debian/control.nlpsolver.in, debian/rules, debian/scripts/gid2pkgdirs.sh:
+ package the NLPSolver from here (closes: #827474)
+
+ -- Rene Engelhard <rene@debian.org> Wed, 22 Jun 2016 02:57:13 +0200
+
+ libreoffice (1:5.2.0~beta2-1) experimental; urgency=medium
+
+ * New upstream beta release
+ - only initalizes the OpenGL context if we need it (closes: #819153)
+
+ -- Rene Engelhard <rene@debian.org> Tue, 07 Jun 2016 20:32:07 +0200
+
libreoffice (1:5.2.0~beta1-1) experimental; urgency=medium
* New upstream beta release
diff --cc tests/control
index 9269d44,622d02c..cc78fd4
--- 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: