Skip to content

Commit

Permalink
debian packaging: add buster
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Mar 11, 2018
1 parent 010a99d commit d88da33
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 23 deletions.
36 changes: 18 additions & 18 deletions debian/control.in
Expand Up @@ -13,7 +13,7 @@ Build-Depends:
libexpat1-dev,
libfcgi-dev,
libgdal-dev (>= 1.11),
#sid stretch xenial yakkety zesty artful bionic# libgsl-dev,
#sid buster stretch xenial yakkety zesty artful bionic# libgsl-dev,
libgeos-dev (>= 3.0.0),
libpq-dev,
libproj-dev,
Expand All @@ -38,12 +38,12 @@ Build-Depends:
graphviz,
xvfb, xauth,
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
#sid artful bionic# libosgearth-dev, qt3d5-dev, qt3d-assimpsceneimport-plugin, qt3d-defaultgeometryloader-plugin, qt3d-gltfsceneio-plugin, qt3d-scene2d-plugin,
#sid buster artful bionic# 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
#sid 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#Standards-Version: 3.9.7
# xenial yakkety zesty artful bionic#XS-Python-Version: current
Vcs-Browser: https://github.com/qgis/QGIS/
Vcs-Git: https://github.com/qgis/QGIS.git
Homepage: http://qgis.org/
Expand Down Expand Up @@ -145,19 +145,19 @@ Description: QGIS - shared native gui library
.
This package contains the shared native gui library.

#artful bionic sid#Package: libqgis-3d{QGIS_ABI}
#artful bionic sid#Architecture: any
#artful bionic sid#Section: libs
#artful bionic sid#Depends:
#artful bionic sid# qt3d-assimpsceneimport-plugin, qt3d-defaultgeometryloader-plugin, qt3d-gltfsceneio-plugin, qt3d-scene2d-plugin,
#artful bionic sid# ${shlibs:Depends},
#artful bionic sid# ${misc:Depends}
#artful bionic sid#Description: QGIS - shared 3d library
#artful bionic sid# QGIS is a Geographic Information System (GIS) which manages, analyzes and
#artful bionic sid# display databases of geographic information.
#artful bionic sid# .
#artful bionic sid# This package contains the shared 3d library.
#artful bionic sid#
#artful bionic buster sid#Package: libqgis-3d{QGIS_ABI}
#artful bionic buster sid#Architecture: any
#artful bionic buster sid#Section: libs
#artful bionic buster sid#Depends:
#artful bionic buster sid# qt3d-assimpsceneimport-plugin, qt3d-defaultgeometryloader-plugin, qt3d-gltfsceneio-plugin, qt3d-scene2d-plugin,
#artful bionic buster sid# ${shlibs:Depends},
#artful bionic buster sid# ${misc:Depends}
#artful bionic buster sid#Description: QGIS - shared 3d library
#artful bionic buster sid# QGIS is a Geographic Information System (GIS) which manages, analyzes and
#artful bionic buster sid# display databases of geographic information.
#artful bionic buster sid# .
#artful bionic buster sid# This package contains the shared 3d library.
#artful bionic buster sid#
Package: libqgisgrass{GRASSVER}-{QGIS_ABI}
Architecture: any
Section: libs
Expand Down Expand Up @@ -214,7 +214,7 @@ Depends:
libexpat1-dev,
libgdal-dev (>= 1.11),
libgeos-dev (>= 3.0.0),
#sid stretch xenial yakkety zesty artful bionic# libgsl-dev,
#sid buster stretch xenial yakkety zesty artful bionic# libgsl-dev,
libpq-dev,
libproj-dev,
libqgis-app{QGIS_ABI} (= ${binary:Version}),
Expand Down
2 changes: 1 addition & 1 deletion debian/libqgis-dev.install.in
Expand Up @@ -8,4 +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
#sid buster artful bionic#usr/lib/libqgis_3d.so
8 changes: 4 additions & 4 deletions debian/rules
Expand Up @@ -36,7 +36,7 @@ endif

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

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

Expand Down Expand Up @@ -98,11 +98,11 @@ ifneq (,$(WITH_GLOBE))
CMAKE_OPTS += -DWITH_GLOBE=TRUE
endif

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

ifneq (,$(findstring $(DISTRIBUTION),"artful bionic sid"))
ifneq (,$(findstring $(DISTRIBUTION),"artful bionic buster sid"))
CMAKE_OPTS += \
-DWITH_3D=TRUE \
-DGEOS_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libgeos_c.so
Expand All @@ -124,7 +124,7 @@ endif
-DORACLE_INCLUDEDIR=$(ORACLE_INCLUDEDIR)
endif

ifneq (,$(findstring $(DISTRIBUTION),"sid stretch"))
ifneq (,$(findstring $(DISTRIBUTION),"sid buster stretch"))
CMAKE_OPTS += -DSPATIALINDEX_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libspatialindex.so
endif

Expand Down

0 comments on commit d88da33

Please sign in to comment.