------------------------------------------------------------
revno: 1059
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sun 2008-04-27 01:18:26 +0200
message:
merge
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.1.62
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sun 2008-04-27 01:17:18 +0200
message:
correct control.mono.in inclusion regardless of host architecture
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-04-26 23:17:58 +0000
+++ b/changelog 2008-04-26 23:18:26 +0000
@@ -53,9 +53,10 @@
- support xulrunner 1.9
- fix java-gcj-compat-dev build-depends conditional logic to set the
right versioned build-dep for !etch
+ - correct control.mono.in inclusion regardless of host architecture
* debian/scripts/vars.ppc64: actually add
- -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 27 Apr 2008 00:48:39 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 27 Apr 2008 00:59:54 +0200
openoffice.org (1:2.4.0-5) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2008-04-26 23:17:58 +0000
+++ b/rules 2008-04-26 23:18:26 +0000
@@ -296,6 +296,8 @@
ENABLE_JAVA=n
endif
endif
+
+ifeq "$(ENABLE_MONO)" "y"
# mono
# ppc fails (#412967), arm(el), too
OOO_MONO_ARCHS = i386 sparc
@@ -308,6 +310,9 @@
ifeq (,$(findstring $(ARCH),$(OOO_MONO_ARCHS)))
ENABLE_MONO=n
endif
+else
+OOO_MONO_ARCHS=
+endif
ifeq "$(PACKAGE_NPSOPLUGIN)" "y"
# Mozilla plugin. Crashes on amd64
@@ -1283,7 +1288,7 @@
>> debian/control < debian/control.gcj.in
endif
endif
-ifeq "$(ENABLE_MONO)" "y"
+ifneq "$(OOO_MONO_ARCHS)" ""
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.mono.in
endif
