[libreoffice] 03/05: Merge branch 'master' into debian-experimental-5.1
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit e38eaeace377439a5d12697133d80d0842b8f9a1
Merge: da1cae7 0133612
Author: Rene Engelhard <rene@debian.org>
Date: Wed Apr 6 12:52:52 2016 +0200
Merge branch 'master' into debian-experimental-5.1
Conflicts:
changelog
patches/series
changelog | 11 +-
control | 9 +-
control.sdk.in | 4 +-
patches/liborcus-0.11.diff | 2412 ++++++++++++++++++++++++++++++++++++++++++++
patches/series | 1 +
rules | 17 +-
tests/control | 2 +-
tests/sdk-examples | 2 +-
8 files changed, 2441 insertions(+), 17 deletions(-)
diff --cc changelog
index bcae8fe,88189a4..cb7eca9
--- a/changelog
+++ b/changelog
@@@ -1,12 -1,6 +1,12 @@@
+libreoffice (1:5.1.3~rc1~git20160404-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ -- Rene Engelhard <rene@debian.org> Sat, 02 Apr 2016 12:48:35 +0200
+
- libreoffice (1:5.1.2~rc2-1) UNRELEASED; urgency=medium
+ libreoffice (1:5.1.2-1) unstable; urgency=medium
- * New upstream release candidate
+ * New upstream release
* debian/patches/OPENCL_DLL_NAME.diff: backport from master, use .so.1,
not .so
diff --cc patches/series
index 11fca58,a1eefa8..60ef4dd
--- a/patches/series
+++ b/patches/series
@@@ -35,3 -35,6 +35,4 @@@ GCC-6-PR69273-workaround.dif
bash-completion-dir.diff
OPENCL_DLL_NAME.diff
no-packagekit-per-default.diff
-setsdkenv-tripplet.diff
-sdkname-lo.diff
+ liborcus-0.11.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: