------------------------------------------------------------
revno: 1835
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Wed 2010-03-03 12:56:46 +0100
message:
- conditionalize armel build; reenable on lenny-backport - that still
should work
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-02-28 18:49:19 +0000
+++ b/changelog 2010-03-03 11:56:46 +0000
@@ -1,9 +1,12 @@
openoffice.org (1:3.2.0-3) UNRELEASED; urgency=low
* debian/control.in: update Vcs-Bzr:
- * debian/rules: build-depend on ant1.7 on gij-using archs (see #571532)
+ * debian/rules:
+ - build-depend on ant1.7 on gij-using archs (see #571532)
+ - conditionalize armel build; reenable on lenny-backport - that still
+ should work
- -- Rene Engelhard <r...@debian.org> Sun, 28 Feb 2010 18:18:58 +0100
+ -- Rene Engelhard <r...@debian.org> Wed, 03 Mar 2010 12:52:53 +0100
openoffice.org (1:3.2.0-2) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2010-02-28 19:21:12 +0000
+++ b/rules 2010-03-03 11:56:46 +0000
@@ -89,6 +89,7 @@
BUILD_PPC64=y
BUILD_S390X=y
BUILD_SPARC=y
+BUILD_ARMEL=n
BUILD_HPPA=y
PATCHSET=$(DIST)
BUILD_DEPS=
@@ -313,6 +314,7 @@
# Debian Lenny
ifeq "$(LENNY_BACKPORT)" "y"
+ BUILD_ARMEL=y
USE_SYSTEM_LUCENE=n
USE_SYSTEM_ICU=n
MONO_MINVER= (>= 1.2.3)
@@ -417,6 +419,10 @@
ifeq "$(BUILD_HPPA)" "y"
OOO_ARCHS += hppa
endif
+ifeq "$(BUILD_ARMEL)" "y"
+ OOO_ARCHS += armel
+endif
+
# Java...
OOO_JAVA_ARCHS = i386 powerpc mips mipsel s390
ifeq "$(BUILD_AMD64)" "y"
@@ -437,7 +443,9 @@
ifeq "$(BUILD_HPPA)" "y"
OOO_JAVA_ARCHS+= hppa
endif
-
+ifeq "$(BUILD_ARMEL)" "y"
+ OOO_JAVA_ARCHS+= armel
+endif
# gcj does not work on ppc, so no need to build -gcj for it
OOO_GCJ_ARCHS := $(filter-out ppc64,$(filter-out powerpc,$(OOO_JAVA_ARCHS)))
@@ -521,9 +529,15 @@
ifeq "$(BUILD_SPARC)" "y"
OOO_MOZILLA_ARCHS += sparc
endif
+ifeq "$(BUILD_ARMEL)" "y"
+ OOO_MOZILLA_ARCHS += armel
+endif
ifeq "$(BUILD_HPPA)" "y"
OOO_MOZILLA_ARCHS += hppa
endif
+ifeq "$(BUILD_ARMEL)" "y"
+ OOO_MOZILLA_ARCHS += armel
+endif
ifeq "$(USE_BZIP_COMPRESS)" "y"
DPKG_DEPENDS = dpkg (>= 1.10.24)
