[SCM] LibreOffice packaging repository branch, ubuntu-natty-3.3.1, updated. 424e5b5e1c4ea952b210e8244b8987cc02e6bb32
The following commit has been merged in the ubuntu-natty-3.3.1 branch:
commit 424e5b5e1c4ea952b210e8244b8987cc02e6bb32
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Mon Feb 28 09:57:49 2011 +0100
selcting right arm target (closes: #725763)
diff --git a/changelog b/changelog
index 457c9bb..46742d6 100644
--- a/changelog
+++ b/changelog
@@ -2,8 +2,9 @@ libreoffice (1:3.3.1-1ubuntu4) natty; urgency=low
* reenable verbose build on ubuntu buildd (closes: #726333)
* remove duplicate code in control file generation
+ * selcting right arm target (closes: #725763)
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Mon, 28 Feb 2011 09:44:27 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Mon, 28 Feb 2011 09:57:28 +0100
libreoffice (1:3.3.1-1ubuntu3) natty; urgency=low
diff --git a/rules b/rules
index 9fd7445..15c6bef 100755
--- a/rules
+++ b/rules
@@ -64,7 +64,7 @@ OODIR:=$(OOBASISDIR)
# Figure out who's building this package.
OOO_VENDOR:=The Document Foundation/Debian
ifeq "$(DIST)" "Ubuntu"
-OOO_VENDOR=The Document Foundation, Debian and Ubuntu
+OOO_VENDOR:=The Document Foundation, Debian and Ubuntu
endif
export OOO_VENDOR
@@ -508,6 +508,12 @@ ifeq "$(DIST)" "Ubuntu"
CONFIGURE_FLAGS += --with-openldap
CONFIGURE_FLAGS += --with-system-python
+ # ARM target
+ # lp#725763: Ubuntu builds armel with --with-arm-target=7
+ ifeq "$(ARCH)" "armel"
+ CONFIGURE_FLAGS = $(filter-out --with-arm-target=%,$(CONFIGURE_FLAGS)) --with-arm-target=7
+ endif
+
ifneq (,$(filter $(DISTREL),dapper hardy jaunty karmic lucid maverick))
SYSTEM_STUFF := $(filter-out libwpd libwpg libwps, $(SYSTEM_STUFF))
endif
--
LibreOffice packaging repository
Reply to: