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

[SCM] LibreOffice packaging repository branch, ubuntu-quantal-3.6, updated. libreoffice_3.5.4-3-123-gc3618b9



The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit c9cf6d104f9d3526543d18f9eb93bc3c8036e27f
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Thu Dec 22 12:31:45 2011 +0100

    unset DISPLAY for subsequenttests

diff --git a/rules b/rules
index f58328b..e55372a 100755
--- a/rules
+++ b/rules
@@ -1601,7 +1601,7 @@ ifeq "$(BUILD_PYUNO)" "y"
 endif
 
 ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	$(CURDIR)/debian/rules check
+	unset DISPLAY && $(CURDIR)/debian/rules check gb_FULLDEPS=
 endif
 
 	touch $@

-- 
LibreOffice packaging repository


Reply to: