[SCM] LibreOffice packaging repository branch, ubuntu-quantal-3.6, updated. libreoffice_3.6.1_rc2-1-85-g6df7a07
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 1e2c55a2771ead30837bb2040a9095e8ff7e0561
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Sun Oct 7 09:17:20 2012 +0200
do not build extensions on armel, armhf for bug 1062448
diff --git a/changelog b/changelog
index 7cd1c3d..38589f8 100644
--- a/changelog
+++ b/changelog
@@ -1,7 +1,13 @@
+libreoffice (1:3.6.2~rc2-0ubuntu3) UNRELEASED; urgency=low
+
+ * do not build extensions on armel, armhf for bug 1062448
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Sun, 07 Oct 2012 09:16:47 +0200
+
libreoffice (1:3.6.2~rc2-0ubuntu1) quantal-proposed; urgency=low
* update to unitymenus patch to 7ffc24eb76325afef89c25e8a7fe13124ed5a041
- * lo-menubar is obsolete with this
+ * lo-menubar is obsolete with this (C/P/R needs to stay there until 14.04 LTS)
-- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 05 Oct 2012 15:54:49 +0200
diff --git a/rules b/rules
index 3f81172..617eb9c 100755
--- a/rules
+++ b/rules
@@ -391,7 +391,7 @@ ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_UNOWINREG_DLL_ARCHS)
PACKAGE_UNOWINREG_DLL=n
endif
-OOO_ARCH_DEP_EXTENSIONS_ARCHS := $(OOO_ARCHS)
+OOO_ARCH_DEP_EXTENSIONS_ARCHS := $(filter-out armel armhf, $(OOO_ARCHS))
OOO_EXTENSIONS_ARCHS := $(OOO_ARCH_DEP_EXTENSIONS_ARCHS)
OOO_BASE_ARCHS := $(OOO_JAVA_ARCHS)
--
LibreOffice packaging repository
Reply to: