./packages/openofficeorg/3.2.1/unstable r2036: update smoketest conditional, enable smoketest uncoditionally when building without Java

[Rene Engelhard <rene@debian.org>]

------------------------------------------------------------
revno: 2036
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2010-06-22 01:32:41 +0200
message:
  update smoketest conditional, enable smoketest uncoditionally when building without Java
modified:
  changelog
  rules

=== modified file 'changelog'
--- a/changelog	2010-06-21 23:19:42 +0000
+++ b/changelog	2010-06-21 23:32:41 +0000
@@ -4,8 +4,10 @@
     I missed some parts and had the conditional wrong...
   * debian/rules:
     - fix builds without Java
+    - update smoketest conditional, enable smoketest uncoditionally when
+      building without Java
 
- -- Rene Engelhard <rene@debian.org>  Tue, 22 Jun 2010 01:18:37 +0200
+ -- Rene Engelhard <rene@debian.org>  Tue, 22 Jun 2010 01:31:46 +0200
 
 openoffice.org (1:3.2.1-3) unstable; urgency=low
 

=== modified file 'rules'
--- a/rules	2010-06-20 23:55:51 +0000
+++ b/rules	2010-06-21 23:32:41 +0000
@@ -204,12 +204,16 @@
 USE_SYSTEM_REDLAND=y
 USE_OOO_BUILD_DESKTOPS=n
 PACKAGE_SDK=y
-ifeq "$(JDK)" "openjdk"
-  RUN_SMOKETEST=y
-else
+ifeq "$(ENABLE_JAVA)" "y"
+  ifeq "$(JDK)" "openjdk"
+    RUN_SMOKETEST=y
+  else
     ifneq (buildd,$(shell whoami))
       RUN_SMOKETEST=n
     endif
+  endif
+else
+  RUN_SMOKETEST=y
 endif
 RUN_API_TESTS=n
 RUN_UNIT_TESTS=n