The following commit has been merged in the debian-experimental-4.1 branch:
commit e49ace14fd86d8bf19570065e21a6394b2107952
Merge: cc96a9931fba2538d4e2e86a5be7509677cf794a
6239c48425f042357a4c9e9d5cdb9d20227a85d9
Author: Rene Engelhard <[email protected]>
Date: Mon May 20 11:00:09 2013 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-4.1
diff --combined changelog
index c39ef7c,a96996b..beb44d1
--- a/changelog
+++ b/changelog
@@@ -1,22 -1,8 +1,22 @@@
+libreoffice (1:4.1.0~beta1~git20130518-1) UNRELEASED; urgency=low
+
+ * new upstream snapshot
+
+ * debian/rules, control.sdk.in:
+ - dmake finally gone
+ * debian/rules:
+ - add new conditionals: libmwaw, libodfgen, harfbuzz, mariadb
+ (use MySQL instead of MariaDB, though as long as we need mysqlcppconn
anyway)
+ - build with explicit --enable-python=system
+ * debian/uno-libs3.symbols: update
+
+ -- Rene Engelhard <[email protected]> Sat, 22 Dec 2012 18:03:18 +0100
+
- libreoffice (1:4.0.3-3) UNRELEASED; urgency=low
+ libreoffice (1:4.0.3-3) unstable; urgency=low
* debian/patches/uno-executables-link-to-xmlreader.diff: fix
sp2bv/regcomp/regsingleton/uno-skeletonmaker build on
- mips(el) by linking explicitely with libxmlreader.so
+ mips(el) by linking explicitly with libxmlreader.so
* debian/control.in, debian/rules:
- depend on fonts-dejavu instead of ttf-dejavu (closes: #708062)
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
