[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.0-1-17-g3137416
The following commit has been merged in the debian-experimental-4.0 branch:
commit 313741690bc281ba1769d7f35b4bd1d2dafca958
Merge: fcb11163949ac57259e54eb9f2ccdf4b4b039773 da1aef258a1e5a0bda10efe322c40f250b905b05
Author: Rene Engelhard <rene@debian.org>
Date: Wed Feb 13 18:42:37 2013 +0100
Merge remote-tracking branch 'origin/debian-experimental-3.6' into debian-experimental-4.0
Conflicts:
changelog
patches/series
diff --combined changelog
index fc72d61,223d24a..a37553c
--- a/changelog
+++ b/changelog
@@@ -1,38 -1,9 +1,41 @@@
-libreoffice (1:3.6.5-2) UNRELEASED; urgency=low
+libreoffice (1:4.0.0-2) UNRELEASED; urgency=low
+ * debian/patches/gendocu-no-notimestamp-with-gjdoc.diff: don't run
+ with -notimestamp for javadoc if we use gjdoc (-> kfreebsd-*)
+ * 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
+ -- 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
+ - contains new driver for mozab (mork). Automatically enabled thus
+ this closes: #321099
+ - now has a basic(!) gnumeric import in experimental mode
+ (closes: #595708)
+ - supports IFERROR (closes: #662798)
+
+ * debian/control.in:
+ - make -impress suggest bluez (for impress remote control)
+ - make libreoffice depend on / -common recommend python(3)-uno for the
+ new python-based wizards
+ * debian/rules:
+ - add new conditionals for new dependencies: liblangtag, liborcus,
+ libmspub, (u)cpp; remove them for gone saxon, librsvg, db
+ - enable sdrmeote on all archs; b-d on libbluetooth-dev on where we
+ enable bluetooth (!kfreebsd-*)
+ - use gstreamer1.0
+ - use --disable-dependency-tracking instead of gb_FULLDEPS= and
+ --enable-hardlink-deliver instead of gb_Deliver_HARDLINK=T
+ - python3 is default now; reverse logic (use python3 per default and
+ and build python2 in a extra step)
+ - add option to build with --enable-mergelibs, not yet enabled.
+ - remove stlport hacks for i386 - not used/needed anymore upstream
+ * debian/uno-libs3.symbols: update
+ * debian/control*.in, debian/rules, debian/scripts/gid2pkgdirs.sh: binfilter
+ is gone. yay.
* debian/*.mime:
- don't use obsolete -no-oosplash anymore, thanks Matthijs Kooijman
for the patch (closes: #698845)
@@@ -40,7 -11,7 +43,7 @@@
* debian/control.mozilla.in: OOo -> "old OOo and OpenDocument"
(closes: #699708)
- -- Rene Engelhard <rene@debian.org> Sun, 03 Feb 2013 15:23:55 +0100
+ -- Rene Engelhard <rene@debian.org> Thu, 07 Feb 2013 00:53:51 +0100
libreoffice (1:3.6.5-1) experimental; urgency=low
diff --combined patches/gendocu-no-notimestamp-with-gjdoc.diff
index 96b56e2,0000000..3e923e4
mode 100644,000000..100644
--- a/patches/gendocu-no-notimestamp-with-gjdoc.diff
+++ b/patches/gendocu-no-notimestamp-with-gjdoc.diff
@@@ -1,45 -1,0 +1,45 @@@
+diff --git a/config_host.mk.in b/config_host.mk.in
+index d7ede5a..8a8f425 100644
+--- a/config_host.mk.in
++++ b/config_host.mk.in
+@@ -263,6 +263,7 @@ export JAVACISGCJ=@JAVACISGCJ@
+ export JAVACISKAFFE=@JAVACISKAFFE@
+ export JAVACOMPILER=@JAVACOMPILER@
+ export JAVADOC=@JAVADOC@
++export JAVADOCISGJDOC=@JAVADOCISGJDOC@
+ @x_JAVALIB@ export JAVALIB=@JAVALIB@
+ export JAVA_HOME=@JAVA_HOME@
+ export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@
+diff --git a/configure.ac b/configure.ac
+index 0cbc7e8..7930ad8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -5987,7 +5987,12 @@ if test "$SOLAR_JAVA" != ""; then
+ JAVADOC=`cygpath -d "$JAVADOC"`
+ JAVADOC=`cygpath -u "$JAVADOC"`
+ fi
++
++ if test `$JAVADOC --version 2>&1 | $GREP -c "gjdoc"` -gt 0; then
++ JAVADOCISGJDOC="yes"
++ fi
+ fi
++AC_SUBST(JAVADOCISGJDOC)
+
+ if test "$SOLAR_JAVA" != ""; then
+ # check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr
+diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk
+index 7345e72..6d3cc03 100644
+--- a/odk/pack/gendocu/makefile.mk
++++ b/odk/pack/gendocu/makefile.mk
+@@ -59,7 +59,10 @@ JAVA_BEAN_SRC_FILES=\
+ $(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)
++-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.5/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)
++.IF "$(JAVADOCISGJDOC)" != "yes"
++JAVADOCPARAMS+= -notimestamp
++.ENDIF
+
+ JAVADOCLOG = $(MISC)$/javadoc_log.txt
+
diff --combined patches/odk-link-to-jdk-1.5-docs.diff
index 0000000,0e1c8a8..c6e878b
mode 000000,100644..100644
--- a/patches/odk-link-to-jdk-1.5-docs.diff
+++ b/patches/odk-link-to-jdk-1.5-docs.diff
@@@ -1,0 -1,11 +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
-@@ -68,7 +68,7 @@
++--- a/odk/pack/gendocu/makefile.mk-old 2013-02-13 18:40:38.002002626 +0100
+++++ b/odk/pack/gendocu/makefile.mk 2013-02-13 18:40:47.166002356 +0100
++@@ -59,7 +59,7 @@
+ $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeConnection.java \
+ $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeWindow.java
+
--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)
++-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= -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.5/docs/api ./java $(JAVA_PACKAGES)
+
+ JAVADOCLOG = $(MISC)$/javadoc_log.txt
+
diff --combined patches/series
index 08e1dfe,8645fa9..aa68a3d
--- a/patches/series
+++ b/patches/series
@@@ -2,14 -2,14 +2,14 @@@ no-minimaltoc.dif
debian-opt.diff
gcj-safe-jni-h-include.diff
jurt-soffice-location.diff
-split-binfilters-and-evo.diff
+split-evoab.diff
debian-debug.diff
#rhino-build-optional.diff
disable-dynamic-list-cpp.diff
fix-system-lpsolve-build.diff
install-fixes.diff
-mention-java-common-package.diff
-help-msg-add-package-info.diff
+#mention-java-common-package.diff
+#help-msg-add-package-info.diff
sensible-lomua.diff
sensible-browser.diff
reportdesign-mention-package.diff
@@@ -19,12 -19,13 +19,13 @@@ make-pyuno-work-with-system-wide-module
#search-usr-share-for-images.diff
make-package-modules-not-suck.diff
mediwiki-oor-replace.diff
-pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
debian-hardened-buildflags.diff
gtk3-hack-explicit-gmodule.diff
-pyuno-py3-module.diff
+py2uno-module.diff
ignore-sc_cellrangesbase-fails.diff
build-dont-run-checks.diff
disable-flaky-unoapi-tests.diff
-ure-no-etc-opt-ure.diff
-poppler_0_21_x.diff
+dont-touch-urd.diff
+sdremote-close-on-non-bluetooth.diff
+ odk-link-to-jdk-1.5-docs.diff
+gendocu-no-notimestamp-with-gjdoc.diff
--
LibreOffice packaging repository
Reply to: