[libreoffice] 02/02: forgot to backport the libegl1 build-dep move

[Rene Engelhard]

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

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

commit d2b801d1b42d38773482f1a78df7738224d8097c
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Dec 20 14:40:17 2016 +0100

    forgot to backport the libegl1 build-dep move
---
 rules | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/rules b/rules
index bc9e100..00fbf52 100755
--- a/rules
+++ b/rules
@@ -1268,9 +1268,6 @@ ifeq "$(BUILD_GTK3)" "y"
   ifneq (cairo,$(findstring cairo,$(SYSTEM_STUFF)))
   $(error GTK3 build fails without system-cairo!!)
   endif
-  ifeq (,$(filter epoxy, $(SYSTEM_STUFF)))
-       BUILD_DEPS += , libegl1-mesa-dev
-  endif
 	GNOME_GTK_RECOMMENDS += libreoffice-gtk3
   ifeq "$(ENABLE_INTROSPECTION)" "y"
 	BUILD_DEPS += , gobject-introspection (>= 1.32.0), libgirepository1.0-dev (>= 1.32)
@@ -1435,6 +1432,8 @@ endif
 
 ifneq (,$(filter epoxy, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libepoxy-dev (>= 1.2)
+else
+       BUILD_DEPS += , libegl1-mesa-dev
 endif
 ifneq (,$(filter glm, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libglm-dev (>= 0.9.6.3)

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