[libreoffice] 01/01: git update; we now need hunspell 1.5; update expoxy/libEGL stuff

[Rene Engelhard]

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

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

commit 520dac84f835cf9b549caa766e0da66dfd40c00a
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Dec 14 22:51:27 2016 +0100

    git update; we now need hunspell 1.5; update expoxy/libEGL stuff
---
 changelog     |  2 +-
 control       |  2 +-
 rules         | 10 ++++++----
 tests/control |  2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/changelog b/changelog
index b1a3ed3..1bf0c7d 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.4.0~alpha0~git20161213-1) UNRELEASED; urgency=medium
+libreoffice (1:5.4.0~alpha0~git20161214-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
 
diff --git a/control b/control
index 5982cc9..1e43915 100644
--- a/control
+++ b/control
@@ -79,7 +79,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                libgtk2.0-dev (>= 2.10),
                libharfbuzz-dev (>= 0.9.42),
                libhsqldb1.8.0-java (>> 1.8.0.10) [!hppa !ia64 !mips64 !s390 !sparc],
-               libhunspell-dev (>= 1.1.5-2),
+               libhunspell-dev (>= 1.5),
                libhyphen-dev (>= 2.4),
                libice-dev,
                libicu-dev (>= 52),
diff --git a/rules b/rules
index 7c5c276..6d1a38e 100755
--- a/rules
+++ b/rules
@@ -148,7 +148,7 @@ ifeq "$(ENABLE_JAVA)" "y"
 endif
 JAVAHELPER_MIN_VERSION= (>= 0.37~)
 SYSTEM_STUFF += hunspell
-HUNSPELL_MIN_VER= (>= 1.1.5-2)
+HUNSPELL_MIN_VER= (>= 1.5)
 SYSTEM_STUFF += altlinuxhyph
 USE_LIBHYPHEN=y
 LIBALTLINUXHYPH_MINVER= (>= 0.1.1-11)
@@ -669,7 +669,7 @@ endif
 # 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,$(SYSTEM_STUFF))
+  SYSTEM_STUFF := $(filter-out libzmf libstaroffice orcus libgltf hunspell,$(SYSTEM_STUFF))
   STRETCH_BACKPORT=y
 endif
 ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "UNRELEASED"
@@ -1255,8 +1255,8 @@ 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
+  ifneq (epoxy,$(findstring epoxy,$(SYSTEM_STUFF)))
+  $(error GTK3 conflicts with internal epoxy)
   endif
 	GNOME_GTK_RECOMMENDS += libreoffice-gtk3
   ifeq "$(ENABLE_INTROSPECTION)" "y"
@@ -1422,6 +1422,8 @@ endif
 
 ifneq (,$(filter epoxy, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libepoxy-dev (>= 1.3.1)
+else
+       BUILD_DEPS += , libegl1-mesa-dev
 endif
 ifneq (,$(filter glm, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libglm-dev (>= 0.9.6.3)
diff --git a/tests/control b/tests/control
index 92aa4a7..7b0f1b0 100644
--- a/tests/control
+++ b/tests/control
@@ -1,5 +1,5 @@
 Tests: junit-subsequentcheck
-Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.1.0) , opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1-2 [...]
+Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.1.0) , opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1-2 [...]
 
 Tests: pyuno-import
 Depends: python3-uno

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