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

[Rene Engelhard <rene@moszumanska.debian.org>]

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

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

commit b3c827615a51db3a2f59438aa25ffe4dacb73682
Merge: e36fcf3 683607b
Author: Rene Engelhard <rene@debian.org>
Date:   Sat Aug 9 20:32:07 2014 +0200

    Merge remote-tracking branch 'origin/debian-experimental-4.3' into debian-experimental-4.4

 changelog       | 4 ++++
 control.gltf.in | 5 ++++-
 rules           | 5 ++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --cc rules
index 16819db,cfbe2ec..f75dc64
--- a/rules
+++ b/rules
@@@ -329,9 -357,12 +329,9 @@@ ENABLE_OPENGL=
  SYSTEM_STUFF += glew
  # this is also not affected by --enable/-disable-opengl but at least has an
  # own --enable/--disable...
 -# and it's a complete mess. external bundled static libraries without a buildsystem,
 -# broken includes for "standard" libs (where collada2gltf even also
 -# contains a gltf copy and opencollada even more "Externals"
 -ENABLE_GLTF=n
 +ENABLE_GLTF=y
  SYSTEM_STUFF += libgltf
- ifeq "$(ENABLE_GTLTF)" "y"
+ ifeq "$(ENABLE_GLTF)" "y"
    ENABLE_COLLADA=n
  endif
  SYSTEM_STUFF += openssl

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