[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.0-1-2-ged93a2e
The following commit has been merged in the debian-experimental-4.0 branch:
commit ed93a2e23818736897b1ba92af80e6af84eace9a
Author: Rene Engelhard <rene@debian.org>
Date: Fri Feb 8 22:20:17 2013 +0100
revert upstream change to use -notimestamp for javadoc, as it breaks on kfreebsd
diff --git a/changelog b/changelog
index 5d578ad..1305fdf 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:4.0.0-2) UNRELEASED; urgency=low
+
+ * debian/patches/gendocu-no-notimestamp.diff: revert upstream change to use
+ -notimestamp for javadoc, as it breaks on kfreebsd (-> gjdoc..)
+
+ -- Rene Engelhard <rene@debian.org> Fri, 08 Feb 2013 22:14:15 +0100
+
libreoffice (1:4.0.0-1) experimental; urgency=low
* new upstream release
diff --git a/patches/gendocu-no-notimestamp.diff b/patches/gendocu-no-notimestamp.diff
new file mode 100644
index 0000000..bc372ee
--- /dev/null
+++ b/patches/gendocu-no-notimestamp.diff
@@ -0,0 +1,24 @@
+22:17 <@_rene_> vmiklos: hmm, I need to locally revert
+ ac631f9ebddbc3674f9628d941e81a7ee73c6c66. kfreebsd-* (yet) only
+ has java-gcj-compat/gcj-jdk available thus javadoc is de-facto
+ gjdoc and that doesn't know -notimestamp...
+22:17 < IZBot> core - odk: use javadoc -notimestamp, so generated docs don't
+ unnecessarily differ after each build -
+http://cgit.freedesktop.org/libreoffice/core/commit/?id=ac631f9ebddbc3674f9628d941e81a7ee73c6c66
+22:18 <@_rene_> .oO ( otoh, maybe I'll just implement a --without-docs option,
+ as they don't even need to be built when you only build the
+ binaries... )
+22:21 <@_rene_> vmiklos: see
+https://buildd.debian.org/status/logs.php?pkg=libreoffice&ver=1%3A4.0.0-1&arch=kfreebsd-i386 :)
+
+--- a/odk/pack/gendocu/makefile.mk-old 2013-02-08 22:21:38.581488115 +0100
++++ b/odk/pack/gendocu/makefile.mk 2013-02-08 22:21:53.449487676 +0100
+@@ -59,7 +59,7 @@
+ $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeConnection.java \
+ $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeWindow.java
+
+-JAVADOCPARAMS= -notimestamp -use -splitindex -windowtitle "Java UNO Runtime Reference" -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath $(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline ../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.4.1/docs/api ./java $(JAVA_PACKAGES)
++JAVADOCPARAMS= -use -splitindex -windowtitle "Java UNO Runtime Reference" -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath $(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline ../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.4.1/docs/api ./java $(JAVA_PACKAGES)
+
+ JAVADOCLOG = $(MISC)$/javadoc_log.txt
+
diff --git a/patches/series b/patches/series
index 8dfed33..ef0ebd5 100644
--- a/patches/series
+++ b/patches/series
@@ -27,3 +27,4 @@ build-dont-run-checks.diff
disable-flaky-unoapi-tests.diff
dont-touch-urd.diff
sdremote-close-on-non-bluetooth.diff
+gendocu-no-notimestamp.diff
--
LibreOffice packaging repository
Reply to: