[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.4_dfsg-4-5-gff36b75
The following commit has been merged in the master branch:
commit ff36b756c0de9b709b30d091cc2c37eb4a9da46c
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
Conflicts:
changelog
diff --git a/changelog b/changelog
index b20535a..e9d9d10 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,9 @@ libreoffice (1:3.5.4+dfsg-5) UNRELEASED; urgency=low
* debian/patches/fix-view-option.diff: backport fix to fix --view
from libreoffice-3-6 (closes: #697723)
+ * 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:
- make -help-en-us break "the others" to work around 682838
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 fb2aa8d..11403b0 100644
--- a/patches/series
+++ b/patches/series
@@ -50,3 +50,4 @@ soffice-bashisms.diff
he-lucida-sans-unicode.diff
ure-no-etc-opt-ure.diff
fix-view-option.diff
+odk-link-to-jdk-1.5-docs.diff
--
LibreOffice packaging repository
Reply to: