@@ -176,14 +176,9 @@ cleantemplates:
176176 $(MAKE ) -f debian/rules templateclean
177177 $(MAKE ) -f debian/rules debian/control debian/compat
178178
179- build : ;
180-
181- binary binary-arch binary-indep build-arch build-indep clean install install-arch install-indep :
179+ binary binary-arch binary-indep build build-arch build-indep clean install install-arch install-indep :
182180 dh $@ --with python2 --parallel --builddirectory=$(QGIS_BUILDDIR )
183181
184- override_dh_auto_build-arch :
185- dh_auto_build
186-
187182override_dh_clean : cleantemplates
188183 dh_clean
189184
@@ -193,10 +188,12 @@ override_dh_clean: cleantemplates
193188
194189 -$(RM) -r $(CURDIR)/$(QGIS_BUILDDIR)/
195190
196- override_dh_auto_configure-arch : templates
191+ override_dh_auto_configure : templates
197192 dh_auto_configure -- $(CMAKE_OPTS )
198193
199- override_dh_auto_test-arch :
194+ override_dh_auto_test : test-stamp
195+
196+ test-stamp :
200197ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS ) ) )
201198 # Code to run the package test suite - and ignore the outcome for now
202199 mkdir -p debian/tmp/locale/
@@ -209,14 +206,9 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
209206else
210207 @echo Skipping tests.
211208endif
209+ touch test-stamp
212210
213- override_dh_auto_configure-indep : ;
214- override_dh_auto_test-indep : ;
215- override_dh_auto_install-indep : ;
216- override_dh_auto_build-indep : ;
217- override_dh_install-indep : ;
218-
219- override_dh_auto_install-arch :
211+ override_dh_auto_install :
220212 dh_auto_install
221213
222214 # Install menu pixmap
@@ -260,7 +252,7 @@ override_dh_auto_install-arch:
260252 install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-provider-grass/usr/bin/qgis
261253 install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-provider-grass/usr/bin/qbrowser
262254
263- override_dh_install-arch :
255+ override_dh_install :
264256 # Don't ship srs.db, automatically updated in postinst with crssync
265257 mv $(CURDIR ) /debian/tmp/usr/share/qgis/resources/srs.db $(CURDIR ) /debian/tmp/usr/share/qgis/resources/srs-template.db
266258
0 commit comments