[libreoffice] 01/06: git update; update patches

[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 d4f7169fb10fe6bb5d50e970870db81fc9ad732e
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Apr 15 17:54:25 2017 +0200

    git update; update patches
---
 changelog                                  | 2 +-
 patches/javadoc-optional.diff              | 2 +-
 patches/make-package-modules-not-suck.diff | 5 ++---
 patches/no-openssl.diff                    | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/changelog b/changelog
index ace6edf..e39efd0 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.4.0~alpha0~git20170224-1) UNRELEASED; urgency=medium
+libreoffice (1:5.4.0~alpha0~git20170415-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
 
diff --git a/patches/javadoc-optional.diff b/patches/javadoc-optional.diff
index 82fc772..5ab2da1 100644
--- a/patches/javadoc-optional.diff
+++ b/patches/javadoc-optional.diff
@@ -45,7 +45,7 @@ Gemeinsame Unterverzeichnisse: odk-old/util und odk/util.
 +    [with_javadoc=yes])
 +
  AC_ARG_WITH(visual-studio,
-     AS_HELP_STRING([--with-visual-studio=<2013/2015/2017>],
+     AS_HELP_STRING([--with-visual-studio=<2015/2017>],
          [Specify which Visual Studio version to use in case several are
 @@ -6290,34 +6302,44 @@
  dnl ===================================================================
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index d94cae7..bc8b90a 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -92,16 +92,15 @@ index 14a1c07..eab8078 100644
  $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,graphicfilter, \
  	svgfilter \
  	flash \
-@@ -248,11 +270,11 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,tde, \
+@@ -266,10 +266,10 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,tde, \
  ))
  
  $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,impress, \
 -	animcore \
- 	placeware \
  	PresenterScreen \
  	PresentationMinimizer \
  	wpftimpress \
-+       slideshow \
++	slideshow \
  ))
  
  $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,onlineupdate, \
diff --git a/patches/no-openssl.diff b/patches/no-openssl.diff
index a0c66c7..938f252 100644
--- a/patches/no-openssl.diff
+++ b/patches/no-openssl.diff
@@ -35,8 +35,8 @@ diff --git a/config_host.mk.in b/config_host.mk.in
 index ddd144e..19f8368 100644
 --- a/config_host.mk.in
 +++ b/config_host.mk.in
-@@ -100,7 +102,6 @@ export DISABLE_ATL=@DISABLE_ATL@
- export DISABLE_ATL=@DISABLE_ATL@
+@@ -93,7 +93,6 @@ export DEFAULT_BRAND_IMAGES=@DEFAULT_BRAND_IMAGES@
+ export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@
  export DISABLE_CVE_TESTS=@DISABLE_CVE_TESTS@
  export DISABLE_DYNLOADING=@DISABLE_DYNLOADING@
 -export DISABLE_OPENSSL=@DISABLE_OPENSSL@

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