[libreoffice] 01/02: Merge remote-tracking branch 'origin/debian-experimental-5.4' into debian-experimental-5.5

[Rene Engelhard]

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

rene pushed a commit to branch debian-experimental-5.5
in repository libreoffice.

commit d243af8ccbb2790ebc805cb32eaec22a99b1aca1
Merge: 46ccffc 0fbc6d9
Author: Rene Engelhard <rene at debian.org>
Date:   Sat May 27 12:10:23 2017 +0200

    Merge remote-tracking branch 'origin/debian-experimental-5.4' into debian-experimental-5.5

 changelog                                 |  28 +++--
 control                                   |  57 +++++-----
 copyright                                 |  11 +-
 patches/cppunit-optional.diff             | 180 ++++++++++++++++++++++++++++++
 patches/disable-unused-test-programs.diff |  53 +++++++++
 patches/series                            |   2 +
 rules                                     |  50 +++++++--
 scripts/gid2pkgdirs.sh                    |   4 +-
 source/include-binaries                   |   1 +
 tests/control                             |   2 +-
 10 files changed, 332 insertions(+), 56 deletions(-)

diff --cc changelog
index 3a27fbd,40ec992..bf3d630
--- a/changelog
+++ b/changelog
@@@ -1,10 -1,4 +1,10 @@@
 +libreoffice (1:5.5.0~alpha0~git20170518-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +
 + -- Rene Engelhard <rene at debian.org>  Thu, 18 May 2017 12:54:08 +0200
 +
- libreoffice (1:5.4.0~beta1-1) UNRELEASED; urgency=medium
+ libreoffice (1:5.4.0~beta1-1) experimental; urgency=medium
  
    * New upstream beta release
      - is now able to do "insert->image, choose pdf". Not insert->docunent

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