The following commit has been merged in the debian-experimental-4.2 branch:
commit 2c102718288f7c663a90ffa55cd02a2dff3f4afb
Merge: 3d5abd561b0b9ece1337ebdf79200821d076691c
85564f328bd9eb51b17b05de0493c13b7cd9e8e6
Author: Rene Engelhard <[email protected]>
Date: Tue Jul 16 23:11:22 2013 +0200
Merge remote-tracking branch 'origin/debian-experimental-4.1' into
debian-experimental-4.2
Conflicts:
changelog
patches/make-package-modules-not-suck.diff
diff --combined changelog
index db33c98,e2bdff1..252b4f2
--- a/changelog
+++ b/changelog
@@@ -1,16 -1,9 +1,22 @@@
+libreoffice (1:4.2.0~alpha0~git20130716-1) UNRELEASED; urgency=low
+
+ * new upstream snapshot
+
+ * debian/rules:
+ - autodoc got replaced by doxygen. bump doxygen build-dep to needed
+ (>= 1.8.4-1) and disable packaging the SDK docs on wheezy-backports.
+ Run dh_doxygen
+ - build-depend on fonts-liberation when running the tests - the
+ sc_macros_tests VBA tests need Arial etc.-similar fonts
+
+ -- Rene Engelhard <[email protected]> Sun, 02 Jun 2013 20:49:18 +0200
+
+ libreoffice (1:4.1.0~rc3-1) UNRELEASED; urgency=low
+
+ * new upstream release candidate
+
+ -- Rene Engelhard <[email protected]> Mon, 15 Jul 2013 01:19:56 +0200
+
libreoffice (1:4.1.0~rc2-2) experimental; urgency=low
* build with proper DEB_BUILD_OPTIONS so we actually get l10n
--
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]
