The following commit has been merged in the debian-experimental-3.5 branch:
commit 29beb5f5ed860a4483e1594816391394313b7b2e
Author: Rene Engelhard <r...@debian.org>
Date:   Sun Jan 29 22:36:59 2012 +0100

    give gb_FULLDEPS= to actual make check call, not debian/rules check

diff --git a/changelog b/changelog
index 28eac74..f4aa722 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:3.5.0~rc2-3) UNRELEASED; urgency=low
+
+  * debian/rules:
+    - give gb_FULLDEPS= to actual make check call, not debian/rules
+      check
+
+ -- Rene Engelhard <r...@debian.org>  Sun, 29 Jan 2012 17:00:47 +0100
+
 libreoffice (1:3.5.0~rc2-2) experimental; urgency=low
 
   * debian/rules:
diff --git a/rules b/rules
index 99dd2f2..219eff1 100755
--- a/rules
+++ b/rules
@@ -1604,7 +1604,7 @@ ifeq "$(BUILD_PYUNO)" "y"
 endif
 
 ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-       $(CURDIR)/debian/rules check gb_FULLDEPS=
+       $(CURDIR)/debian/rules check
 endif
 
        touch $@
@@ -1621,7 +1621,7 @@ endif
                export TMPDIR=$(CURDIR)/debian/smoketest; \
                export HOME=$(CURDIR)/debian/smoketest; \
                export SAL_USE_VCLPLUGIN="svp"; \
-                $(MAKE) check
+               $(MAKE) check gb_FULLDEPS=
        # doesn't get cleaned up.. (at least the dirs, the contents are gone)
        cd $(CURDIR)/debian/smoketest && \
        find . -noleaf -maxdepth 1 ! -name "." -exec rm -rf {} \;

-- 
LibreOffice packaging repository


-- 
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1rrxjd-0002nt...@vasks.debian.org

Reply via email to