The following commit has been merged in the debian-experimental-4.0 branch:
commit 9b853a83bc86c978775e1a7d103ae330546f5094
Merge: ba9207ceefcb72d6e78e7da700d832ee04da028b
60893cc06e0c440abb60df090c1da24a9351eff9
Author: Rene Engelhard <r...@rene-engelhard.de>
Date: Mon Jun 17 20:13:21 2013 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-4.0
Conflicts:
changelog
diff --combined changelog
index c3d7dc8,e0a38d0..c1a18bc
--- a/changelog
+++ b/changelog
@@@ -1,12 -1,12 +1,15 @@@
-libreoffice (1:4.0.3-4) UNRELEASED; urgency=low
+libreoffice (1:4.0.4~rc2-1) UNRELEASED; urgency=low
+
+ * new upstream release candidate
+ * debian/patches/disable-flaky-unoapi-tests.diff: disable sw_unoapi for now;
+ breaks since gcc 4.8 upgrade
+
- * debian/control:
- - regenerate; uses libservlet3.0-java instead of libservlet2.5-java now
* debian/rules:
+ - enable kk (kazakh) l10n (closes: #700835)
- enable graphite2 on all archs now that it's fixed on armel/sparc
+ * debian/control:
+ - regenerate; uses libservlet3.0-java instead of libservlet2.5-java now
- fix -dbg suggests: s/python/$(PYTHON)/. to suggest python3.3-dbg
- temporarily force gcc-4.6(!) (instead of build-conflicting
against gcc (>< 4:4.7~) on all archs except *i386/*amd64 until
@@@ -14,7 -14,7 +17,7 @@@
- remove last buildd special-caing: build --enable-verbose everyhwere,
also on the buildds
- -- Rene Engelhard <r...@debian.org> Thu, 13 Jun 2013 21:19:31 +0200
+ -- Rene Engelhard <r...@debian.org> Mon, 17 Jun 2013 19:31:11 +0200
libreoffice (1:4.0.3-3) unstable; urgency=low
--
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/e1uoejb-00035k...@vasks.debian.org
