------------------------------------------------------------
revno: 1069
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: unstable
timestamp: Wed 2008-04-16 08:34:54 +0200
message:
Correct control.mozilla.in inclusion regardless of host architecture (merge
from Ubuntu)
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-04-16 02:22:36 +0000
+++ b/changelog 2008-04-16 06:34:54 +0000
@@ -6,6 +6,9 @@
- set PACKAGE_NPSOPLUGIN=n when MOZILLA= (--disable-mozilla)
* debian/changelog: mention the various security fixes in OOH680_m5 and
OOH680_m6
+ * merge from Ubuntu:
+ - debian/rules:
+ + Correct control.mozilla.in inclusion regardless of host architecture
-- Rene Engelhard <[EMAIL PROTECTED]> Tue, 15 Apr 2008 21:15:29 +0200
=== modified file 'rules'
--- a/rules 2008-04-16 02:23:51 +0000
+++ b/rules 2008-04-16 06:34:54 +0000
@@ -297,6 +297,8 @@
ifeq (,$(findstring $(ARCH),$(OOO_MONO_ARCHS)))
ENABLE_MONO=n
endif
+
+ifeq "$(PACKAGE_NPSOPLUGIN)" "y"
# Mozilla plugin. Crashes on amd64
OOO_NPSOPLUGIN_ARCHS = i386 powerpc sparc mips mipsel s390
ifeq "$(BUILD_AMD64)" "y"
@@ -314,6 +316,9 @@
PACKAGE_NPSOPLUGIN=n
endif
endif
+else
+OOO_NPSOPLUGIN_ARCHS=
+endif
# lp-solve and libsuitesparse not available
ifeq "$(ARCH)" "armel"
@@ -1262,7 +1267,7 @@
cat debian/control.pcvslib.in \
>> debian/control
endif
-ifeq "$(PACKAGE_NPSOPLUGIN)" "y"
+ifneq "$(OOO_NPSOPLUGIN_ARCHS)" ""
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.mozilla.in
endif
