------------------------------------------------------------
revno: 1071
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: unstable
timestamp: Wed 2008-04-16 23:18:59 +0200
message:
* debian/control.in, debian/rules:
- only add a dependency on openoffice.org-officebean to openoffice.org
when openoffice.org-officebean is actually built (i.e. we build with
Java)
modified:
changelog
control.in
rules
=== modified file 'changelog'
--- a/changelog 2008-04-16 12:57:59 +0000
+++ b/changelog 2008-04-16 21:18:59 +0000
@@ -1,7 +1,7 @@
openoffice.org (1:2.4.0-4.5pre) unstable; urgency=low
* ooo-build
- - update (r12178)
+ - update (r12192)
+ patches/src680/configures-explicit-arch.diff: fix up for
the internal icu build
* debian/rules:
@@ -9,6 +9,10 @@
for etch-backports and testing now has already -ldbl
- set PACKAGE_NPSOPLUGIN=n when MOZILLA= (--disable-mozilla)
- enable scsolver for armel (lp-solve now available)
+ * debian/control.in, debian/rules:
+ - only add a dependency on openoffice.org-officebean to openoffice.org
+ when openoffice.org-officebean is actually built (i.e. we build with
+ Java), thaks Chris Cheney
* debian/changelog: mention the various security fixes in OOH680_m5 and
OOH680_m6
* merge from Ubuntu:
=== modified file 'control.in'
--- a/control.in 2008-04-14 10:30:53 +0000
+++ b/control.in 2008-04-16 21:18:59 +0000
@@ -66,7 +66,7 @@
openoffice.orgVER-draw,
openoffice.orgVER-math,
openoffice.orgVER-base,
- openoffice.orgVER-officebean,
+ ${ooo-officebean-dep},
${ooo-binfilter-dep},
${writer-w2l-dep},
openoffice.orgVER-filter-mobiledev,
=== modified file 'rules'
--- a/rules 2008-04-16 12:57:59 +0000
+++ b/rules 2008-04-16 21:18:59 +0000
@@ -599,6 +599,7 @@
else
CONFIGURE_FLAGS += --disable-reportdesign
endif
+ OOO_OFFICEBEAN_DEP = openoffice.org$(VER)-officebean
else
CONFIGURE_FLAGS += --without-java
DEBHELPER_OPTIONS += -Nopenoffice.org$(VER)-officebean
-Nopenoffice.org$(VER)-java-common -Nopenoffice.org$(VER)-filter-mobiledev
@@ -2919,6 +2920,7 @@
-V'mozilla-nss-depends=$(MOZILLA_NSS_DEPENDS)' \
-V'Binary-Version=$(BINARY_VERSION)' \
-V'ooo-binfilter-dep=$(OOO_BINFILTER_DEP)' \
+ -V'ooo-officebean-dep=$(OOO_OFFICEBEAN_DEP)' \
-V'lpsolve-dep=$(LPSOLVE_DEP)' \
-V'gstreamer-plugins-suggests=$(GSTREAMER_PLUGINS_SUGGESTS)' \
-V'dbg-dbg-suggests=$(DBG_DBG_SUGGESTS)' \
