[libreoffice] 01/02: git update; update patches/javadoc-optional.diff to apply
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.
commit 226c121e95bebd40f81533d76be86b0169e9a2fc
Author: Rene Engelhard <rene@debian.org>
Date: Wed Apr 20 12:10:58 2016 +0200
git update; update patches/javadoc-optional.diff to apply
---
changelog | 2 +-
patches/javadoc-optional.diff | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/changelog b/changelog
index e955be3..20b65ce 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.2.0~alpha1~git20160418-1) UNRELEASED; urgency=medium
+libreoffice (1:5.2.0~alpha1~git20160420-1) UNRELEASED; urgency=medium
* New upstream snapshot
- fixes SVG t(ext s)pan import (closes: #665094)
diff --git a/patches/javadoc-optional.diff b/patches/javadoc-optional.diff
index b89c7b8..6bdc495 100644
--- a/patches/javadoc-optional.diff
+++ b/patches/javadoc-optional.diff
@@ -28,9 +28,9 @@ Gemeinsame Unterverzeichnisse: odk-old/source und odk/source.
Gemeinsame Unterverzeichnisse: odk-old/util und odk/util.
--- a/configure.ac-old 2013-05-27 18:32:42.187305241 +0200
+++ b/configure.ac 2013-05-27 18:44:29.131286710 +0200
-@@ -1709,6 +1709,18 @@
- ],,
- [with_doxygen=yes])
+@@ -2057,6 +2057,18 @@ AC_ARG_WITH(doxygen,
+ documentation. Not relevant in the --disable-odk case.]),
+ ,with_doxygen=yes)
+AC_ARG_WITH(
+ [javadoc],
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: