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

[Rene Engelhard]

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

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

commit 1ed8f312bc6dde4c719ecb7bf29f4016939bf81c
Merge: 11d6f00 9ea7e7c
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Aug 15 21:41:35 2017 +0200

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

 changelog  | 15 ++++++++++++++-
 control    | 20 ++++++++++----------
 control.in | 10 +++-------
 rules      | 64 +++++++++++++++++++++++++++++++++-----------------------------
 4 files changed, 61 insertions(+), 48 deletions(-)

diff --cc changelog
index 67052d4,07feea8..5ade851
--- a/changelog
+++ b/changelog
@@@ -1,16 -1,14 +1,27 @@@
- libreoffice (1:6.0.0~alpha0~git20170806-1) UNRELEASED; urgency=medium
++libreoffice (1:6.0.0~alpha0~git20170815-1) UNRELEASED; urgency=medium
 +
 +  [ Rene Engelhard ]
 +  * New upstream snapshot
 +
 +  * merge from Ubuntu, thanks Rico Tzschichholz:
 +    - Add "elementary" style package
 +
 +  [ Rico Tzschichholz ]
 +  * Add Kannada (kn) langpack
 +
 + -- Rene Engelhard <rene at debian.org>  Thu, 18 May 2017 12:54:08 +0200
 +
+ libreoffice (1:5.4.1~rc1-1) UNRELEASED; urgency=medium
+ 
+   * New upstream release candidate
+ 
+   * debian/patches/stop-shipping-mimelnk-desktop-files.diff: as name says
+     (closes: #872001)
+   * debian/patches/fix-middle-click-paste.diff: as name says; backport
+     from master (closes: #871588)
+ 
+  -- Rene Engelhard <rene at debian.org>  Sat, 12 Aug 2017 10:36:57 +0200
+ 
  libreoffice (1:5.4.0-2) UNRELEASED; urgency=medium
  
    * debian/rules:
diff --cc control
index 47f1f3c,5a42af9..e0eaf74
--- a/control
+++ b/control
@@@ -69,8 -70,8 +70,9 @@@ Build-Depends: ant (>= 1.7.0) [!hppa !i
                 libebook1.2-dev,
                 libeot-dev,
                 libepoxy-dev (>= 1.2),
 +               libepubgen-dev,
                 libetonyek-dev,
+                libetonyek-dev (>= 0.1.5) <!nocheck>,
                 libexpat1-dev,
                 libexttextcat-dev (>= 3.4.1),
                 libfontconfig1-dev,
@@@ -100,9 -101,10 +102,10 @@@
                 liblcms2-dev,
                 libldap2-dev,
                 liblpsolve55-dev (>= 5.5.0.13-5+b1),
 -               libmdds-dev (>= 1.2),
 +               libmdds-dev (>= 1.2.3),
                 libmspub-dev (>= 0.1),
                 libmwaw-dev (>= 0.3.1),
+                libmwaw-dev (>= 0.3.11) <!nocheck>,
                 libmysqlcppconn-dev (>= 1.1.7-4),
                 libmythes-dev (>= 2:1.2),
                 libneon27-gnutls-dev,
diff --cc rules
index 0c93855,de7bd3e..05c3a16
--- a/rules
+++ b/rules
@@@ -701,7 -687,10 +680,10 @@@ endi
  # Debian Stretch
  ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "stretch-backports"
    BUGS=mailto:debian-backports at lists.debian.org
 -  SYSTEM_STUFF := $(filter-out libzmf libstaroffice orcus libgltf cppunit xmlsec,$(SYSTEM_STUFF))
 +  SYSTEM_STUFF := $(filter-out libzmf libstaroffice orcus libgltf cppunit mdds xmlsec,$(SYSTEM_STUFF))
+   ifeq "$(RUN_MAKE_CHECK)" "y"
+     SYSTEM_STUFF := $(filter-out libwps libmwaw,$(SYSTEM_STUFF))
+   endif
    STRETCH_BACKPORT=y
  endif
  ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "UNRELEASED"
@@@ -1198,11 -1201,9 +1199,12 @@@ ifeq "$(USE_EXTERNAL_CXXLIBS)" "y
    ifneq (,$(filter libodfgen, $(SYSTEM_STUFF)))
  	BUILD_DEPS += , libodfgen-dev (>= 0.1)
    endif
 +  ifneq (,$(filter libepubgen, $(SYSTEM_STUFF)))
 +	BUILD_DEPS += , libepubgen-dev
 +  endif
    ifneq (,$(filter libetonyek, $(SYSTEM_STUFF)))
  	BUILD_DEPS += , libetonyek-dev
+ 	BUILD_DEPS += , libetonyek-dev (>= 0.1.5) <!nocheck>
    endif
    ifneq (,$(filter libfreehand, $(SYSTEM_STUFF)))
  	BUILD_DEPS += , libfreehand-dev (>= 0.1)

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