------------------------------------------------------------
revno: 1082
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Fri 2008-04-25 13:20:12 +0200
message:
support xulrunner 1.9
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-04-24 16:03:39 +0000
+++ b/changelog 2008-04-25 11:20:12 +0000
@@ -1,11 +1,14 @@
openoffice.org (1:2.4.0-5.6pre) unstable; urgency=low
+ * ooo-build:
+ - update (r12325 - 2.4.0.8)
* debian/rules:
- fix debian/rules to add archs to OOO_SCSOLVER_ARCHS when they build OOo
to not get usless build-deps there
+ - support xulrunner 1.9
* debian/scripts/vars.ppc64: actually add
- -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 24 Apr 2008 18:03:13 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 25 Apr 2008 13:13:31 +0200
openoffice.org (1:2.4.0-5) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2008-04-23 07:51:47 +0000
+++ b/rules 2008-04-25 11:20:12 +0000
@@ -612,7 +612,12 @@
BUILD_DEPS+= , libxul-dev [$(OOO_MOZILLA_ARCHS)], libnss3-dev
[$(OOO_MOZILLA_ARCHS)]
DBG_DBG_SUGGESTS+= , libnss3-1d-dbg, libnspr4-0d-dbg
else
+ ifeq "$(MOZILLA)" "libxul"
+ BUILD_DEPS+= , xulrunner-dev-static [$(OOO_MOZILLA_ARCHS)], libnss3-dev
[$(OOO_MOZILLA_ARCHS)]
+ else
BUILD_DEPS += , $(MOZILLA)-dev [$(OOO_MOZILLA_ARCHS)]
+ endif
+ DBG_DBG_SUGGESTS+= , libnss3-1d-dbg, libnspr4-0d-dbg
endif
CONFIGURE_FLAGS += --with-system-mozilla=$(MOZILLA)
else
@@ -715,7 +720,7 @@
endif
ifeq "$(USE_SYSTEM_XMLSEC)" "y"
- ifeq "$(MOZILLA)" "xulrunner"
+ ifneq (,$(findstring xul,$(MOZILLA)))
BUILD_DEPS += , libxmlsec1-dev (>= 1.2.9-1.1) [$(OOO_ARCHS)],
libxmlsec1-nss (>= 1.2.9-1.1) [$(OOO_ARCHS)], libxmlsec1-openssl (>= 1.2.9-1.1)
[$(OOO_ARCHS)]
else
BUILD_DEPS += , libxmlsec1-dev (>= 1.2.9) [$(OOO_ARCHS)],
libxmlsec1-nss (>= 1.2.9) [$(OOO_ARCHS)], libxmlsec1-openssl (>= 1.2.9)
[$(OOO_ARCHS)]
