debian packaging update

This commit is contained in:
Juergen E. Fischer 2012-09-18 22:19:23 +02:00
parent 9c6ebdd4ee
commit 18d9993e59
2 changed files with 6 additions and 1 deletions

3
debian/changelog vendored
View File

@ -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 <jef@norbit.de> Mon, 17 Sep 2012 18:08:47 +0200
-- Jürgen E. Fischer <jef@norbit.de> Tue, 18 Sep 2012 22:18:25 +0200
qgis (1.8.0) UNRELEASED; urgency=low

4
debian/rules vendored
View File

@ -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)