[libreoffice] 24/152: Merge commit 'cfd4add4c42cc43f26376a8dec622a52ab762615' 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 dc05b21ce13e2f547340405d2ed8dae8d654643a
Merge: f936e96 cfd4add
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Nov 30 14:02:25 2015 +0100

    Merge commit 'cfd4add4c42cc43f26376a8dec622a52ab762615' into ubuntu-xenial-5.1

 changelog                                      |  34 ++++++-
 patches/debian-branding.diff                   |  13 +++
 patches/debian-debug.diff                      |  62 +++---------
 patches/disable-flaky-tests.diff               |  77 +++++++--------
 patches/fix-xmlparse-with-icu55.diff           |  33 -------
 patches/icu-56.diff                            | 131 -------------------------
 patches/make-package-modules-not-suck.diff     |  12 +--
 patches/rsc-no-error-about-unknown-switch.diff |   2 +-
 patches/series                                 |   2 -
 rules                                          |  38 ++++---
 scripts/get_ttf_version.pl                     |  32 ++++++
 11 files changed, 159 insertions(+), 277 deletions(-)

diff --cc changelog
index 4bf7d26,0201685..d23d65a
--- a/changelog
+++ b/changelog
@@@ -1,23 -1,27 +1,46 @@@
- libreoffice (1:5.1.0~beta1-0ubuntu1) xenial; urgency=medium
++libreoffice (1:5.1.0~beta1-1ubuntu1) xenial; urgency=medium
 +
 +  * new upstream prerelease
 +
 + -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Fri, 27 Nov 2015 12:12:53 +0100
 +
+ libreoffice (1:5.1.0~beta1-1) experimental; urgency=medium
+ 
+   * New upstream beta release
+     - fixes crash when selecting the border style in some window managers
+       (closes: #801504)
+ 
+   * debian/patches/disable-flaky-tests.diff:
+     - disable also libreofficekit_tiledrendering as it SIGSEGVs after OK
+       (but lloconv works) with merged libs
+     - remove checkBookmarks disabling, should work now according to
+       upstream
+ 
+   * debian/rules:
+     - fix up .desktop (closes: #804669), remove (D|d)ev and version from
+       Icon= and Exec=
+     - re-enable checks
+ 
+   * debian/scripts/get_ttf_version.pl, debian/rules: drop fontforge B-D-I;
+     use pure perl for determining the version; taken from upstreams win
+     installer
+ 
+  -- Rene Engelhard <rene at debian.org>  Thu, 26 Nov 2015 00:35:29 +0100
+ 
 +libreoffice (1:5.1.0~alpha1-4ubuntu4) xenial; urgency=medium
 +
 +  * add all build deps for report builder
 +
 + -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Thu, 26 Nov 2015 15:31:59 +0100
 +
 +libreoffice (1:5.1.0~alpha1-4ubuntu3) xenial; urgency=medium
 +
 +  * revert move of liblpsolve when --with-system-lpsolve, is already done
 +    upstream
 +
 + -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Tue, 24 Nov 2015 05:09:06 +0100
 +
- libreoffice (1:5.1.0~alpha1-4ubuntu2) xenial; urgency=medium
+ libreoffice (1:5.1.0~alpha1-4) experimental; urgency=medium
  
    * debian/rules:
      - work around the experimental buildds' resolver bug installing
diff --cc patches/series
index feb1717,504f0e1..42a819c
--- a/patches/series
+++ b/patches/series
@@@ -26,7 -27,4 +26,5 @@@ odk-no-dot.dif
  hppa-is-32bit.diff
  gcj-no-bitness-check.diff
  rsc-no-error-about-unknown-switch.diff
- fix-xmlparse-with-icu55.diff
- icu-56.diff
 -debian-branding.diff
 +lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
 +integraltrans.diff
diff --cc rules
index 305f961,cc539fb..cc38149
--- a/rules
+++ b/rules
@@@ -68,13 -68,11 +68,13 @@@ USE_SOURCE_TARBALLS=
  USE_GIT_TARBALLS=n
  ifeq "$(USE_GIT_TARBALLS)" "y"
  GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
 -lo_sources_ver=$(shell grep AC_INIT $(SOURCE_TREE)/configure.ac | grep documentfoundation | cut -d, -f2 | sed -e 's,\[,,' -e 's,\],,')
 +# bootstraping this from the source tree is breaking get-orig-source
 +#lo_sources_ver=$(shell grep AC_INIT $(SOURCE_TREE)/configure.ac | grep documentfoundation | cut -d, -f2 | sed -e 's,\[,,' -e 's,\],,')
 +lo_sources_ver=5.1.0.0.beta1-buildfix1
  # NOT in proper libreoffice-3-6 branch
  # use ./g checkout -b tag-libreoffice-3.6.2.1 libreoffice-3.6.2.1
 -GIT_TAG=libreoffice-$(lo_sources_ver)-buildfix1
 +GIT_TAG=libreoffice-$(lo_sources_ver)
- GIT_BRANCH=master
+ GIT_BRANCH=libreoffice-5-1
  endif
  ifeq "$(USE_SOURCE_TARBALLS)" "y"
  lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)

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