Skip to content
Permalink
Browse files

debian packaging: fix build on xenial

  • Loading branch information
jef-n committed Mar 25, 2019
1 parent cc0e375 commit b9011f07711c3c31f1bd8392f68cf8286e803ea9
Showing with 3 additions and 7 deletions.
  1. +2 −2 debian/{python3-qgis.install → python3-qgis.install.in}
  2. +1 −5 debian/rules
@@ -1,5 +1,5 @@
usr/lib/python*/*-packages/qgis/3d/__init__.py
usr/lib/python*/*-packages/qgis/_3d.so
#sid buster bionic cosmic#usr/lib/python*/*-packages/qgis/3d/__init__.py
#sid buster bionic cosmic#usr/lib/python*/*-packages/qgis/_3d.so
usr/lib/python*/*-packages/qgis/_analysis.so
usr/lib/python*/*-packages/qgis/_core.so
usr/lib/python*/*-packages/qgis/_gui.so
@@ -90,8 +90,7 @@ CMAKE_OPTS := \
-DWITH_SERVER_PLUGINS=TRUE \
-DWITH_QWTPOLAR=FALSE \
-DQT_PLUGINS_DIR=$(QT_PLUGINS_DIR) \
-DPYTHON_LIBRARY=$(shell python3-config --ldflags | sed -e 's\#-L\(.*\) -L/usr/lib -l\([^ ]*\) .*$$\#\1/lib\2.so\#') \
-DDOXYGEN_ON_DEMAND=TRUE
-DPYTHON_LIBRARY=$(shell python3-config --ldflags | sed -e 's\#-L\(.*\) -L/usr/lib -l\([^ ]*\) .*$$\#\1/lib\2.so\#')

ifneq ($(SHA),)
CMAKE_OPTS += -DSHA=$(SHA)
@@ -252,9 +251,6 @@ else
ninja $(NINJA_OPTS) -C $(QGIS_BUILDDIR)
endif

override_dh_auto_build-indep:
ninja $(NINJA_OPTS) -C $(QGIS_BUILDDIR) apidoc

override_dh_auto_test: test-stamp

test-stamp:

0 comments on commit b9011f0

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