disable 3D in debian packages for debian unstable/buster

(cherry picked from commit bb0bfea & d500580)

Author: jef-n

debian/control.in

@@ -38,7 +38,8 @@ Build-Depends:
  graphviz,
  xvfb, xauth,
  xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
-#sid buster artful bionic# libosgearth-dev, qt3d5-dev, qt3d-assimpsceneimport-plugin, qt3d-defaultgeometryloader-plugin, qt3d-gltfsceneio-plugin, qt3d-scene2d-plugin,
+#sid buster artful bionic# libosgearth-dev,
+#artful bionic# 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
@@ -145,19 +146,19 @@ Description: QGIS - shared native gui library
  .
  This package contains the shared native gui library.
 
-#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#
+#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#
 Package: libqgisgrass{GRASSVER}-{QGIS_ABI}
 Architecture: any
 Section: libs

debian/libqgis-dev.install.in

@@ -8,4 +8,4 @@ usr/lib/libqgis_server.so
 usr/lib/libqgisgrass{GRASSVER}.so
 usr/lib/libqgispython.so
 usr/share/qgis/FindQGIS.cmake
-#sid buster artful bionic#usr/lib/libqgis_3d.so
+#artful bionic#usr/lib/libqgis_3d.so

debian/rules

@@ -102,7 +102,7 @@ ifneq (,$(findstring $(DISTRIBUTION),"sid buster stretch"))
 	CMAKE_OPTS += -DPOSTGRES_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpq.so
 endif
 
-ifneq (,$(findstring $(DISTRIBUTION),"artful bionic buster sid"))
+ifneq (,$(findstring $(DISTRIBUTION),"artful bionic"))
 	CMAKE_OPTS += \
 		-DWITH_3D=TRUE \
 		-DGEOS_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libgeos_c.so