r797 ./packages/openofficeorg/2.2.1/unstable: work around 447275 (merge from 2.3)
------------------------------------------------------------
revno: 797
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Fri 2007-10-19 18:51:49 +0200
message:
work around 447275 (merge from 2.3)
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2007-09-17 12:45:23 +0000
+++ b/changelog 2007-10-19 16:51:49 +0000
@@ -1,3 +1,12 @@
+openoffice.org (2.2.1-10) unstable; urgency=medium
+
+ * merge from 2.3 branch:
+ - debian/rules:
+ + build-depend on lib32icu36 on amd64 when using ICU 3.6 to work around
+ #447275
+
+ -- Rene Engelhard <rene@debian.org> Sun, 16 Sep 2007 00:42:19 +0200
+
openoffice.org (2.2.1-9) unstable; urgency=high
* ooo-build:
=== modified file 'rules'
--- a/rules 2007-09-17 12:45:23 +0000
+++ b/rules 2007-10-19 16:51:49 +0000
@@ -501,6 +501,9 @@
ifeq "$(USE_SYSTEM_ICU)" "y"
BUILD_DEPS += , libicu36-dev [$(OOO_ARCHS)]
+ ifeq "$(BUILD_AMD64)" "y"
+ BUILD_DEPS += , lib32icu36 [amd64]
+ endif
CONFIGURE_FLAGS += --with-system-icu
# ICU utils are in /usr/sbin (!)
PATH := $(PATH):/usr/sbin
Reply to: