Skip to content

Commit 94df29e

Browse files
committedSep 13, 2018
debian packaging: include Qt53DExtra headers removed on debian/ubuntu
(cherry picked from commit 1f91858)
1 parent 4bf5d4d commit 94df29e

File tree

90 files changed

+4035
-19
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+4035
-19
lines changed
 

‎debian/control.in

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ Build-Depends:
3939
graphviz,
4040
xvfb, xauth,
4141
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
42-
#sid buster bionic cosmic# libosgearth-dev,
43-
#bionic# qt3d5-dev, qt3d-assimpsceneimport-plugin, qt3d-defaultgeometryloader-plugin, qt3d-gltfsceneio-plugin, qt3d-scene2d-plugin,
42+
#sid buster bionic cosmic# libosgearth-dev, qt3d5-dev, qt3d-assimpsceneimport-plugin, qt3d-defaultgeometryloader-plugin, qt3d-gltfsceneio-plugin, qt3d-scene2d-plugin,
4443
#oracle# oracle-instantclient12.1-devel, oracle-instantclient12.1-basiclite,
4544
locales, ca-certificates, ninja-build
4645
Build-Conflicts: libqgis-dev, qgis-dev
@@ -147,19 +146,19 @@ Description: QGIS - shared native gui library
147146
.
148147
This package contains the shared native gui library.
149148

150-
#bionic#Package: libqgis-3d{QGIS_ABI}
151-
#bionic#Architecture: any
152-
#bionic#Section: libs
153-
#bionic#Depends:
154-
#bionic# qt3d-assimpsceneimport-plugin, qt3d-defaultgeometryloader-plugin, qt3d-gltfsceneio-plugin, qt3d-scene2d-plugin,
155-
#bionic# ${shlibs:Depends},
156-
#bionic# ${misc:Depends}
157-
#bionic#Description: QGIS - shared 3d library
158-
#bionic# QGIS is a Geographic Information System (GIS) which manages, analyzes and
159-
#bionic# display databases of geographic information.
160-
#bionic# .
161-
#bionic# This package contains the shared 3d library.
162-
#bionic#
149+
#sid buster bionic cosmic#Package: libqgis-3d{QGIS_ABI}
150+
#sid buster bionic cosmic#Architecture: any
151+
#sid buster bionic cosmic#Section: libs
152+
#sid buster bionic cosmic#Depends:
153+
#sid buster bionic cosmic# qt3d-assimpsceneimport-plugin, qt3d-defaultgeometryloader-plugin, qt3d-gltfsceneio-plugin, qt3d-scene2d-plugin,
154+
#sid buster bionic cosmic# ${shlibs:Depends},
155+
#sid buster bionic cosmic# ${misc:Depends}
156+
#sid buster bionic cosmic#Description: QGIS - shared 3d library
157+
#sid buster bionic cosmic# QGIS is a Geographic Information System (GIS) which manages, analyzes and
158+
#sid buster bionic cosmic# display databases of geographic information.
159+
#sid buster bionic cosmic# .
160+
#sid buster bionic cosmic# This package contains the shared 3d library.
161+
#sid buster bionic cosmic#
163162
Package: libqgisgrass{GRASSVER}-{QGIS_ABI}
164163
Architecture: any
165164
Section: libs

‎debian/libqgis-dev.install.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ usr/lib/libqgis_server.so
88
usr/lib/libqgisgrass{GRASSVER}.so
99
usr/lib/libqgispython.so
1010
usr/share/qgis/FindQGIS.cmake
11-
#bionic#usr/lib/libqgis_3d.so
11+
#sid buster bionic cosmic#usr/lib/libqgis_3d.so

0 commit comments

Comments
 (0)
Please sign in to comment.