The following commit has been merged in the debian-experimental-3.6 branch: commit 51d68d9e2c26844e10d8893f36707749580f2bdd Merge: 840a6d12ceaf572c6c2c2939db1cccb72ef50901 822719ddb82cfbb8b5382c7bacca62c9847f0e7a Author: Rene Engelhard <r...@debian.org> Date: Wed Jun 20 11:26:00 2012 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-3.6 diff --combined changelog index bd5284e,698924e..13ce0c8 --- a/changelog +++ b/changelog @@@ -1,33 -1,14 +1,44 @@@ +libreoffice (1:3.6.0~beta2-1) UNRELEASED; urgency=low + + * new upstream beta release + - fixes splashscreen location in multi-monitor setups + (closes: #657444, #431473) + + * debian/patches/build-dont-run-checks.diff: as name says + + * debian/rules: + - new conditionals for: doxygen, libcdr, liblcms2 + - remove liblucene2-java stuff; now clucene is used + - build-depend on libxml2-utils, xmllint now needed + - build-depend on liboost-date-time-date, we now link to boost... + - build only en-US for now + - disable binfilter for now (checkdll segfaults...) + - build-depend against libpng-dev instead of libpng12-dev + (closes: #662411) + - remove squeeze-backports stuff, add wheezy-backports + - install upstreams README(_en-US) (closes: #676340) + - clean up some warnings: + + readd /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/libfakeroot + to LD_LIBRARY_PATH for dh_shlibdeps + + don't run jh_depends -i/-a, use -p for each package, otherwise it + gets confused by help.jar/s*.jar which is just zips, no "real" jar + - switch to default-jdk, b-d on default-jdk (>= 1:1.7-48) on ia64 and + check for "OpenJDK" in tests yes/no clause for JDK=default + * debian/uno-libs3.symbols: update + + -- Rene Engelhard <r...@debian.org> Thu, 03 May 2012 13:44:05 +0200 + + libreoffice (1:3.5.4-5) unstable; urgency=low + + * debian/patches/evolution-3.4.diff: as name says, + add libebook-1.2.so.13 + + * debian/python{,3}-uno.NEWS: add missing ) + * debian/*.bug-script: add -draw to libreoffice report-with:; + report libreoffice-script-provider-python with python(3)-uno + + -- Rene Engelhard <r...@debian.org> Wed, 20 Jun 2012 00:43:59 +0200 + libreoffice (1:3.5.4-4) unstable; urgency=high * debian/patches/make-shortcuts-in-menus-localized-again.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/e1shhdg-0002hr...@vasks.debian.org