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 1fed31ff8ab418ec1255266c488ff36b9756b023
Merge: 226c121 475c3e3
Author: Rene Engelhard <r...@debian.org>
Date: Thu Apr 21 07:58:14 2016 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.2
Conflicts:
changelog
patches/series
rules
This bascially reverts a1a35cdcf313335671a1266fa79a2a7a60bdf529
changelog | 8 +++---
patches/GCC-6-PR69273-workaround.diff | 50 -----------------------------------
patches/series | 1 -
3 files changed, 5 insertions(+), 54 deletions(-)
diff --cc changelog
index 20b65ce,6908b31..55512a2
--- a/changelog
+++ b/changelog
@@@ -1,27 -1,9 +1,29 @@@
+libreoffice (1:5.2.0~alpha1~git20160420-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+ - 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 <r...@debian.org> Thu, 26 Nov 2015 10:37:57 +0100
+
- libreoffice (1:5.1.2-5) UNRELEASED; urgency=medium
+ libreoffice (1:5.1.3~rc1-1) unstable; urgency=medium
- * debian/patches/remove-obsolete-dictmgr-include.diff: as name says;
- from libreoffice-5-1 branch. Fix build with hunspell 1.4
+ * New upstream release candidate
+
+ * debian/patcches/GCC-6-PR69273-workaround.diff: remove; AFAICS gcc is
+ fixed
* debian/rules:
- (temporarily) bump libgtk-3-dev build-dep to >= 3.20~ to ensure
diff --cc patches/series
index e43f183,dbaa342..d75739c
--- a/patches/series
+++ b/patches/series
@@@ -28,5 -29,9 +28,4 @@@ hppa-is-32bit.dif
gcj-no-bitness-check.diff
rsc-no-error-about-unknown-switch.diff
debian-branding.diff
- GCC-6-PR69273-workaround.diff
-disable-npapi-plugin-support.diff
-gcc-6.diff
-bash-completion-dir.diff
-OPENCL_DLL_NAME.diff
no-packagekit-per-default.diff
-liborcus-0.11.diff
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
