Skip to content
Permalink
Browse files

debian packaging update

  • Loading branch information
jef-n committed Sep 8, 2012
1 parent 4a9a9f7 commit e8a938a0aa60585e6057e71dcd54390e49502e53
Showing with 23 additions and 10 deletions.
  1. +3 −1 debian/changelog
  2. +20 −9 debian/rules
@@ -4,8 +4,10 @@ qgis (1.9.0) UNRELEASED; urgency=low
* include ows provider
* include wcs provider
* symbology-ng-style now in sqlite3
* include cpt-city files
* support DEB_BUILD_OPTIONS' parallel=n

-- Jürgen E. Fischer <jef@norbit.de> Thu, 16 Aug 2012 09:47:52 +0200
-- Jürgen E. Fischer <jef@norbit.de> Sat, 08 Sep 2012 12:59:40 +0200

qgis (1.8.0) UNRELEASED; urgency=low

@@ -12,9 +12,12 @@ DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)

DEB_TEST_TARGET ?= Experimental

DISTRIBUTION := $(shell dpkg-parsechangelog --format rfc822 | sed -ne "s/^Distribution: //p")
ifeq (,$(DISTRIBUTION))
DISTRIBUTION := $(shell dpkg-parsechangelog --format rfc822 | sed -ne "s/^Distribution: //p")
endif

ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"squeeze wheezy lucid maverick natty oneiric precise"))
DISTRIBUTION := sid
DISTRIBUTION := sid
endif

DEB_BUILD_NAME ?= $(DISTRIBUTION)-$(DEB_BUILD_ARCH)
@@ -45,6 +48,11 @@ CMAKE_OPTS := \

MAKEFLAGS += VERBOSE=YES

ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
endif

ifneq (,$(findstring $(DISTRIBUTION),"squeeze wheezy lucid maverick natty oneiric precise"))
CMAKE_OPTS += -D WITH_PYSPATIALITE=TRUE
endif
@@ -79,7 +87,11 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
endif

ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CMAKE_OPTS += -D CMAKE_BUILD_TYPE=Debug -D ENABLE_TESTS=TRUE
CMAKE_OPTS += -D CMAKE_BUILD_TYPE=Debug
endif

ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
CMAKE_OPTS += -D ENABLE_TESTS=TRUE
endif

ifneq (,$(findstring profile,$(DEB_BUILD_OPTIONS)))
@@ -95,17 +107,16 @@ $(2): $(1)
-e "s/{GRASS}/$(GRASS)/g" \
-e "s/{GRASS_ABI}/$(GRASS_ABI)/g" $$^ >$$@

templates:: $(2)

templateclean::
rm -f $(2)
endef

TEMPLATES := $(foreach t,$(wildcard debian/*.in debian/*.$(DISTRIBUTION)),$(basename $(t)))
TEMPLATES += $(foreach t,$(wildcard debian/*{QGIS_ABI}*),$(subst {QGIS_ABI},$(QGIS_ABI),$(t)))

$(foreach t,$(wildcard debian/*.in debian/*.$(DISTRIBUTION)),$(eval $(call gentemplate,$(t),$(basename $(t)))))
$(foreach t,$(wildcard debian/*{QGIS_ABI}*),$(eval $(call gentemplate,$(t),$(subst {QGIS_ABI},$(QGIS_ABI),$(t)))))

debian/build/CMakeCache.txt: $(TEMPLATES) CMakeLists.txt
debian/build/CMakeCache.txt: templates CMakeLists.txt
dh_testdir
# Add here commands to configure the package.
[ -d debian/build ] || mkdir debian/build
@@ -122,9 +133,9 @@ build-stamp: debian/build/CMakeCache.txt

ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
# Code to run the package test suite - and ignore the outcome for now
LD_LIBRARY_PATH=$(PWD)/debian/build/output/lib:$(LD_LIBRARY_PATH) $(TESTMAKE) -C debian/build $(DEB_TEST_TARGET) || true
-LD_LIBRARY_PATH=$(PWD)/debian/build/output/lib:$(LD_LIBRARY_PATH) $(TESTMAKE) -C debian/build $(DEB_TEST_TARGET)
else
echo Skipping tests.
@echo Skipping tests.
endif

touch $@

0 comments on commit e8a938a

Please sign in to comment.
You can’t perform that action at this time.