[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.4_dfsg-4-60-g58b606e
The following commit has been merged in the debian-experimental-3.5 branch:
commit 58b606e710d918c023c371e5c2df3e2a276a212d
Author: Rene Engelhard <rene@debian.org>
Date: Wed Feb 13 18:31:24 2013 +0100
link to http://java.sun.com/j2se/1.5/docs/api instead of /1.4.1/ in the odk java docs
diff --git a/changelog b/changelog
index e88c059..45259e9 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,9 @@ libreoffice (1:3.5.7-1) UNRELEASED; urgency=low
* debian/patches/poppler_0_2*.diff: fix build of sdext with poppler
0.21.x and fix the test with 0.20.x, thanks Pino Toscano
+ * debian/patches/odk-link-to-jdk-1.5-docs.diff: link to
+ http://java.sun.com/j2se/1.5/docs/api instead of /1.4.1/ as the former
+ doesn't exist anymore
* debian/rules:
- use generic python3.pc in default case instead of pythonX.Y.pc.
diff --git a/patches/odk-link-to-jdk-1.5-docs.diff b/patches/odk-link-to-jdk-1.5-docs.diff
new file mode 100644
index 0000000..0134a17
--- /dev/null
+++ b/patches/odk-link-to-jdk-1.5-docs.diff
@@ -0,0 +1,11 @@
+--- a/odk/pack/gendocu/makefile.mk-old 2013-02-13 18:27:44.906025467 +0100
++++ b/odk/pack/gendocu/makefile.mk 2013-02-13 18:28:14.770024586 +0100
+@@ -77,7 +77,7 @@
+ -p salhelper $(INCOUT) -t salhelper \
+ -p bridges $(INCOUT) -t bridges
+
+-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)
++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.5/docs/api ./java $(JAVA_PACKAGES)
+
+ JAVADOCLOG = $(MISC)$/javadoc_log.txt
+
diff --git a/patches/series b/patches/series
index c30fc92..d35a857 100644
--- a/patches/series
+++ b/patches/series
@@ -40,3 +40,4 @@ ure-no-etc-opt-ure.diff
poppler_0_20_x.diff
poppler_0_21_x.diff
fix-view-option.diff
+odk-link-to-jdk-1.5-docs.diff
--
LibreOffice packaging repository
Reply to: