[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_rc2-2-28-g9514122
The following commit has been merged in the debian-experimental-3.5 branch:
commit 87aa38d138a36e36e540a406516157d94ffc4217
Author: Rene Engelhard <rene@debian.org>
Date: Sat Feb 4 00:18:39 2012 +0100
fix merge error
diff --git a/changelog b/changelog
index ed1cb7b..26d229b 100644
--- a/changelog
+++ b/changelog
@@ -7,6 +7,8 @@ libreoffice (1:3.5.0~rc3-1) experimental; urgency=low
Michael Meeks
* debian/patches/ia64-oox-size.diff: build oox on ia64 with -Os
as otherwise it gets too big to link
+ * debian/patches/mediwiki-oor-replace.diff: replace oor:fuse by oor:replace
+ for -wiki-publishers config (hopefully closes: #616011)
* debian/rules:
- give gb_FULLDEPS= to actual make check call, not debian/rules
@@ -18,9 +20,6 @@ libreoffice (1:3.5.0~rc3-1) experimental; urgency=low
libreoffice (1:3.5.0~rc2-2) experimental; urgency=low
- * debian/patches/mediwiki-oor-replace.diff: replace oor:fuse by oor:replace
- for -wiki-publishers config (hopefully closes: #616011)
-
* debian/rules:
- fix another merge error to really fix patch rule in check
- enable ca-XV, put into -{l10n,help}-ca
--
LibreOffice packaging repository
Reply to: