[SCM] qgis branch, master, updated. upstream/2.0.1-13436-g7969474

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 753e9ddd4e6099c358456e8c16b0b0f204f563a0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Sep 27 05:59:01 2013 +0200

    Don't run tests during build, requires network.

diff --git a/debian/changelog b/debian/changelog
index 9b9f7f4..125c0cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ qgis (2.0.1-1) UNRELEASED; urgency=low
   * Update watch file. (closes: #717052)
   * Drop 10_fix_gcc4.7_build.patch, no longer required.
   * Use canonical URLs for Vcs-* fields.
+  * Don't run tests during build, requires network.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 27 Sep 2013 02:05:32 +0200
 
diff --git a/debian/rules b/debian/rules
index a1c6eaf..3615414 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,9 +47,10 @@ ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CMAKE_OPTS += -DCMAKE_BUILD_TYPE=Debug
 endif
 
-ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+# Don't build tests, running them requires network
+#ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	CMAKE_OPTS += -DENABLE_TESTS=FALSE
-endif
+#endif
 
 MAKEFLAGS += VERBOSE=YES
 
@@ -93,7 +94,8 @@ override_dh_auto_build:
 	$(MAKE) -C build
 
 override_dh_auto_test:
-	-LD_LIBRARY_PATH=$(PWD)/build/output/lib:$(LD_LIBRARY_PATH) $(TESTMAKE) -C build $(DEB_TEST_TARGET)
+	# Don't run tests, requires network
+	#-LD_LIBRARY_PATH=$(PWD)/build/output/lib:$(LD_LIBRARY_PATH) $(TESTMAKE) -C build $(DEB_TEST_TARGET)
 
 override_dh_auto_install:
 	$(MAKE) -C build install DESTDIR=$(CURDIR)/debian/tmp

-- 
The Quantum GIS in Debian project