Skip to content

Commit

Permalink
debian packaging: add eoan
Browse files Browse the repository at this point in the history
  • Loading branch information
@jef-n
jef-n committed Oct 3, 2019
1 parent 8c0e0a7 commit 019196a
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 35 deletions.
58 changes: 29 additions & 29 deletions debian/control.in
View file
Expand Up @@ -17,13 +17,13 @@ Build-Depends:
libgdal-dev (>= 1.11),
libgeos-dev (>= 3.0.0),
libgsl-dev,
#sid buster bionic disco# libosgearth-dev,
#sid buster bionic disco eoan# libosgearth-dev,
libpq-dev,
libproj-dev,
libqca-qt5-2-dev,
libqca-qt5-2-plugins,
#sid buster bionic disco# libqscintilla2-qt5-dev,
# stretch xenial # libqt5scintilla2-dev,
#sid buster bionic disco eoan# libqscintilla2-qt5-dev,
# stretch xenial # libqt5scintilla2-dev,
libqt5opengl5-dev,
libqt5serialport5-dev,
libqt5sql5-sqlite,
Expand Down Expand Up @@ -61,11 +61,11 @@ Build-Depends:
python3-sip,
python3-termcolor,
python3-yaml,
#sid buster bionic disco# qt3d5-dev,
#sid buster bionic disco# qt3d-assimpsceneimport-plugin,
#sid buster bionic disco# qt3d-defaultgeometryloader-plugin,
#sid buster bionic disco# qt3d-gltfsceneio-plugin,
#sid buster bionic disco# qt3d-scene2d-plugin,
#sid buster bionic disco eoan# qt3d5-dev,
#sid buster bionic disco eoan# qt3d-assimpsceneimport-plugin,
#sid buster bionic disco eoan# qt3d-defaultgeometryloader-plugin,
#sid buster bionic disco eoan# qt3d-gltfsceneio-plugin,
#sid buster bionic disco eoan# qt3d-scene2d-plugin,
qt5keychain-dev,
qtbase5-dev,
#!xenial# qtbase5-private-dev,
Expand Down Expand Up @@ -123,7 +123,7 @@ Architecture: all
Depends:
libjs-jquery,
libjs-leaflet,
#sid buster bionic disco# qml-module-qtcharts,
#sid buster bionic disco eoan# qml-module-qtcharts,
${misc:Depends}
Description: QGIS - architecture-independent data
QGIS is a Geographic Information System (GIS) which manages, analyzes and
Expand All @@ -132,22 +132,22 @@ Description: QGIS - architecture-independent data
This package contains architecture-independent supporting data files for use
with QGIS.

#sid buster bionic disco#Package: libqgis-3d{QGIS_ABI}
#sid buster bionic disco#Architecture: any
#sid buster bionic disco#Section: libs
#sid buster bionic disco#Depends:
#sid buster bionic disco# qt3d-assimpsceneimport-plugin,
#sid buster bionic disco# qt3d-defaultgeometryloader-plugin,
#sid buster bionic disco# qt3d-gltfsceneio-plugin,
#sid buster bionic disco# qt3d-scene2d-plugin,
#sid buster bionic disco# ${shlibs:Depends},
#sid buster bionic disco# ${misc:Depends}
#sid buster bionic disco#Description: QGIS - shared 3d library
#sid buster bionic disco# QGIS is a Geographic Information System (GIS) which manages, analyzes and
#sid buster bionic disco# display databases of geographic information.
#sid buster bionic disco# .
#sid buster bionic disco# This package contains the shared 3d library.
#sid buster bionic disco#
#sid buster bionic disco eoan#Package: libqgis-3d{QGIS_ABI}
#sid buster bionic disco eoan#Architecture: any
#sid buster bionic disco eoan#Section: libs
#sid buster bionic disco eoan#Depends:
#sid buster bionic disco eoan# qt3d-assimpsceneimport-plugin,
#sid buster bionic disco eoan# qt3d-defaultgeometryloader-plugin,
#sid buster bionic disco eoan# qt3d-gltfsceneio-plugin,
#sid buster bionic disco eoan# qt3d-scene2d-plugin,
#sid buster bionic disco eoan# ${shlibs:Depends},
#sid buster bionic disco eoan# ${misc:Depends}
#sid buster bionic disco eoan#Description: QGIS - shared 3d library
#sid buster bionic disco eoan# QGIS is a Geographic Information System (GIS) which manages, analyzes and
#sid buster bionic disco eoan# display databases of geographic information.
#sid buster bionic disco eoan# .
#sid buster bionic disco eoan# This package contains the shared 3d library.
#sid buster bionic disco eoan#
Package: libqgis-analysis{QGIS_ABI}
Architecture: any
Section: libs
Expand Down Expand Up @@ -278,9 +278,9 @@ Depends:
libqgis-server{QGIS_ABI} (= ${binary:Version}),
libqgisgrass{GRASSVER}-{QGIS_ABI} (= ${binary:Version}),
libqgispython{QGIS_ABI} (= ${binary:Version}),
#sid buster bionic disco# libqgis-3d{QGIS_ABI} (= ${binary:Version}),
#sid buster bionic disco# libqscintilla2-qt5-dev,
# stretch xenial # libqt5scintilla2-dev,
#sid buster bionic disco eoan# libqgis-3d{QGIS_ABI} (= ${binary:Version}),
#sid buster bionic disco eoan# libqscintilla2-qt5-dev,
# stretch xenial # libqt5scintilla2-dev,
libqt5svg5-dev,
libqt5webkit5-dev,
libqwt-qt5-dev,
Expand Down Expand Up @@ -309,7 +309,7 @@ Architecture: any
Section: debug
Priority: extra
Depends:
#sid buster bionic disco# libqgis-3d{QGIS_ABI} (= ${binary:Version}),
#sid buster bionic disco eoan# libqgis-3d{QGIS_ABI} (= ${binary:Version}),
libqgis-analysis{QGIS_ABI} (= ${binary:Version}),
libqgis-app{QGIS_ABI} (= ${binary:Version}),
libqgis-core{QGIS_ABI} (= ${binary:Version}),
Expand Down
2 changes: 1 addition & 1 deletion debian/libqgis-dev.install.in
View file
@@ -1,5 +1,5 @@
usr/include/qgis/*
#sid buster bionic disco#usr/lib/libqgis_3d.so
#sid buster bionic disco eoan#usr/lib/libqgis_3d.so
usr/lib/libqgis_analysis.so
usr/lib/libqgis_app.so
usr/lib/libqgis_core.so
Expand Down
4 changes: 2 additions & 2 deletions debian/python3-qgis.install.in
View file
@@ -1,5 +1,5 @@
#sid buster bionic disco#usr/lib/python*/*-packages/qgis/3d/__init__.py
#sid buster bionic disco#usr/lib/python*/*-packages/qgis/_3d.so
#sid buster bionic disco eoan#usr/lib/python*/*-packages/qgis/3d/__init__.py
#sid buster bionic disco eoan#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
Expand Down
6 changes: 3 additions & 3 deletions debian/rules
View file
Expand Up @@ -40,7 +40,7 @@ endif

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

ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"stretch buster xenial bionic disco"))
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"stretch buster xenial bionic disco eoan"))
DISTRIBUTION := sid
endif

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

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

ifneq (,$(findstring $(DISTRIBUTION),"sid buster disco"))
ifneq (,$(findstring $(DISTRIBUTION),"sid buster disco eoan"))
# Qt3DExtras intentionally removed from debian (#895386) and in turn ubuntu
CMAKE_OPTS += \
-DCMAKE_PREFIX_PATH=$(realpath external/qt3dextra-headers/cmake) \
Expand Down

0 comments on commit 019196a

Please sign in to comment.