Skip to content
Permalink
Browse files

debian packaging update (partly reverts 245659f; fixes #13981)

(cherry picked from commit 24a61ff)
  • Loading branch information
jef-n committed Dec 14, 2015
1 parent ff8a34a commit deb34b8e079b3dc4dea15d614afd2979fb87df3f
Showing with 8 additions and 16 deletions.
  1. +8 −16 debian/rules
@@ -176,14 +176,9 @@ cleantemplates:
$(MAKE) -f debian/rules templateclean
$(MAKE) -f debian/rules debian/control debian/compat

build: ;

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

override_dh_auto_build-arch:
dh_auto_build

override_dh_clean: cleantemplates
dh_clean

@@ -193,10 +188,12 @@ override_dh_clean: cleantemplates

-$(RM) -r $(CURDIR)/$(QGIS_BUILDDIR)/

override_dh_auto_configure-arch: templates
override_dh_auto_configure: templates
dh_auto_configure -- $(CMAKE_OPTS)

override_dh_auto_test-arch:
override_dh_auto_test: test-stamp

test-stamp:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
# Code to run the package test suite - and ignore the outcome for now
mkdir -p debian/tmp/locale/
@@ -209,14 +206,9 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
else
@echo Skipping tests.
endif
touch test-stamp

override_dh_auto_configure-indep: ;
override_dh_auto_test-indep: ;
override_dh_auto_install-indep: ;
override_dh_auto_build-indep: ;
override_dh_install-indep: ;

override_dh_auto_install-arch:
override_dh_auto_install:
dh_auto_install

# Install menu pixmap
@@ -260,7 +252,7 @@ override_dh_auto_install-arch:
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-provider-grass/usr/bin/qgis
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-provider-grass/usr/bin/qbrowser

override_dh_install-arch:
override_dh_install:
# Don't ship srs.db, automatically updated in postinst with crssync
mv $(CURDIR)/debian/tmp/usr/share/qgis/resources/srs.db $(CURDIR)/debian/tmp/usr/share/qgis/resources/srs-template.db

0 comments on commit deb34b8

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