Skip to content
Permalink
Browse files

debian packaging: add ubuntu cosmic

  • Loading branch information
jef-n committed Jul 4, 2018
1 parent 47f6faa commit a80890ca5b4065e9cc4c9043af09532d348e45a1
Showing with 61 additions and 54 deletions.
  1. +12 −11 INSTALL
  2. +19 −19 debian/control.in
  3. +1 −1 debian/libqgis-dev.install.in
  4. +3 −2 debian/rules
  5. +17 −13 doc/INSTALL.html
  6. +9 −8 doc/linux.t2t
23 INSTALL

Large diffs are not rendered by default.

@@ -13,7 +13,7 @@ Build-Depends:
libexpat1-dev,
libfcgi-dev,
libgdal-dev (>= 1.11),
#sid buster stretch xenial yakkety zesty artful bionic# libgsl-dev,
#sid buster stretch xenial yakkety zesty artful bionic cosmic# libgsl-dev,
libgeos-dev (>= 3.0.0),
libpq-dev,
libproj-dev,
@@ -38,13 +38,13 @@ Build-Depends:
graphviz,
xvfb, xauth,
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
#sid buster artful bionic# libosgearth-dev,
#artful bionic# qt3d5-dev, qt3d-assimpsceneimport-plugin, qt3d-defaultgeometryloader-plugin, qt3d-gltfsceneio-plugin, qt3d-scene2d-plugin,
#sid buster artful bionic cosmic# libosgearth-dev,
#artful bionic cosmic# 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
#sid buster stretch xenial yakkety zesty artful bionic#Standards-Version: 3.9.7
# xenial yakkety zesty artful bionic#XS-Python-Version: current
#sid buster stretch xenial yakkety zesty artful bionic cosmic#Standards-Version: 3.9.7
# xenial yakkety zesty artful bionic cosmic#XS-Python-Version: current
Vcs-Browser: https://github.com/qgis/QGIS/
Vcs-Git: https://github.com/qgis/QGIS.git
Homepage: http://qgis.org/
@@ -146,19 +146,19 @@ Description: QGIS - shared native gui library
.
This package contains the shared native gui library.

#artful bionic#Package: libqgis-3d{QGIS_ABI}
#artful bionic#Architecture: any
#artful bionic#Section: libs
#artful bionic#Depends:
#artful bionic# qt3d-assimpsceneimport-plugin, qt3d-defaultgeometryloader-plugin, qt3d-gltfsceneio-plugin, qt3d-scene2d-plugin,
#artful bionic# ${shlibs:Depends},
#artful bionic# ${misc:Depends}
#artful bionic#Description: QGIS - shared 3d library
#artful bionic# QGIS is a Geographic Information System (GIS) which manages, analyzes and
#artful bionic# display databases of geographic information.
#artful bionic# .
#artful bionic# This package contains the shared 3d library.
#artful bionic#
#artful bionic cosmic#Package: libqgis-3d{QGIS_ABI}
#artful bionic cosmic#Architecture: any
#artful bionic cosmic#Section: libs
#artful bionic cosmic#Depends:
#artful bionic cosmic# qt3d-assimpsceneimport-plugin, qt3d-defaultgeometryloader-plugin, qt3d-gltfsceneio-plugin, qt3d-scene2d-plugin,
#artful bionic cosmic# ${shlibs:Depends},
#artful bionic cosmic# ${misc:Depends}
#artful bionic cosmic#Description: QGIS - shared 3d library
#artful bionic cosmic# QGIS is a Geographic Information System (GIS) which manages, analyzes and
#artful bionic cosmic# display databases of geographic information.
#artful bionic cosmic# .
#artful bionic cosmic# This package contains the shared 3d library.
#artful bionic cosmic#
Package: libqgisgrass{GRASSVER}-{QGIS_ABI}
Architecture: any
Section: libs
@@ -215,7 +215,7 @@ Depends:
libexpat1-dev,
libgdal-dev (>= 1.11),
libgeos-dev (>= 3.0.0),
#sid buster stretch xenial yakkety zesty artful bionic# libgsl-dev,
#sid buster stretch xenial yakkety zesty artful bionic cosmic# libgsl-dev,
libpq-dev,
libproj-dev,
libqgis-app{QGIS_ABI} (= ${binary:Version}),
@@ -8,4 +8,4 @@ usr/lib/libqgis_server.so
usr/lib/libqgisgrass{GRASSVER}.so
usr/lib/libqgispython.so
usr/share/qgis/FindQGIS.cmake
#artful bionic#usr/lib/libqgis_3d.so
#artful bionic cosmic#usr/lib/libqgis_3d.so
@@ -36,7 +36,7 @@ endif

QT_PLUGINS_DIR = usr/lib/$(DEB_BUILD_MULTIARCH)/qt5/plugins

ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"stretch buster xenial yakkety zesty artful bionic"))
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"stretch buster xenial yakkety zesty artful bionic cosmic"))
DISTRIBUTION := sid
endif

@@ -102,7 +102,8 @@ ifneq (,$(findstring $(DISTRIBUTION),"sid buster stretch"))
CMAKE_OPTS += -DPOSTGRES_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpq.so
endif

ifneq (,$(findstring $(DISTRIBUTION),"artful bionic"))
ifneq (,$(findstring $(DISTRIBUTION),"artful bionic cosmic"))
# Only on ubuntu - Qt3DExtras intentionally removed from debian (#895386)
CMAKE_OPTS += \
-DWITH_3D=TRUE \
-DGEOS_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libgeos_c.so

0 comments on commit a80890c

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