[libreoffice] 64/152: Merge branch 'dokochanges' into ubuntu-xenial-5.1

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.

commit dcdce01bf864ad3b134e547943c4b07adad35e10
Merge: f2ef6a6 6e5e314
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Apr 4 23:11:26 2016 +0200

    Merge branch 'dokochanges' into ubuntu-xenial-5.1

 changelog                | 13 ++++++++++++-
 patches/build-fixes.diff | 13 +++++++++++++
 patches/series           |  1 +
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --cc changelog
index a8a847c,1ab0139..9bc69bf
--- a/changelog
+++ b/changelog
@@@ -1,10 -1,15 +1,21 @@@
 +libreoffice (1:5.1.2~rc2-0ubuntu1~xenial1) xenial; urgency=medium
 +
 +  * new upstream rc
-   * removed old openjdk-7 dep in subsequentcheckbase
 +
 + -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Wed, 30 Mar 2016 12:37:01 +0200
 +
+ libreoffice (1:5.1.1-0ubuntu3) xenial; urgency=medium
+ 
+   * Fix build failure in xmloff.
+ 
+  -- Matthias Klose <doko at ubuntu.com>  Thu, 31 Mar 2016 18:33:49 +0200
+ 
+ libreoffice (1:5.1.1-0ubuntu2) xenial; urgency=medium
+ 
+   * libreoffice-subsequentcheckbase: Depend on default-jdk.
+ 
+  -- Matthias Klose <doko at ubuntu.com>  Thu, 31 Mar 2016 17:17:30 +0200
+ 
  libreoffice (1:5.1.1-0ubuntu1) xenial; urgency=medium
  
    * upstream released an rc3 = final
diff --cc patches/series
index 4e71c1a,0f91ecc..6c22064
--- a/patches/series
+++ b/patches/series
@@@ -30,3 -30,5 +30,4 @@@ disable-npapi-plugin-support.dif
  lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
  integraltrans.diff
  unity-default-breeze.diff
 -tdf-92067.diff
+ build-fixes.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git