[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. f6e0f0ece62eac484adaed388fce8b1a7f73e8d0



The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 197be538b251852ab08199f1644f95c80ce199d9
Author: Rene Engelhard <rene@debian.org>
Date:   Sat Apr 30 11:36:18 2011 +0000

    disable smoketest on sparc, flaky

diff --git a/changelog b/changelog
index 79127be..8a529f2 100644
--- a/changelog
+++ b/changelog
@@ -18,6 +18,12 @@ libreoffice (1:3.4.0~beta1-1) UNRELEASED; urgency=low
 
  -- Rene Engelhard <rene@debian.org>  Fri, 15 Apr 2011 13:57:22 +0200
 
+libreoffice (1:3.3.2-4) UNRELEASED; urgency=low
+
+  * disable smoketest on sparc, flaky 
+
+ -- Rene Engelhard <rene@debian.org>  Fri, 29 Apr 2011 21:12:05 +0200
+
 libreoffice (1:3.3.2-3) unstable; urgency=low
 
   * debian/rules, debian/control.in:
diff --git a/rules b/rules
index b99d44d..106f729 100755
--- a/rules
+++ b/rules
@@ -200,7 +200,11 @@ USE_OOO_BUILD_DESKTOPS=n
 PACKAGE_SDK=y
 ifeq "$(ENABLE_JAVA)" "y"
   ifeq "$(JDK)" "openjdk"
-    RUN_SMOKETEST=y
+    ifneq "$(ARCH)" "sparc"
+      RUN_SMOKETEST=y
+    else
+      RUN_SMOKETEST=n
+    endif
     RUN_SUBSEQUENT_TESTS=y
   else
     ifneq ($(ON_BUILDD),y)

-- 
LibreOffice packaging repository


Reply to: