[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 2cc97e5da3cf8c8e6e44f3de554623bff1e3cb47
Merge: 1ed8f31 4baa677
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Aug 20 10:32:12 2017 +0200

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

 changelog  |  8 ++++++++
 control    | 39 +--------------------------------------
 control.in | 15 ---------------
 rules      |  7 ++++---
 4 files changed, 13 insertions(+), 56 deletions(-)

diff --cc rules
index 05c3a16,7c114bf..7c87346
--- a/rules
+++ b/rules
@@@ -399,7 -406,7 +399,7 @@@ SYSTEM_STUFF += libexttextca
  SYSTEM_STUFF += cppunit
  CPPUNIT_MINVER=1.14
  DEFAULT_IMAGE=galaxy
- IMAGES:=$(DEFAULT_IMAGE) hicontrast oxygen tango sifr sifr_dark breeze breeze_dark elementary
 -IMAGES:=$(DEFAULT_IMAGE) hicontrast tango sifr sifr_dark breeze breeze_dark
++IMAGES:=$(DEFAULT_IMAGE) hicontrast tango sifr sifr_dark breeze breeze_dark elementary
  CONFIGURE_FLAGS_INDEP += --with-theme="$(IMAGES)"
  ENABLE_MYSQLNATIVE=y
  MYSQL_FLAVOUR=default

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