[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 61d0cd902bfb025d8f74c4c48a11b67ac321fca9
Merge: b1707b8 84b108b
Author: Rene Engelhard <rene@debian.org>
Date: Thu Jun 23 00:10:13 2016 +0200
Merge remote-tracking branch 'origin/debian-experimental-5.1' into debian-experimental-5.2
Conflicts:
changelog
changelog | 5 +++++
control.in | 4 ++--
rules | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --cc changelog
index f5e7d01,fc37098..b2a815f
--- a/changelog
+++ b/changelog
@@@ -1,46 -1,40 +1,51 @@@
-libreoffice (1:5.1.5~rc1~git20160613-1) UNRELEASED; urgency=medium
+libreoffice (1:5.2.0~rc1-1) experimental; urgency=medium
- * New upstream snapshot
- - only initalizes the OpenGL context if we need it (closes: #819153)
+ * 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
+
- -- Rene Engelhard <rene@debian.org> Sat, 11 Jun 2016 19:24:08 +0200
-
-libreoffice (1:5.1.4~rc2-2) unstable; urgency=medium
+ * debian/control.nlpsolver.in, debian/rules, debian/scripts/gid2pkgdirs.sh:
+ package the NLPSolver from here (closes: #827474)
- * rebuild with clean debian/.. (closes: #827513)
+ -- Rene Engelhard <rene@debian.org> Wed, 22 Jun 2016 02:57:13 +0200
- -- Rene Engelhard <rene@debian.org> Fri, 17 Jun 2016 11:50:22 +0200
+libreoffice (1:5.2.0~beta2-1) experimental; urgency=medium
-libreoffice (1:5.1.4~rc2-1) unstable; urgency=medium
-
- * new upstream release candidate
- - scales gtk3 smooth scaling events... (closes: #826654)
-
- -- Rene Engelhard <rene@debian.org> Tue, 14 Jun 2016 19:16:44 +0200
+ * New upstream beta release
++ - only initalizes the OpenGL context if we need it (closes: #819153)
-libreoffice (1:5.1.4~rc1-1) unstable; urgency=medium
+ -- Rene Engelhard <rene@debian.org> Tue, 07 Jun 2016 20:32:07 +0200
- * new upstream release candidate
+libreoffice (1:5.2.0~beta1-1) experimental; urgency=medium
- -- Rene Engelhard <rene@debian.org> Wed, 01 Jun 2016 18:36:08 +0200
+ * New upstream beta release
+ - fixes SVG t(ext s)pan import (closes: #665094)
+ - fixes Impress slowing down with -gtk(3) and accessibility
+ (closes: #824035)
-libreoffice (1:5.1.3-2) unstable; 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...
+ * 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;
gtk3 3.20 is available anywhere in stretch/sid so revert bump to >= 3.20
- migrate from --ddeb-migration to --dbgsym-migration
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: