From 18d9993e59e390e91a460572f0bcdf114c88bedf Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Tue, 18 Sep 2012 22:19:23 +0200 Subject: [PATCH] debian packaging update --- debian/changelog | 3 ++- debian/rules | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d515a3151c0..837a5e74f0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,9 +7,10 @@ qgis (1.9.0) UNRELEASED; urgency=low * include cpt-city files * support DEB_BUILD_OPTIONS' parallel=n * add python-unittest2 build dependency for maverick and squeeze + * disable PyQgsRectangle test on lucid (depends on unittest2) * add python-qscintilla2 dependency to python-qgis - -- Jürgen E. Fischer Mon, 17 Sep 2012 18:08:47 +0200 + -- Jürgen E. Fischer Tue, 18 Sep 2012 22:18:25 +0200 qgis (1.8.0) UNRELEASED; urgency=low diff --git a/debian/rules b/debian/rules index 26899cd3785..812fd1adf9a 100755 --- a/debian/rules +++ b/debian/rules @@ -27,6 +27,10 @@ TESTMAKE=xvfb-run -a -n 1 -s "-screen 0 1280x1024x24 -dpi 96" $(MAKE) else TESTMAKE=$(MAKE) endif +ifneq (,$(findstring $(DISTRIBUTION),"lucid")) +# excludes tests requiring unittest2 not available on lucid +TESTMAKE += ARGS="-E PyQgsRectangle" +endif QGIS_MAJOR=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_MAJOR "\([0-9]*\)")/\1/p' CMakeLists.txt) QGIS_MINOR=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_MINOR "\([0-9]*\)")/\1/p' CMakeLists.txt)