The following commit has been merged in the debian-experimental-3.5 branch: commit e549fd6237cbdd5bd362bf07c6a0657295d58e44 Merge: fd1dfb22ba58ecfdccf76aeb4138f5365ddf033a 4a47c6c61a92e5eb013725deb954f74244659a99 Author: Rene Engelhard <r...@rene-engelhard.de> Date: Wed Apr 18 16:44:59 2012 +0200
Merge branch 'master' into debian-experimental-3.5 diff --combined changelog index e70bcc6,d64ef5e..b1e0b5d --- a/changelog +++ b/changelog @@@ -1,9 -1,13 +1,19 @@@ +libreoffice (1:3.5.3~rc1-1) UNRELEASED; urgency=low + + * new upstream release candidate + + -- Rene Engelhard <r...@debian.org> Mon, 16 Apr 2012 09:59:51 +0200 + + libreoffice (1:3.5.2-5) UNRELEASED; urgency=low + + [ Rene Engelhard ] + * debian/patches/db5.3.diff: add 5.3 to checked db versions + + [ Björn Michaelsen ] + * add visio mimetype to libreoffice draw desktop file + + -- Rene Engelhard <r...@debian.org> Mon, 16 Apr 2012 09:02:21 +0200 + libreoffice (1:3.5.2-4) unstable; urgency=medium * debian/patches/icu-4.9.diff: backport fix from libreoffice-3-5 diff --combined patches/series index 15fe068,029cb51..afdb38b --- a/patches/series +++ b/patches/series @@@ -20,14 -20,21 +20,16 @@@ make-pyuno-work-with-system-wide-module search-usr-share-for-images.diff make-package-modules-not-suck.diff fix-ARM-detection-in-set-soenv.diff propagate-gb_FULLDEPS.diff disable-unoapi-subsequentcheck-for-now.diff mediwiki-oor-replace.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 debian-hardened-buildflags.diff gtk3-hack-explicit-gmodule.diff gcc-4.7.diff gcc-4.7-i386.diff gcc-4.7-amd64.diff -icu-4.9.diff tests-fix-build-with-jdk7.diff + db5.3.diff + lp-926940-visio-mime-for-draw.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/e1sl0ds-0005xa...@vasks.debian.org