[libreoffice] 01/02: git update; update no-openssl.diff to apply again

[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 901796b4566f6cddefbf4ade71d72e57e49eabf0
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Sep 11 19:38:43 2017 +0200

    git update; update no-openssl.diff to apply again
---
 changelog               | 2 +-
 patches/no-openssl.diff | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/changelog b/changelog
index 9f7c411..3e5f92d 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:6.0.0~alpha0~git20170903-1) UNRELEASED; urgency=medium
+libreoffice (1:6.0.0~alpha0~git20170910-1) UNRELEASED; urgency=medium
 
   [ Rene Engelhard ]
   * New upstream snapshot
diff --git a/patches/no-openssl.diff b/patches/no-openssl.diff
index d58d6fa..f7b70fe 100644
--- a/patches/no-openssl.diff
+++ b/patches/no-openssl.diff
@@ -133,7 +133,7 @@ diff --git a/oox/CppunitTest_oox_tokenmap.mk b/oox/CppunitTest_oox_tokenmap.mk
 index 9eac2a5..ef6d5c9 100644
 --- a/oox/CppunitTest_oox_tokenmap.mk
 +++ b/oox/CppunitTest_oox_tokenmap.mk
-@@ -23,19 +23,10 @@ $(eval $(call gb_CppunitTest_use_api,oox_tokenmap,\
+@@ -20,19 +20,10 @@ $(eval $(call gb_CppunitTest_use_sdk_api,oox_tokenmap))
  
  $(eval $(call gb_CppunitTest_use_library_objects,oox_tokenmap,oox))
  
@@ -152,7 +152,7 @@ index 9eac2a5..ef6d5c9 100644
 -endif
  
  $(eval $(call gb_CppunitTest_use_libraries,oox_tokenmap,\
-     basegfx \
+     avmedia \
 diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
 index fcd7215..a178883 100644
 --- a/oox/Library_oox.mk

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