The following commit has been merged in the debian-experimental-3.5 branch: commit 25c2f152abe4d089407e83f4750db0f9f071fea6 Merge: 6956528e589d95be84f86f61155a2ce672c2350e 2823d6987cfdea76c18353b3e0c290a2c85e62c4 Author: Rene Engelhard <r...@debian.org> Date: Tue Mar 6 22:42:10 2012 +0100
Merge remote branch 'origin/master' into debian-experimental-3.5 diff --combined changelog index 5fa561a,01b3e4a..1fa8417 --- a/changelog +++ b/changelog @@@ -1,291 -1,103 +1,294 @@@ -libreoffice (1:3.4.5-5) UNRELEASED; urgency=low +libreoffice (1:3.5.1~rc2-1) UNRELEASED; urgency=low - * debian/patches/nsplugin-fix-SimpleFileAccess-instance.diff: - fix nsplugin to create a correct com.sun.star.ucb.SimpleFileAccess - instance (closes: #661747) - * debian/patches/fix-debian-opt.diff: fix to actually make test and grep + [ Rene Engelhard ] + * new upstream release candidate + - fixes up excessive numbers of "JRE is defective" messages + (closes: #602127) + - fixes populating "Recent Documents" after a profile upgrade + (closes: #660185) + - fixes nsplugin to create a correct + com.sun.star.ucb.SimpleFileAccess instance (closes: #661747 + + * debian/patches/armhf-bridges-doubles.diff: some more armhf fixes + (+ testcase) from master + * debian/patches/debian-hardened-buildflags.diff: use hardened + buildflags from dpkg-buildflags (closes: #656643) + * debian/patches/debian-opt.diff: fix to actually make test and grep work + * debian/patches/bibliography-no-crash-if-no-base.diff: backport fix + from libreoffice-3-5 to not crash Tools -> Bibliography if -base isn't + installed (closes: #602953, #598809) - * debian/control.in: build-conflict against - libc0.1-dev (= 2.13-26) [kfreebsd-i386 kfreebsd-amd64] + * debian/rules, debian/components: rename ext-sources to src, as done + upstream + * debian/control.fonts.in: make ttf-opensymbol Priority: extra, thanks + lintian * debian/rules: + - --with-mingw -> --with-mingw-cross-compiler; remove obsolete + "export MINGWSTRIP" hack + - don't set ENABLE_SDBC_POSTGRESQL=n when building no extensions, as + this isn't an extension anymore + - remove obsolete "export MINGWSTRIP" hack + - fix (>= 1.1.9) for libcommons-logging-java to actually work, thanks + Rico Tzschichholz + - chmod 755 setsdkenv_unix + - also disable graphite on alpha (closes: #661294) + - actually filter-out also armhf and powerpc powerpcspe ppc64 s390x for + OOO_REPORTDESIGN_ARCHS - remove -O0 setting via ARCH_FLAGS, already handled by debian-opt.diff + * debian/control.in: build-conflict against + libc0.1-dev (= 2.13-26) [kfreebsd-i386 kfreebsd-amd64] + * debian/control.mozilla.in: stricten dependencies to 3.5, thanks + Mario Holbe for the observation + * debian/rules, debian/control.mozilla.in: update nsplugin conditional + to actually disable nsplugin build (and get rid of xulrunner-dev build-dep) + if disabled * debian/*.triggers, debian/*.prerm.in: - add activate triggers for /usr/lib/libreoffice/share/extensions to the respetive extensions. Run sync_extensions after rm -rf'ing the dir already in preinst (upgrade) (closes: #658646) + [ Bjoern Michaelsen ] + * debian/patches/fix-quickstart-shutdown.diff: fix logout with + quickstarter (closes: #632920, #605268) + - -- Rene Engelhard <r...@debian.org> Mon, 05 Mar 2012 17:14:58 +0100 + -- Rene Engelhard <r...@debian.org> Tue, 06 Mar 2012 22:30:46 +0100 -libreoffice (1:3.4.5-4) unstable; urgency=low +libreoffice (1:3.5.0-2) experimental; urgency=low + + [ Rene Engelhard ] + * debian/patches/armhf-bridges*.diff: add armhf bridges fixes from + Jani Monoses (LP: #900636) + * debian/patches/revert-468fe685e3c58c84bce6d9a48b931dcc21682679.diff: + remove, obsolete + * debian/patches/icu-arm.diff: fix internal icu build on arm. + * debian/patches/move-binfilter-mimetypes-in-extra-desktop-file.diff: + as name says; imported from Fedora + * debian/patches/passwordTest-test-old-password-algorith-too.diff: as name + says (see fdo#45171 and #659733/#659720) + * debian/patches/getMIMEDescription-mismatch.diff: update with proper + ./configure check, thanks Lubok Lunak...; also update internal header - * debian/patches/armhf-bridges-doubles.diff: some more armhf fixes - (+ testcase) from master * debian/rules: - - remove obsolete "export MINGWSTRIP" hack - - fix (>= 1.1.9) for libcommons-logging-java to actually work, thanks - Rico Tzschichholz - - chmod 755 setsdkenv_unix - - also disable graphite on alpha (closes: #661294) - - actually filter-out also armhf for OOO_REPORTDESIGN_ARCHS + - remove obsolete (and buggy) conditional icu-on-arm-fails breaking + the build + - apply patch from Rico Tzschichholz to update some configure flags + to new names in 3.5.x; remove some obsolete ones + - don't try to mv libvclplug_gtk3.so if not built, thanks Rico + Tzschichholz again + - disable base (libebook1.2-dev missing and nsplugin (xulrunner-dev + missing) on s390x + - disable *all* extensions on s390*, extension mechanism broken + * debian/source/components: remove, unused and causes lintian error + + [ Bjoern Michaelsen ] + * debian/libreoffice-common.postrm.in: remove mismerged superfluous fi + (closes: #660580) - -- Rene Engelhard <r...@debian.org> Sun, 26 Feb 2012 20:48:19 +0000 + -- Rene Engelhard <r...@debian.org> Wed, 22 Feb 2012 08:34:06 +0100 -libreoffice (1:3.4.5-3) unstable; urgency=low +libreoffice (1:3.5.0-1) experimental; urgency=low - * debian/patches/mediwiki-oor-replace.diff: replace oor:fuse by oor:replace - for -wiki-publishers config (hopefully closes: #616011) - * debian/patches/armhf-bridges*.diff: add armhf bridges fixes from - Jani Monoses (LP: #900636) + * LibreOffice 3.5.0 final release (identical to rc3) + + * debian/patches/no-rcX-in-final.diff: don't show rc3, it's not a rc + amymore... + * debian/patches/patches/make-gengal-work-again.diff: register gengal.bin + executable to get proper rpath and remove gengalrc + * debian/patches/odk-fix-rdb-paths.diff: backport fix to fix rdb path + in settings/std.mk in the SDK * debian/rules: - - install full changelog only for packages with the same name in OOo - times; strip pre-libreoffice entries otherwise. - - enable ca-XV, put into -{l10n,help}-ca - - backport from 3.5: don't add unversioned base-files dependency in base + - install found .gdb-py files into respective -dbg packages - add additional libpoppler-private-dev build-dep for new popplers * debian/control.in, debian/libreofice-common.p*: apply patch from Colin Watson to use Pre-Depends rather than 'dpkg-maintscript-helper supports' guards (closes: #659867) - * debian/source/components: remove, unused and causes lintian error - * debian/control.fonts.in: make ttf-opensymbol Priority: extra, thanks - lintian + * debian/watch: point to download.documentfoundation.org/libreoffice/src + instead of dev-builds + + -- Rene Engelhard <r...@debian.org> Tue, 14 Feb 2012 17:56:49 +0000 + +libreoffice (1:3.5.0~rc3-1) experimental; urgency=low + + * new upstream release candidate + + * debian/patches/SwTblBoxFormula-destructor.diff: work around link error + on armel by specifying explicit SwTblBoxFormula destructor, thanks + Michael Meeks + * debian/patches/ia64-oox-size.diff: build oox on ia64 with -Os + as otherwise it gets too big to link + * debian/patches/mediwiki-oor-replace.diff: replace oor:fuse by oor:replace + for -wiki-publishers config (hopefully closes: #616011) + + * debian/rules: + - give gb_FULLDEPS= to actual make check call, not debian/rules + check + - simplify -dbg/--enable-symbols conditionals + - build with default boost again but add build-dep on g++-4.6 (>= 4.6.2-12) + + -- Rene Engelhard <r...@debian.org> Sat, 04 Feb 2012 11:27:46 +0100 + +libreoffice (1:3.5.0~rc2-2) experimental; urgency=low + + * debian/rules: + - fix another merge error to really fix patch rule in check + - enable ca-XV, put into -{l10n,help}-ca + + -- Rene Engelhard <r...@debian.org> Sun, 29 Jan 2012 17:00:47 +0100 + +libreoffice (1:3.5.0~rc2-1) experimental; urgency=low + + * new upstream release candidate + + * debian/rules: + - fix patch rule in check + - fix merge errors: $(ARCH) -> $(DEB_HOST_ARCH) + - install full changelog only for packages with the same name in OOo + times; strip pre-libreoffice entries otherwise. + - (re-)enable -script-provider-js + * debian/libreoffice-common.postrm.in: fix merge: + @OOBRANDDIR@/@OOBASISDIR@ -> @OODIR@ + + -- Rene Engelhard <r...@debian.org> Fri, 27 Jan 2012 09:23:07 +0000 + +libreoffice (1:3.5.0~rc1-1) experimental; urgency=low + + * new upstream release candidate + + * debian/patches/gbuild-JavaClassSet-honour-JAVAFLAGS.diff: honour + JAVAFLAGS (-source 1.5 -target 1.5) - -- Rene Engelhard <r...@debian.org> Wed, 22 Feb 2012 16:36:27 +0000 + * debian/rules: + - fix Java stuff in SDK install (don't remove /usr/share/libreoffice/sdk) + - work around smoketest failure; disable base for powerpc(spe)/ppc64 as + for armel + - switch to .xz tarballs, upstream will only provide those... + + * merge from ubuntu-precise-3.5: + - reenable junit tests -libreoffice (1:3.4.5-2) unstable; urgency=low + -- Rene Engelhard <r...@debian.org> Fri, 20 Jan 2012 10:19:36 +0000 +libreoffice (1:3.5.0~beta3-1) experimental; urgency=low + + * new upstream beta release + + * debian/patches/fix-ARM-detection-in-set-soenv.diff: fix for armhf... + * debian/patches/revert-468fe685e3c58c84bce6d9a48b931dcc21682679.diff: + fix armhf build in bridges... + * debian/patches/ppc-fix-soffice.sh.diff: make soffice.sh on ppc correct * debian/patches/jdbc-driver-threading.diff: backport fix for Attach/Detach-CurrentThread slowness from libreoffice-3-5 (closes: #644957) + + * debian/libreoffice-core.preinst.in: + - rm -f /var/lib/libreoffice/basis3.4/program/services.rdb on upgrade + (and for safety on install, too) (closes: #650341) + * debian/libreoffice-{common,core}.postrm.in: + - on remove, remove all /var/lib content on remove (prereg/bundled + basisX.Y) * debian/rules: + - stop creating a dependency on ure for uno-libs3 in .shlibs, use + uno-libs3 instead - specify correct --with-servlet-api= after recent libcommons-logging-java changes + * debian/uno-libs3.symbols: + - use uno-libs3, not ure as dependency + * debian/control.ure.in: + - remove obsolete cli-uno-bridge Suggests - -- Rene Engelhard <r...@debian.org> Tue, 17 Jan 2012 01:36:05 +0000 + * merge from ubuntu-precise-3.5: + - add debian multiarch support for Qt4 + - no dependencies needed for full builds + + propagate gb_FULLDEPS + - get rid of obsolete BrOffice specialcasing (LP: #884786) + - enable l10n + * merge from libreoffice_3.5.0_beta2-2ubuntu2 + - enable gio, disable gvfs -libreoffice (1:3.4.5-1) unstable; urgency=medium + -- Rene Engelhard <r...@debian.org> Tue, 17 Jan 2012 10:03:24 +0000 - * new upstream release - - fixes build with bleeding edge external boost and gcc (closes: #652784) +libreoffice (1:3.5.0~beta2-2) experimental; urgency=low - * debian/libreoffice-{common,core}.postrm.in: - - on remove, delete created services.rdb (closes: #650341) and - remove all /var/lib content on remove (prereg/bundled, basisX.Y) + * debian/patches/fix-ARM-detetcion-in-set-soenv.diff: as name says + * debian/patches/make-package-modules-not-suck.diff: add missing , so + that kde4be1.uno.so correctly ends up in -kde + + * debian/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff, + debian/rules: make patch apply again + + * debian/rules: + - force boost to 1.46 due to ICE with 1.48 + - prevent creating bogus gcc- build-dependency on gcj archs + + -- Rene Engelhard <r...@debian.org> Fri, 30 Dec 2011 00:11:06 +0100 + +libreoffice (1:3.5.0~beta2-1) experimental; urgency=low + + [ Rene Engelhard ] + * new upstream beta release + + * debian/*: + - use "core" sources, no libreoffice-build anymore. Loads of updates. + + * debian/patches/*: move from patches/hotfixes to patch the code + directly without libreoffice-build + + * debian/rules, debian/vars.*, debian/*.links.in: + - loads of updates for new envfile name and gone LIBSUFFIX + * debian/rules: + - enable new build against Gtk3 + - bump python b-d to >= 2.6 as we don't work with earlier anymore. + Also build python3-uno + - add new conditionals and build-deps for new (libvisio,librsvg,gettext, + libcmis) libraries and libexttextcat switch - and those we needed to move + from libreoffice-builds' distro-configs. Adapt for changed configure + options + - add new conditionals and build-deps for new libvisio,librsvg,gettext, + libcmis usage and libexttextcat switch - and those we needed to move + from libreoffice-builds' distro-configs + - run new "make check" instead of solenv/bin/subsequenttests and + manual smoketest + - remove fakeroot hackaround + * debian/rules, debian/make-package-modules-not-suck.diff: migrate loads of + mv's in debian/rules to proper scp2 patches + * debian/rules, debian/control.in: + - move from self-defined UPSTREAM_VERSION/ARCH etc. to use + /usr/share/dpkg/*.mk * debian/control.in: + - update descriptions for new Gtk(3) print dialog - move libreoffice, libreoffice-l10n-{in,za} to new metapackages section - * debian/vars.armhf: add * debian/control.fonts.in: ttf-opensymbol should be in oldlibs, thanks lintian - * debian/rules: - - prevent creating bogus gcc- build-dependency on gcj archs - - fix qstart.desktop Exec= (closes: #655076) - - update fakeroot hack for multiarch paths - - stop creating a dependency on ure for uno-libs3 in .shlibs, use - uno-libs3 instead - * debian/uno-libs3.symbols: - - use uno-libs3, not ure as dependency + * debian/patches: + - migrate reportdesign-mention-package.diff from libreoffice/build + - migrate jdbc-driver-classpaths.diff from libreoffice/build + - migrate mysqlcppconn-mysqlclient-SONAME.diff from libreoffice/build + - migrate system-python-{ure-bootstrap,uno-path}.diff and + pyuno-ooodir.diff from libreoffice/build + - migrate split-icons-search-usr-share.diff from libreoffice/build + * debian/vars.armhf: add - * merge from ubuntu-precise-3.5: - - add debian multiarch support for Qt4 + [ Bjoern Michaelsen ] + * debian/rules: + - set CURDIR before first use and use safe method to set it + - update GIT_ vars, add GIT_BASEURL for local mirrors + - update get-orig-source + - build needs the ext-sources + * debian/README: + - update most outdated README sections + * debian/patches: + - migrate mention-java-common-package.diff from libreoffice/build + - migrate help-msg-add-package-info.diff from libreoffice/build + - update help-msg-add-package-info.diff, replace openoffice.org with + libreoffice + - migrate sensible-ooomua.diff from libreoffice/build and rename to + sensible-lomua; add icedove and thunderbird as fallbacks + - migrate sensible-browser.diff from libreoffice/build - -- Rene Engelhard <r...@debian.org> Thu, 12 Jan 2012 18:56:37 +0000 + -- Rene Engelhard <r...@debian.org> Tue, 27 Dec 2011 10:16:18 +0000 libreoffice (1:3.4.4-2) unstable; urgency=medium diff --combined patches/bibliography-no-crash-if-no-base.diff index 0000000,2a2dc9f..3aff0e2 mode 000000,100644..100644 --- a/patches/bibliography-no-crash-if-no-base.diff +++ b/patches/bibliography-no-crash-if-no-base.diff @@@ -1,0 -1,53 +1,50 @@@ ---- /dev/null 2012-03-01 23:57:10.294450749 +0100 -+++ libreoffice-3.4.5/libreoffice-build/patches/hotfixes/bibliography-no-crash-if-no-base.diff 2012-03-06 22:25:52.000000000 +0100 -@@ -0,0 +1,50 @@ -+From 33ef1ffbd15994ec71be99d38c0d5171c63344a2 Mon Sep 17 00:00:00 2001 -+From: Bjoern Michaelsen <bjoern.michael...@canonical.com> -+Date: Tue, 06 Mar 2012 17:16:35 +0000 -+Subject: lp#527938, debian#602953, fdo#33266, i#105408: do not crash on clicking bibliography when base isnt installed -+ -+Signed-off-by: Michael Meeks <michael.me...@suse.com> -+--- -+diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx -+index c80c81e..9159124 100644 -+--- extensions/source/bibliography/bibload.cxx -++++ extensions/source/bibliography/bibload.cxx -+@@ -54,6 +54,7 @@ -+ #include <com/sun/star/text/BibliographyDataField.hpp> -+ #include <com/sun/star/form/XLoadListener.hpp> -+ #include <com/sun/star/frame/XLayoutManager.hpp> -++#include <com/sun/star/uno/XAggregation.hpp> -+ #include <toolkit/awt/vclxwindow.hxx> -+ #include <vcl/window.hxx> -+ #include <vcl/edit.hxx> -+@@ -243,13 +244,27 @@ void BibliographyLoader::cancel(void) throw (::com::sun::star::uno::RuntimeExcep -+ } -+ -+ // ----------------------------------------------------------------------- -++namespace -++{ -++ // lp#527938, debian#602953, fdo#33266, i#105408 -++ static bool lcl_isBaseAvailable() -++ { -++ Reference< XMultiServiceFactory > xMgr = comphelper::getProcessServiceFactory(); -++ Reference< XAggregation > xAggregate = Reference< XAggregation >( xMgr->createInstance(C2U("com.sun.star.sbd.RowSet")), UNO_QUERY); -++ return xAggregate.is(); -++ } -++} -+ void BibliographyLoader::load(const Reference< XFrame > & rFrame, const rtl::OUString& rURL, -+ const Sequence< PropertyValue >& rArgs, -+ const Reference< XLoadEventListener > & rListener) throw (::com::sun::star::uno::RuntimeException) -+ { -+- //! -++ // lp#527938, debian#602953, fdo#33266, i#105408 -++ // make sure we actually can instanciate services from base first -++ if(!lcl_isBaseAvailable()) -++ return; -+ -+ SolarMutexGuard aGuard; -++ -+ m_pBibMod = OpenBibModul(); -+ -+ String aURLStr( rURL ); -+-- -+cgit v0.9.0.2-2-gbebe ++From 33ef1ffbd15994ec71be99d38c0d5171c63344a2 Mon Sep 17 00:00:00 2001 ++From: Bjoern Michaelsen <bjoern.michael...@canonical.com> ++Date: Tue, 06 Mar 2012 17:16:35 +0000 ++Subject: lp#527938, debian#602953, fdo#33266, i#105408: do not crash on clicking bibliography when base isnt installed ++ ++Signed-off-by: Michael Meeks <michael.me...@suse.com> ++--- ++diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx ++index c80c81e..9159124 100644 ++--- a/extensions/source/bibliography/bibload.cxx +++++ b/extensions/source/bibliography/bibload.cxx ++@@ -54,6 +54,7 @@ ++ #include <com/sun/star/text/BibliographyDataField.hpp> ++ #include <com/sun/star/form/XLoadListener.hpp> ++ #include <com/sun/star/frame/XLayoutManager.hpp> +++#include <com/sun/star/uno/XAggregation.hpp> ++ #include <toolkit/awt/vclxwindow.hxx> ++ #include <vcl/window.hxx> ++ #include <vcl/edit.hxx> ++@@ -243,13 +244,27 @@ void BibliographyLoader::cancel(void) throw (::com::sun::star::uno::RuntimeExcep ++ } ++ ++ // ----------------------------------------------------------------------- +++namespace +++{ +++ // lp#527938, debian#602953, fdo#33266, i#105408 +++ static bool lcl_isBaseAvailable() +++ { +++ Reference< XMultiServiceFactory > xMgr = comphelper::getProcessServiceFactory(); +++ Reference< XAggregation > xAggregate = Reference< XAggregation >( xMgr->createInstance(C2U("com.sun.star.sbd.RowSet")), UNO_QUERY); +++ return xAggregate.is(); +++ } +++} ++ void BibliographyLoader::load(const Reference< XFrame > & rFrame, const rtl::OUString& rURL, ++ const Sequence< PropertyValue >& rArgs, ++ const Reference< XLoadEventListener > & rListener) throw (::com::sun::star::uno::RuntimeException) ++ { ++- //! +++ // lp#527938, debian#602953, fdo#33266, i#105408 +++ // make sure we actually can instanciate services from base first +++ if(!lcl_isBaseAvailable()) +++ return; ++ ++ SolarMutexGuard aGuard; +++ ++ m_pBibMod = OpenBibModul(); ++ ++ String aURLStr( rURL ); ++-- ++cgit v0.9.0.2-2-gbebe diff --combined patches/series index 0c1a548,be01140..0d60826 --- a/patches/series +++ b/patches/series @@@ -1,34 -1,32 +1,35 @@@ -splash-progressbarcolor.diff -buildfix-patches.diff no-minimaltoc.diff -update-debian-opt.diff -gcc4.6.0.diff +debian-opt.diff odk-jni-include.diff -disable-ooinstall-in-package-ooo.diff jurt-soffice-location.diff -packcomponents-remove-split-components.diff +split-binfilters-and-evo.diff debian-debug.diff -disable-rhino.diff -bsh-hardcode-path.diff -mips-openjdk-jre-paths.diff -autogen.diff +rhino-build-optional.diff disable-dynamic-list-cpp.diff -vbaobj-visibility-fix.diff -make-gengal-work-again.diff -fix-distro-config.diff -mipsel-jfw-plugin-arch.diff -no-deprecated-options-in-qstart-wrappers.diff -update-sdbc-postgresql.diff -s390x.diff -update-libreoffice.1.diff -wordml2ooo_draw.xsl-add-missing-include.diff +fix-system-lpsolve-build.diff +install-fixes.diff +smoketest-only-en-US.diff +mention-java-common-package.diff +help-msg-add-package-info.diff +sensible-lomua.diff +sensible-browser.diff +reportdesign-mention-package.diff +jdbc-driver-classpaths.diff +mysqlcppconn-mysqlclient-SONAME.diff +make-pyuno-work-with-system-wide-module-install.diff +search-usr-share-for-images.diff +make-package-modules-not-suck.diff +fix-ARM-detection-in-set-soenv.diff add-debian-multiarch-support.diff -jdbc-driver-threading.diff +propagate-gb_FULLDEPS.diff +disable-sc-sw-unoapi-subsequentcheck-for-now.diff mediwiki-oor-replace.diff +#no-rcX-in-final.diff armhf-bridges.diff armhf-bridges-fix-armv4t-armel.diff +move-binfilter-mimetypes-in-extra-desktop-file.diff +pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff armhf-bridges-doubles.diff -nsplugin-fix-SimpleFileAccess-instance.diff +debian-hardened-buildflags.diff +fix-quickstart-shutdown.diff + bibliography-no-crash-if-no-base.diff -- 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/e1s52ck-00047n...@vasks.debian.org