Skip to content

Commit

Permalink
debian packaging update
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Sep 18, 2012
1 parent 9c6ebdd commit 18d9993
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
3 changes: 2 additions & 1 deletion debian/changelog
Expand Up @@ -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

Expand Down
4 changes: 4 additions & 0 deletions debian/rules
Expand Up @@ -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)
Expand Down

0 comments on commit 18d9993

Please sign in to comment.