./packages/openofficeorg/2.4/unstable r1040: one more arm fix, -2

[Rene Engelhard <rene@debian.org>]

------------------------------------------------------------
revno: 1040
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2008-03-28 10:07:34 +0100
message:
  one more arm fix, -2
modified:
  changelog
  rules

=== modified file 'changelog'
--- a/changelog	2008-03-27 09:15:17 +0000
+++ b/changelog	2008-03-28 09:07:34 +0000
@@ -1,9 +1,13 @@
-openoffice.org (1:2.4.0-1.2pre) unstable; urgency=low
+openoffice.org (1:2.4.0-2) unstable; urgency=low
 
+  * Brown paper bag release.
+  * build with a correct control to get the needed libstlport4.6-dev builddep
+    on i386
   * debian/rules:
-    - remove arm also from OOO_MOZILLA_ARCHS and OOO_NPSOLPLUGIN_ARCHS...
+    - remove arm also from OOO_MOZILLA_ARCHS and OOO_NPSOLPLUGIN_ARCHS. Fix
+      "build-only-mythes" conditional to actually be on effect for arm
 
- -- Rene Engelhard <rene@debian.org>  Thu, 27 Mar 2008 10:10:22 +0100
+ -- Rene Engelhard <rene@debian.org>  Fri, 28 Mar 2008 00:28:17 +0100
 
 openoffice.org (1:2.4.0-1) unstable; urgency=low
 

=== modified file 'rules'
--- a/rules	2008-03-27 09:15:17 +0000
+++ b/rules	2008-03-28 09:07:34 +0000
@@ -350,6 +350,10 @@
   ifneq ($(ARCH),$(findstring $(ARCH),$(OOO_ARCHS)))
        BUILD_ONLY_LIBMYTHES=y
   else
+    # extra step needed for arm, as the if matches the arm in armel..
+    ifeq "$(ARCH)" "arm"
+               BUILD_ONLY_LIBMYTHES=y
+    endif
     ifeq "$(ARCH)" "amd64"
       ifneq "$(BUILD_AMD64)" "y"
                BUILD_ONLY_LIBMYTHES=y