Skip to content
Permalink
Browse files
debian packaging update: make build dir configuable
  • Loading branch information
jef-n committed May 27, 2015
1 parent 44d6cc3 commit f0eeef79132bf3ae909748be0925e18c2250bebc
Showing with 8 additions and 5 deletions.
  1. +3 −1 debian/changelog
  2. +5 −4 debian/rules
@@ -3,8 +3,10 @@ qgis (2.9.0) UNRELEASED; urgency=medium
* New development version 2.9 after branch of 2.8
* include dependency to liblwgeom
* 'stretch' package a bit
* merge downstream addition of debug package
* make build directory configurable

-- Jürgen E. Fischer <jef@norbit.de> Fri, 22 May 2015 08:34:55 +0200
-- Jürgen E. Fischer <jef@norbit.de> Thu, 28 May 2015 00:35:42 +0200

qgis (2.8.0) unstable; urgency=medium

@@ -16,6 +16,7 @@ DEB_BUILD_MULTIARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
QT_PLUGIN_DIR = usr/lib/$(DEB_BUILD_MULTIARCH)/qt4/plugins

DEB_TEST_TARGET ?= Experimental
BUILDDIR ?= debian/build

QGIS_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')

@@ -155,7 +156,7 @@ cleantemplates:
$(MAKE) -f debian/rules debian/control debian/compat

binary binary-arch binary-indep build build-arch build-indep clean install install-arch install-indep:
dh $@ --with python2 --parallel --builddirectory=debian/build
dh $@ --with python2 --parallel --builddirectory=$(BUILDDIR)

override_dh_clean: cleantemplates
dh_clean
@@ -164,7 +165,7 @@ override_dh_clean: cleantemplates
-$(RM) $(CURDIR)/src/core/qgscontexthelp_texts.cpp
-$(RM) $(CURDIR)/src/core/qgsexpression_texts.cpp

-$(RM) -r $(CURDIR)/debian/build/
-$(RM) -r $(CURDIR)/$(BUILDDIR)/

override_dh_auto_configure: templates
dh_auto_configure -- $(CMAKE_OPTS)
@@ -176,9 +177,9 @@ override_dh_auto_test:
localedef -f UTF-8 -i en_US ./debian/tmp/locale/en_US.UTF-8/
-LOCPATH=$(CURDIR)/debian/tmp/locale/ \
LC_ALL=en_US.UTF-8 \
LD_LIBRARY_PATH=$(CURDIR)/debian/build/output/lib:$(LD_LIBRARY_PATH) \
LD_LIBRARY_PATH=$(CURDIR)/$(BUILDDIR)/output/lib:$(LD_LIBRARY_PATH) \
PATH=/usr/sbin:$(PATH) \
$(TESTMAKE) -C debian/build $(DEB_TEST_TARGET)
$(TESTMAKE) -C $(BUILDDIR) $(DEB_TEST_TARGET)
else
override_dh_auto_test:
@echo Skipping tests.

0 comments on commit f0eeef7

Please sign in to comment.