[SCM] LibreOffice packaging repository branch, ubuntu-saucy-4.1, updated. libreoffice_4.1.0_beta2-2-343-g6f91b7c
The following commit has been merged in the ubuntu-saucy-4.1 branch:
commit 1c9b69ee6ee7f6a41dba001555a6ea24a938d5db
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Jun 13 01:22:57 2013 +0200
disable subsequentchecks for Ubuntu
diff --git a/changelog b/changelog
index 0152526..a07115a 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:4.1.0~beta2-0ubuntu1~ppa4) saucy; urgency=low
+
+ * do not run subsequentchecks in build anymore, as we can run them as an
+ autopkgtest, which is better, and eases distress caused by PPA buildds
+ being storage contrained
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 13 Jun 2013 01:20:45 +0200
+
libreoffice (1:4.1.0~beta2-0ubuntu1~ppa3) saucy; urgency=low
* use system orcus for real
diff --git a/rules b/rules
index afd4147..a510eff 100755
--- a/rules
+++ b/rules
@@ -567,6 +567,12 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
ifeq ($(shell echo "$(DEB_VERSION)" | grep -c ppa),1)
BUGS=mailto:libreoffice@lists.launchpad.net
endif
+ # we only run unitcheck and slowcheck, but not subsequentcheck
+ # as this would need a dev-install -- which is a problem on
+ # storage-contrained buildds. As we have ./debian/tests/junit-subsequentcheck
+ # now, which is running against properly installed packages and thus a better
+ # intgration test anyway
+ CHECKTARGET:=unitcheck slowcheck
# do not run checks on armel armhf powerpc for now as they fail with "debug output level 11 is too high"
ifneq (,$(filter armhf armel powerpc,$(DEB_HOST_ARCH)))
RUN_MAKE_CHECK:=n
--
LibreOffice packaging repository
Reply to: