[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.4.2-2-10-g83f9d3d
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 83f9d3d450a5430a0a9584a6034daf6c2b937293
Merge: d9c7977197158196fe7533138b0c5ccd9546916d 8c7b515d82bc2bed004f894c60e3aeb9bcb79795
Author: Rene Engelhard <rene@debian.org>
Date: Fri Aug 19 17:52:14 2011 +0200
Merge remote branch 'origin/master' into debian-experimental-3.4.0
diff --combined changelog
index 42026da,7bb64fb..b1cc274
--- a/changelog
+++ b/changelog
@@@ -1,155 -1,43 +1,161 @@@
-libreoffice (1:3.3.4-2) UNRELEASED; urgency=low
+libreoffice (1:3.4.2-3) UNRELEASED; urgency=low
+ * debian/patches/fdo35784.diff: add patch from fdo35784, thanks lmamane
+ * debian/patches/make-gengal-work-again.diff: update with better upstream
+ version
+ * debian/patches/mipsel-jfw-plugin-arch.diff: fix JFW_PLUGIN_ARCH
+ (s/mips32/mipsel/) in jvmfwk for mipsel, thanks Aurelien Jarno
- -- Rene Engelhard <rene@debian.org> Fri, 19 Aug 2011 17:19:56 +0200
+ * debian/rules:
+ - remove manual gengal build step again
-libreoffice (1:3.3.4-1) unstable; urgency=low
+ -- Rene Engelhard <rene@debian.org> Fri, 19 Aug 2011 17:36:33 +0200
- * New upstream release
+libreoffice (1:3.4.2-2) experimental; urgency=low
+
+ * debian/patches/make-gengal-work-again.diff: as name says
+ * debian/patches/fix-distro-config.diff: really use system sane.h
+
+ * debian/rules:
+ - fix syntax of graphite removal from SYSTEM_STUFF (forgot s/+=/:=/)
+ - install gengal again
+ - on sid (and when building with debug), compress -dbg with xz; make bzip2
+ compression unconditional
+
+ -- Rene Engelhard <rene@debian.org> Tue, 16 Aug 2011 12:55:45 +0000
+
+libreoffice (1:3.4.2-1) experimental; urgency=low
+
+ * new upstream release
+
+ * debian/patches/*: migrate to libreoffice-build/hotfixes where possible
+ * debian/rules:
+ - try gcj again on mipsel, stay with OpenJDK for mips
+ - use system-graphite again, disable graphite on armel and sparc for
+ the time being as we don't have a graphite2 which doesn't fail its tests
+ there yet
+
+ -- Rene Engelhard <rene@debian.org> Thu, 11 Aug 2011 08:13:02 +0000
+
+libreoffice (1:3.4.1-4) experimental; urgency=low
+
+ * debian/rules:
+ - don't statically check for /build/buildd- but use grep, which will
+ catch also /build/buildd2- as on lucatelli2...
+ - reverse conditional to not build reportbuilder to really disable
+ its build on gcj archs (apparently ant and envvars still broken due
+ to multiarch)
+ - add libstlport4.6-dev builddep only when something is in
+ OOO_STLPORT_ARCHS, don't rely on LINK_TO_STLPORT. Not set on !i386...
+
+ -- Rene Engelhard <rene@debian.org> Thu, 28 Jul 2011 09:31:12 +0000
+
+libreoffice (1:3.4.1-3) experimental; urgency=low
- * debian/patches/update-debian-opt.diff: call dpkg-buildflags correctly
* debian/patches/fix-bridges-cpp-uno-depends.diff: fix mising depends in
bridges' build.lst which can cause FTBFS on s390(x), arm, ia64, hppa, alpha
- * debian/patches/fdo35784.diff: add patch from fdo35784, thanks lmamane
- * debian/patches/disable-sdbc-postgresql.diff: remove
+ * debian/patches/no-prctl-on-kfreebsd.diff: don't try to #include <sys/prctl.h>,
+ it doesn't exist for FreeBSD
+
+ * debian/rules:
+ - also set ON_BUILDD=y if $(CURDIR) begins with /build/buildd-
+ - build-depend on javahelper >= 0.37~ instead of >= 0.37 to help
+ squeeze-backpors
+ -- Rene Engelhard <rene@debian.org> Fri, 22 Jul 2011 16:06:11 +0000
+
+libreoffice (1:3.4.1-2) experimental; urgency=low
+
+ [ Rene Engelhard ]
+ * debian/patches/vbaobj-visibility-fix.diff: fix sc build on i386, imported
+ from Fedora
+
+ * debian/libreoffice-common.postinst.in, libreoffice-core.postinst.in,
+ debian/shell-lib-components.sh:
+ check for /@OOBASISDIR@/program/.services.rdb before using it
+ (closes: #633396) and replace manual call of the function by
+ dpkg-trigger. Also run the trigger in -cores postinst
+ (thanks Jonathan Nieder)
+ * debian/control.in:
+ - make new -common break old -evolution/-filter-binfilter
+ * debian/rules:
+ - also -Xlibreoffice-dbg on jh_depends... (closes: #633540)
+ - update ENABLE_OPENGL configure flags, now --enable-opengl is default
+ upstream
+ - fix build with make 3.82: remove space after, in $(call; build-depend
+ on make >= 3.82 if PARALLEL_BUILD=y
+ - fix -javafilter.destop Exec=
+ - remove obsolete libstlport4.6-dev build-conflict, thanks Björn
+ Michaelsen
+ - fix conditional for translate-toolkit
+ - explicitely specify --without-stlport
+ - temporarily build with internal graphite2 until the system graphite2
+ package is ready for use
+ * debian/copyright: s/Specificatin/Specification/, thanks Jakub Wilk
+ * merge from ubuntu-oneiric-3.4:
+ - gconf also needs liborbit2-dev
+ - bump libebook so name to allow for libebook-1.2.so-11 too
+ - disable --dynamic-list-cpp-new/--dynamic-list-cpp-typeino
+ as they SIGSEGV ld from binutils-2.21.52.20110707
+
+ [ Nelson A. de Oliveira ]
+ * debian/*menu.in, debian/*mime:
+ - Fix deprecated options when calling soffice and libreoffice
+ (closes: #634001)
+
+ -- Rene Engelhard <rene@debian.org> Wed, 20 Jul 2011 22:28:52 +0200
+
+libreoffice (1:3.4.1-1) experimental; urgency=low
+
+ * new upstream release
+ - handles various table columns differing in case correct
+ (closes: #617596)
+ - should fix embedding of (some) fonts in PDFs (closes: #616117)
+ - (still) use libreoffice-build for now; not tagged,
+ use 069b0a4b4f052255c97ece23f0e37be85921fe27
+
+ * debian/patches/debian-debug.diff: readd option to build with small
+ symbols (removed upstream), otherwise we get a too big -dbg (760M, 2G I-S)
+ * debian/patches/update-debian-opt.diff: call dpkg-buildflags correctly
+
+ * debian/rules:
+ - bump build-dep on libmdds-dev to >= 0.5.0
+ - build-depend on libgraphite2-dev instead of libgraphite-dev
+ - update for new extension and mingw configure switches
+ - temprarily don't install gengal, not built anymore since the switch to
+ GNU Make...
+ - install .component files to registered-components
+ - build-dep on translate-toolkit, now needed for translations module
+ * debian/control.sdk.in, debian/rules:
+ - stop building with STLport on i386, just create a symlink in ure.
+ Should suffice for compat with binary-only OOo extensions
+ * debian/control.in, debian/rules:
+ - the script providers are now extensions. split js and bsh out into
+ extra packages (also closes: #603595)
+ * debian/uno-libs3.symbols: update
+ * debian/rules, debian/patches/packcomponents-remove-split-components.diff:
+ remove evoab, binfilter and kdeab deregistering into patch patching
+ the new packcomponents
+ * debian/shell-lib-components.sh: add new update_services_rdb() merging
+ "default" services.rdb and the .component files from registered-components
+ * debian/libreoffice-common.triggers.in, libreoffice-*.p*.in:
+ new trigger running update_services_rdb, remove obsolete maintainer scripts
* debian/changelog: mention VU#953183/CVE-2011-2685 in 1:3.3.3-1
* debian/control.in:
- fix description: s/libreoffice-hyphenation/hyphen/,
s/libreoffice-thesaurus/mythes/
* debian/rules:
- don't try to change libreoffice-base when we don't built it
- - build-depend on javahelper (>= 0.37~) and use -s
- - fix build with make 3.82: remove space after, in $(call
- - also set ON_BUILDD=y if $(CURDIR) begins with /build/buildd-
- - try gcj again on mipsel, stay with OpenJDK for mips
- - on sid (and when building with debug), compress -dbg with xz; make bzip2
- compression unconditional
- - re-enable -sdbc-postgresql
+ - build-depend on javahelper (>= 0.37) and use -s
* debian/source.lintian-overrides:
- override new libreoffice source: dh_pycentral-is-obsolete line 3214
and libreoffice source: dh_python-is-obsolete line 3223
- - also -Xlibreoffice-dbg on jh_depends...
- * debian/copyright: s/Specificatin/Specification/, thanks Jakub Wilk
- * merge from ubuntu-oneiric-3.4:
- - gconf also needs liborbit2-dev
- - bump libebook so name to allow for libebook-1.2.so-11 too
++<<<<<<< HEAD
+ -- Rene Engelhard <rene@debian.org> Wed, 06 Jul 2011 16:00:18 +0200
++=======
+ -- Rene Engelhard <rene@debian.org> Mon, 15 Aug 2011 16:45:06 +0000
++>>>>>>> origin/master
libreoffice (1:3.3.3-4) unstable; urgency=low
@@@ -188,7 -76,7 +194,7 @@@ libreoffice (1:3.3.3-2) unstable; urgen
- move evolocal.odb into -evolution proper
- use OpenJDK on mips(el), seems to work. (ia64 still SIGSEGVs)
* debian/libreoffice-filter-binfilter.links.in: actually create symlink
- for libbindet*so in registered-components
+ for libbindet*so in registered-components
* debian/control.in:
- move libpaper-utils from Suggests to Recommends
- fix libreoffice Description: - -filter-binfilter is not installed
@@@ -196,7 -84,7 +202,7 @@@
* debian/control.in, debian/rules: move libpq-dev builddep to a
conditional
* debian/rules, debian/control*in:
- - run jh_depends and add ${java:Depends} where we have Java
+ - run jh_depends and add ${java:Depends} where we have Java
-- Rene Engelhard <rene@debian.org> Wed, 29 Jun 2011 10:03:21 +0200
@@@ -211,7 -99,7 +217,7 @@@ libreoffice (1:3.3.3-1) unstable; urgen
toolbars work in e.g. Base edit forms (closes: #617319)
* debian/rules:
- - disable -sdbc-postgresql until fixed (closes: #620100)
+ - disable -sdbc-postgresql until fixed (closes: #620100)
- stop moving vbaevents*.uno.so to -calc. Move libvbaswobj*uno.so
to -writer
- make -l10n-sw (if enabled) depend on locales (>= 2.13-5)
diff --combined patches/mipsel-jfw-plugin-arch.diff
index 0000000,3d3f764..590daa2
mode 000000,100644..100644
--- a/patches/mipsel-jfw-plugin-arch.diff
+++ b/patches/mipsel-jfw-plugin-arch.diff
@@@ -1,0 -1,21 +1,14 @@@
+ --- /dev/null 2011-06-27 20:29:01.643585831 +0200
-+++ libreoffice-3.4.0/libreoffice-build/patches/dev300/mipsel-jfw-plugin-arch.diff 2011-06-28 16:06:31.000000000 +0200
+++++ libreoffice-3.4.0/libreoffice-build/patches/hotfixes/mipsel-jfw-plugin-arch.diff 2011-06-28 16:06:31.000000000 +0200
+ @@ -0,0 +1,11 @@
+ +--- jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx-old 2011-08-19 17:16:05.000000000 +0200
+ ++++ jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx 2011-08-19 17:14:42.000000000 +0200
+ +@@ -56,7 +56,7 @@
+ + #ifdef OSL_BIGENDIAN
+ + # define JFW_PLUGIN_ARCH "mips"
+ + #else
+ +-# define JFW_PLUGIN_ARCH "mips32"
+ ++# define JFW_PLUGIN_ARCH "mipsel"
+ + #endif
+ + #elif defined S390X
+ + #define JFW_PLUGIN_ARCH "s390x"
---- libreoffice-3.4.0/libreoffice-build/patches/dev300/apply-old 2011-08-19 17:25:31.000000000 +0200
-+++ libreoffice-3.4.0/libreoffice-build/patches/dev300/apply 2011-08-19 17:25:52.000000000 +0200
-@@ -2396,3 +2396,4 @@
-
- [ MIPS ]
- mips-openjdk-jre-paths.diff
-+mipsel-jfw-plugin-arch.diff
diff --combined patches/series
index 5db5fb5,10a4fab..7ff9dd9
--- a/patches/series
+++ b/patches/series
@@@ -1,24 -1,21 +1,25 @@@
-installer-globals-max-1-regcomp.diff
splash-progressbarcolor.diff
buildfix-patches.diff
-hack-no-rm-fr-of-smoketest-userconfig.diff
-do-not-switch-workspaces-of-wm.diff
-bridges-mkstemp-error-better-message.diff
-alpha-no-relax.diff
-ppc-openjdk.diff
no-minimaltoc.diff
update-debian-opt.diff
gcc4.6.0.diff
odk-jni-include.diff
-disable-optional-outplace-ole.diff
+disable-sdbc-postgresql.diff
+disable-ooinstall-in-package-ooo.diff
jurt-soffice-location.diff
+packcomponents-remove-split-components.diff
+debian-debug.diff
disable-rhino.diff
bsh-hardcode-path.diff
mips-openjdk-jre-paths.diff
+autogen.diff
+disable-dynamic-list-cpp.diff
libebook-1.2.so.11.diff
+vbaobj-visibility-fix.diff
fix-bridges-cpp-uno-depends.diff
-fdo35784.diff
+no-prctl-on-kfreebsd.diff
+make-gengal-work-again.diff
+fix-distro-config.diff
+#fdo35784.diff
+#sdbc-postgresql-obsolete-hash-map.diff
+ mipsel-jfw-plugin-arch.diff
--
LibreOffice packaging repository
Reply to: