Skip to content

Commit 18d9993

Browse files
committed
debian packaging update
1 parent 9c6ebdd commit 18d9993

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

debian/changelog

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ qgis (1.9.0) UNRELEASED; urgency=low
77
* include cpt-city files
88
* support DEB_BUILD_OPTIONS' parallel=n
99
* add python-unittest2 build dependency for maverick and squeeze
10+
* disable PyQgsRectangle test on lucid (depends on unittest2)
1011
* add python-qscintilla2 dependency to python-qgis
1112

12-
-- Jürgen E. Fischer <jef@norbit.de> Mon, 17 Sep 2012 18:08:47 +0200
13+
-- Jürgen E. Fischer <jef@norbit.de> Tue, 18 Sep 2012 22:18:25 +0200
1314

1415
qgis (1.8.0) UNRELEASED; urgency=low
1516

debian/rules

+4
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ TESTMAKE=xvfb-run -a -n 1 -s "-screen 0 1280x1024x24 -dpi 96" $(MAKE)
2727
else
2828
TESTMAKE=$(MAKE)
2929
endif
30+
ifneq (,$(findstring $(DISTRIBUTION),"lucid"))
31+
# excludes tests requiring unittest2 not available on lucid
32+
TESTMAKE += ARGS="-E PyQgsRectangle"
33+
endif
3034

3135
QGIS_MAJOR=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_MAJOR "\([0-9]*\)")/\1/p' CMakeLists.txt)
3236
QGIS_MINOR=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_MINOR "\([0-9]*\)")/\1/p' CMakeLists.txt)

0 commit comments

Comments
 (0)