debian packaging: keep using libqt5scintilla2-dev also on stretch

jef-n · jef-n · commit c3fea5fc108f · 2019-03-27T08:47:07.000+01:00
diff --git a/debian/control.in b/debian/control.in
@@ -17,13 +17,13 @@ Build-Depends:
  libgdal-dev (>= 1.11),
  libgeos-dev (>= 3.0.0),
  libgsl-dev,
-#sid buster bionic cosmic# libosgearth-dev,
+#sid        buster         bionic cosmic# libosgearth-dev,
  libpq-dev,
  libproj-dev,
  libqca-qt5-2-dev,
  libqca-qt5-2-plugins,
-#!xenial# libqscintilla2-qt5-dev,
-#xenial# libqt5scintilla2-dev,
+#sid         buster        bionic cosmic# libqscintilla2-qt5-dev,
+#    stretch        xenial              # libqt5scintilla2-dev,
  libqt5opengl5-dev,
  libqt5serialport5-dev,
  libqt5sql5-sqlite,
@@ -61,11 +61,11 @@ Build-Depends:
  python3-sip,
  python3-termcolor,
  python3-yaml,
-#sid buster bionic cosmic# qt3d5-dev,
-#sid buster bionic cosmic# qt3d-assimpsceneimport-plugin,
-#sid buster bionic cosmic# qt3d-defaultgeometryloader-plugin,
-#sid buster bionic cosmic# qt3d-gltfsceneio-plugin,
-#sid buster bionic cosmic# qt3d-scene2d-plugin,
+#sid         buster        bionic cosmic# qt3d5-dev,
+#sid         buster        bionic cosmic# qt3d-assimpsceneimport-plugin,
+#sid         buster        bionic cosmic# qt3d-defaultgeometryloader-plugin,
+#sid         buster        bionic cosmic# qt3d-gltfsceneio-plugin,
+#sid         buster        bionic cosmic# qt3d-scene2d-plugin,
  qt5keychain-dev,
  qtbase5-dev,
 #!xenial# qtbase5-private-dev,
@@ -90,7 +90,7 @@ Build-Depends:
 Build-Conflicts:
  libqgis-dev,
  qgis-dev
-#sid buster stretch xenial bionic cosmic#Standards-Version: 3.9.7
+Standards-Version: 3.9.7
 Vcs-Browser: https://github.com/qgis/QGIS/
 Vcs-Git: https://github.com/qgis/QGIS.git
 Homepage: https://qgis.org/
@@ -122,7 +122,7 @@ Architecture: all
 Depends:
  libjs-jquery,
  libjs-leaflet,
-#sid buster bionic cosmic# qml-module-qtcharts,
+#sid         buster        bionic cosmic# qml-module-qtcharts,
  ${misc:Depends}
 Description: QGIS - architecture-independent data
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
@@ -131,22 +131,22 @@ Description: QGIS - architecture-independent data
  This package contains architecture-independent supporting data files for use
  with QGIS.
 
-#sid buster bionic cosmic#Package: libqgis-3d{QGIS_ABI}
-#sid buster bionic cosmic#Architecture: any
-#sid buster bionic cosmic#Section: libs
-#sid buster bionic cosmic#Depends:
-#sid buster bionic cosmic# qt3d-assimpsceneimport-plugin,
-#sid buster bionic cosmic# qt3d-defaultgeometryloader-plugin,
-#sid buster bionic cosmic# qt3d-gltfsceneio-plugin,
-#sid buster bionic cosmic# qt3d-scene2d-plugin,
-#sid buster bionic cosmic# ${shlibs:Depends},
-#sid buster bionic cosmic# ${misc:Depends}
-#sid buster bionic cosmic#Description: QGIS - shared 3d library
-#sid buster bionic cosmic# QGIS is a Geographic Information System (GIS) which manages, analyzes and
-#sid buster bionic cosmic# display databases of geographic information.
-#sid buster bionic cosmic# .
-#sid buster bionic cosmic# This package contains the shared 3d library.
-#sid buster bionic cosmic#
+#sid        buster         bionic cosmic#Package: libqgis-3d{QGIS_ABI}
+#sid        buster         bionic cosmic#Architecture: any
+#sid        buster         bionic cosmic#Section: libs
+#sid        buster         bionic cosmic#Depends:
+#sid        buster         bionic cosmic# qt3d-assimpsceneimport-plugin,
+#sid        buster         bionic cosmic# qt3d-defaultgeometryloader-plugin,
+#sid        buster         bionic cosmic# qt3d-gltfsceneio-plugin,
+#sid        buster         bionic cosmic# qt3d-scene2d-plugin,
+#sid        buster         bionic cosmic# ${shlibs:Depends},
+#sid        buster         bionic cosmic# ${misc:Depends}
+#sid        buster         bionic cosmic#Description: QGIS - shared 3d library
+#sid        buster         bionic cosmic# QGIS is a Geographic Information System (GIS) which manages, analyzes and
+#sid        buster         bionic cosmic# display databases of geographic information.
+#sid        buster         bionic cosmic# .
+#sid        buster         bionic cosmic# This package contains the shared 3d library.
+#sid        buster         bionic cosmic#
 Package: libqgis-analysis{QGIS_ABI}
 Architecture: any
 Section: libs
@@ -269,7 +269,6 @@ Depends:
  libpq-dev,
  libproj-dev,
  libqca-qt5-2-dev,
-#sid buster bionic cosmic# libqgis-3d{QGIS_ABI} (= ${binary:Version}),
  libqgis-analysis{QGIS_ABI} (= ${binary:Version}),
  libqgis-app{QGIS_ABI} (= ${binary:Version}),
  libqgis-core{QGIS_ABI} (= ${binary:Version}),
@@ -278,8 +277,9 @@ Depends:
  libqgis-server{QGIS_ABI} (= ${binary:Version}),
  libqgisgrass{GRASSVER}-{QGIS_ABI} (= ${binary:Version}),
  libqgispython{QGIS_ABI} (= ${binary:Version}),
-#!xenial# libqscintilla2-qt5-dev,
-#xenial# libqt5scintilla2-dev,
+#sid         buster        bionic cosmic# libqgis-3d{QGIS_ABI} (= ${binary:Version}),
+#sid         buster        bionic cosmic# libqscintilla2-qt5-dev,
+#    stretch        xenial              # libqt5scintilla2-dev,
  libqt5svg5-dev,
  libqt5webkit5-dev,
  libqwt-qt5-dev,
@@ -308,7 +308,7 @@ Architecture: any
 Section: debug
 Priority: extra
 Depends:
-#sid buster bionic cosmic# libqgis-3d{QGIS_ABI} (= ${binary:Version}),
+#sid         buster        bionic cosmic# libqgis-3d{QGIS_ABI} (= ${binary:Version}),
  libqgis-analysis{QGIS_ABI} (= ${binary:Version}),
  libqgis-app{QGIS_ABI} (= ${binary:Version}),
  libqgis-core{QGIS_ABI} (= ${binary:Version}),
