The following commit has been merged in the debian-experimental-4.1 branch:
commit 4834e4f0bb559c49a376146c44ab09d1af6950ce
Author: Rene Engelhard <r...@debian.org>
Date: Tue May 28 02:40:57 2013 +0200
more javadoc-optional.diff fixes
diff --git a/patches/javadoc-optional.diff b/patches/javadoc-optional.diff
index 3c4cdef..ebbd831 100644
--- a/patches/javadoc-optional.diff
+++ b/patches/javadoc-optional.diff
@@ -49,7 +49,7 @@ Gemeinsame Unterverzeichnisse: odk-old/util und odk/util.
dnl Checks for javadoc
dnl ===================================================================
-if test "$SOLAR_JAVA" != ""; then
-+if test "$SOLAR_JAVA" != "" -a "$enable_odk" = no; then
++if test "$SOLAR_JAVA" != "" -a "$enable_odk" != no; then
if test -z "$with_jdk_home"; then
AC_PATH_PROG(JAVADOC, javadoc)
else
@@ -104,7 +104,7 @@ Gemeinsame Unterverzeichnisse: odk-old/util und odk/util.
fi
AC_SUBST(JAVADOCISGJDOC)
-+if test "JAVADOCISGJDOC"; then
++if test "$JAVADOCISGJDOC" = "yes"; then
+ unset JAVADOC
+fi
+
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1uh7z1-0000q4...@vasks.debian.org
