The following commit has been merged in the debian-experimental-3.5 branch:
commit 281ed089ed4b9e3d9c13b1a82947d599eaf148f8
Merge: 1c214ac9fd7e3df1e9e97b7f978fb96da7f4512e
5930f6221cad332bc743d246e85169d57e63b2dc
Author: Rene Engelhard <r...@debian.org>
Date: Sat Jan 14 00:28:01 2012 +0100
Merge remote branch 'origin/master' into debian-experimental-3.5
diff --combined changelog
index 48f59b5,1902e11..f2b22b0
--- a/changelog
+++ b/changelog
@@@ -1,113 -1,31 +1,116 @@@
-libreoffice (1:3.4.5-1) unstable; urgency=medium
+libreoffice (1:3.5.0~beta3-1) UNRELEASED; urgency=low
- [ Rene Engelhard ]
- * new upstream release
- - fixes build with bleeding edge external boost and gcc (closes: #652784)
+ * 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, delete created services.rdb (closes: #650341) and
- remove all /var/lib content on remove (prereg/bundled, basisX.Y)
- * debian/control.in:
- - 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
++ - on remove, remove all /var/lib content on remove (prereg/bundled
++ basisX.Y)
* 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/control.ure.in:
+ - remove obsolete cli-uno-bridge Suggests
* merge from ubuntu-precise-3.5:
- add debian multiarch support for Qt4
+ - no dependencies needed for full builds
+ + propagate gb_FULLDEPS
+
+ -- Rene Engelhard <r...@debian.org> Fri, 13 Jan 2012 10:22:35 +0100
+
+libreoffice (1:3.5.0~beta2-2) experimental; urgency=low
+
+ * 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/control.fonts.in: ttf-opensymbol should be in oldlibs, thanks
+ lintian
+ * 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
+
+ [ 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 libreoffice-core.preinst.in
index a58fa30,0000000..32b03d7
mode 100755,000000..100755
--- a/libreoffice-core.preinst.in
+++ b/libreoffice-core.preinst.in
@@@ -1,14 -1,0 +1,15 @@@
+#!/bin/sh
+
+set -e
+
+#INCLUDE_SHELL_LIB#
+
+if [ "$1" = "upgrade" -o "$1" = "install" ]; then
- rm -f /`echo @OODIR@ | sed -e
s,/usr/,/var,g`/basis3.4/program/services.rdb
- rmdir /`echo @OODIR@ | sed -e s,/usr/,/var,g`/basis3.4/program/ || true
++ rm -f /`echo @OODIR@ | sed -e
s,usr/,var/,g`/basis3.4/program/services.rdb
++ rmdir /`echo @OODIR@ | sed -e s,usr/,var/,g`/basis3.4/program/ || true
++ rmdir /`echo @OODIR@ | sed -e s,usr/,var/,g`/basis3.4 || true
+fi
+
+#DEBHELPER#
+
+exit 0
--
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/e1rmyep-0002by...@vasks.debian.org
