[libreoffice] 01/01: libgltf 0.1.0 was ACCEPTED

[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 6c5f85f94b206df77a57d08d0400c894c846220c
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Dec 23 16:26:13 2016 +0100

    libgltf 0.1.0 was ACCEPTED
---
 changelog               | 4 +---
 control                 | 1 +
 rules                   | 2 +-
 source/include-binaries | 1 -
 tests/control           | 2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/changelog b/changelog
index f350def..3d29431 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.3.0~rc1~git20161218-1) UNRELEASED; urgency=medium
+libreoffice (1:5.3.0~rc1~git20161223-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
 
@@ -15,8 +15,6 @@ libreoffice (1:5.3.0~rc1~git20161218-1) UNRELEASED; urgency=medium
 
   * debian/rules:
     - change glew conditionals/build-deps to epoxy
-    - temporarily use internal libgltf until libgltf 0.1.0 (using epoxy)
-      is out of NEW...
     - ENABLE_GDRIVE=y again on armhf and arm64
 
  -- Rene Engelhard <rene at debian.org>  Sun, 11 Dec 2016 13:35:52 +0100
diff --git a/control b/control
index 1bae67c..3d82c6a 100644
--- a/control
+++ b/control
@@ -71,6 +71,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                libgirepository1.0-dev (>= 1.32),
                libglib2.0-dev (>= 2.15.0),
                libglm-dev (>= 0.9.6.3),
+               libgltf-dev (>= 0.1.0),
                libgraphite2-dev (>= 0.9.3),
                libgstreamer-plugins-base1.0-dev,
                libgstreamer1.0-dev,
diff --git a/rules b/rules
index 00fbf52..d51bd40 100755
--- a/rules
+++ b/rules
@@ -328,7 +328,7 @@ ENABLE_LDAP=y
 USE_OPENLDAP=y
 SYSTEM_STUFF += epoxy
 ENABLE_GLTF=y
-#SYSTEM_STUFF += libgltf
+SYSTEM_STUFF += libgltf
 LIBGLTF_MINVER=0.1.0
 # I think we should only enable it when we have BOTH system-opencollasa
 # and system-collada2gltf working
diff --git a/source/include-binaries b/source/include-binaries
index d23fa59..b942f39 100644
--- a/source/include-binaries
+++ b/source/include-binaries
@@ -5,4 +5,3 @@ tarballs/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 tarballs/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 tarballs/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 tarballs/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz
-tarballs/libgltf-0.1.0.tar.gz
diff --git a/tests/control b/tests/control
index c76850a..d426c0b 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 , opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1-2) , libpcre3-dev , libcol [...]
+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