Skip to content

Commit

Permalink
debian packaging: add 3d for sid and artful
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Oct 2, 2017
1 parent 68bb68d commit f3a4a6b
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 3 deletions.
15 changes: 14 additions & 1 deletion debian/control.in
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Build-Depends:
graphviz,
xvfb, xauth,
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
#sid# libosgearth-dev,
#artful sid# libosgearth-dev, qt3d5-dev, qt3d-assimpsceneimport-plugin, qt3d-defaultgeometryloader-plugin, qt3d-gltfsceneio-plugin, qt3d-scene2d-plugin,
#oracle# oracle-instantclient12.1-devel, oracle-instantclient12.1-basiclite, qtbase5-private-dev,
locales, ca-certificates, ninja-build
Build-Conflicts: libqgis-dev, qgis-dev
Expand Down Expand Up @@ -145,6 +145,19 @@ Description: QGIS - shared native gui library
.
This package contains the shared native gui library.

#artful sid#Package: libqgis-3d{QGIS_ABI}
#artful sid#Architecture: any
#artful sid#Section: libs
#artful sid#Depends:
#artful sid# qt3d-assimpsceneimport-plugin, qt3d-defaultgeometryloader-plugin, qt3d-gltfsceneio-plugin, qt3d-scene2d-plugin,
#artful sid# ${shlibs:Depends},
#artful sid# ${misc:Depends}
#artful sid#Description: QGIS - shared 3d library
#artful sid# QGIS is a Geographic Information System (GIS) which manages, analyzes and
#artful sid# display databases of geographic information.
#artful sid# .
#artful sid# This package contains the shared 3d library.
#artful sid#
Package: libqgisgrass{GRASSVER}-{QGIS_ABI}
Architecture: any
Section: libs
Expand Down
1 change: 1 addition & 0 deletions debian/libqgis-3d{QGIS_ABI}.install
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
usr/lib/libqgis_3d.so.{QGIS_ABI}
1 change: 1 addition & 0 deletions debian/libqgis-dev.install.in
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ usr/lib/libqgis_server.so
usr/lib/libqgisgrass{GRASSVER}.so
usr/lib/libqgispython.so
usr/share/qgis/FindQGIS.cmake
#sid#usr/lib/libqgis_3d.so
1 change: 1 addition & 0 deletions debian/qgis-common.install
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ usr/share/qgis/i18n/*
usr/share/qgis/images/*
usr/share/qgis/resources/spatialite.db
usr/share/qgis/resources/themes/*
usr/share/qgis/qgis_global_settings.ini
6 changes: 4 additions & 2 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,10 @@ ifneq (,$(findstring $(DISTRIBUTION),"sid stretch"))
CMAKE_OPTS += -DPOSTGRES_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpq.so
endif

ifneq (,$(findstring $(DISTRIBUTION),"sid"))
CMAKE_OPTS += -DGEOS_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libgeos_c.so
ifneq (,$(findstring $(DISTRIBUTION),"artful sid"))
CMAKE_OPTS += \
-DWITH_3D=TRUE \
-DGEOS_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libgeos_c.so
endif


Expand Down

0 comments on commit f3a4a6b

Please sign in to comment.