Skip to content

Commit

Permalink
debian packaging: add bionic
Browse files Browse the repository at this point in the history
  • Loading branch information
@jef-n
jef-n committed Jan 13, 2018
1 parent 697509e commit 0d2e008
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion debian/compat.in
View file
@@ -1,2 +1,2 @@
#stretch sid jessie trusty xenial yakkety zesty artful#9
#stretch sid jessie trusty xenial yakkety zesty artful bionic#9
#jessie#8
28 changes: 14 additions & 14 deletions debian/control.in
View file
Expand Up @@ -22,10 +22,10 @@ Build-Depends:
libqca2-dev,
libqca2-plugin-ossl,
libqtwebkit-dev,
# jessie trusty # libgsl0-dev, libqca2-plugin-ossl,
#sid stretch xenial yakkety zesty artful# libgsl-dev, libqca2-plugins,
# jessie stretch # libqwt-dev,
#sid trusty xenial yakkety zesty artful# libqwt5-qt4-dev,
# jessie trusty # libgsl0-dev, libqca2-plugin-ossl,
#sid stretch xenial yakkety zesty artful bionic# libgsl-dev, libqca2-plugins,
# jessie stretch # libqwt-dev,
#sid trusty xenial yakkety zesty artful bionic# libqwt5-qt4-dev,
libqjson-dev,
libspatialite-dev,
libsqlite3-dev,
Expand All @@ -38,13 +38,13 @@ Build-Depends:
python-qt4-sql,
python-yaml, python-mock,
python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~), python-pyspatialite,
#sid stretch xenial yakkety zesty artful# python-future,
#sid jessie stretch xenial yakkety zesty artful# pyqt4.qsci-dev, python-nose2,
#sid stretch xenial yakkety zesty artful bionic# python-future,
#sid jessie stretch xenial yakkety zesty artful bionic# pyqt4.qsci-dev, python-nose2,
python-sip (>= 4.5.0),
python-sip-dev (>= 4.5.0),
libosgearth-dev,
# jessie stretch trusty xenial yakkety zesty artful# libqscintilla2-dev,
#sid # libqscintilla2-qt4-dev,
# jessie stretch trusty xenial yakkety zesty artful bionic# libqscintilla2-dev,
#sid # libqscintilla2-qt4-dev,
git,
doxygen,
graphviz,
Expand All @@ -56,11 +56,11 @@ Build-Depends:
qt4-dev-tools,
libqt4-sql-sqlite, python-psycopg2, ca-certificates
Build-Conflicts: libqgis-dev, qgis-dev
#sid stretch xenial yakkety zesty artful#Standards-Version: 3.9.7
#sid stretch xenial yakkety zesty artful bionic#Standards-Version: 3.9.7
#jessie#Standards-Version: 3.9.6
#trusty#Standards-Version: 3.8.4
#sid stretch jessie#X-Python-Version: >= 2.7, << 2.8
#trusty xenial yakkety zesty artful#XS-Python-Version: current
#trusty 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 @@ -235,8 +235,8 @@ Depends:
libexpat1-dev,
libgdal-dev (>= 1.10.1-0~),
libgeos-dev (>= 3.0.0),
# jessie trusty # libgsl0-dev,
#sid stretch xenial yakkety zesty artful# libgsl-dev,
# jessie trusty # libgsl0-dev,
#sid stretch xenial yakkety zesty artful bionic# libgsl-dev,
libpq-dev,
libproj-dev,
libqgis-app{QGIS_ABI} (= ${binary:Version}),
Expand Down Expand Up @@ -373,8 +373,8 @@ Depends:
python-pyproj,
python-six,
python-pyspatialite,
#sid stretch xenial yakkety zesty artful# python-future,
#sid stretch jessie xenial yakkety zesty artful# python-markupsafe, python-dateutil, python-yaml, python-owslib,
#sid stretch xenial yakkety zesty artful bionic# python-future,
#sid stretch jessie xenial yakkety zesty artful bionic# python-markupsafe, python-dateutil, python-yaml, python-owslib,
libqgispython{QGIS_ABI},
${shlibs:Depends},
${python:Depends},
Expand Down
4 changes: 2 additions & 2 deletions debian/python-qgis.install.in
View file
Expand Up @@ -7,5 +7,5 @@ usr/lib/python*/*-packages/qgis/networkanalysis/*
usr/lib/python*/*-packages/qgis/PyQt/*
usr/lib/python*/*-packages/qgis/server/*
usr/lib/python*/*-packages/qgis/testing/*
#sid stretch yakkety zesty artful#usr/lib/python*/*-packages/PyQt4/*.so
#sid stretch yakkety zesty artful#usr/lib/python*/*-packages/PyQt4/uic/widget-plugins/qtwebkit.py
#sid stretch yakkety zesty artful bionic#usr/lib/python*/*-packages/PyQt4/*.so
#sid stretch yakkety zesty artful bionic#usr/lib/python*/*-packages/PyQt4/uic/widget-plugins/qtwebkit.py
4 changes: 2 additions & 2 deletions debian/qgis-providers.install.in
View file
Expand Up @@ -17,6 +17,6 @@ usr/lib/qgis/plugins/libvirtuallayerprovider.so
usr/lib/qgis/plugins/libwcsprovider.so
usr/lib/qgis/plugins/libwfsprovider.so
usr/lib/qgis/plugins/libwmsprovider.so
#sid stretch jessie trusty xenial yakkety zesty artful#usr/lib/qgis/plugins/libarcgismapserverprovider.so
#sid stretch jessie trusty xenial yakkety zesty artful#usr/lib/qgis/plugins/libarcgisfeatureserverprovider.so
#sid stretch jessie trusty xenial yakkety zesty artful bionic#usr/lib/qgis/plugins/libarcgismapserverprovider.so
#sid stretch jessie trusty xenial yakkety zesty artful bionic#usr/lib/qgis/plugins/libarcgisfeatureserverprovider.so
{QT_PLUGIN_DIR}/sqldrivers/libqsqlspatialite.so
6 changes: 3 additions & 3 deletions debian/rules
View file
Expand Up @@ -34,7 +34,7 @@ ifneq (,$(findstring -oracle,$(DISTRIBUTION)))
WITH_ORACLE=1
endif

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

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

ifneq (,$(findstring $(DISTRIBUTION),"sid stretch yakkety zesty artful"))
ifneq (,$(findstring $(DISTRIBUTION),"sid stretch yakkety zesty artful bionic"))
CMAKE_OPTS += -DWITH_INTERNAL_WEBKIT_BINDINGS=TRUE
endif

ifneq (,$(findstring $(DISTRIBUTION),"sid"))
CMAKE_OPTS += -DGEOS_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libgeos_c.so
endif

ifneq (,$(findstring $(DISTRIBUTION),"jessie stretch trusty xenial yakkety zesty artful sid"))
ifneq (,$(findstring $(DISTRIBUTION),"jessie stretch trusty xenial yakkety zesty artful bionic sid"))
CMAKE_OPTS += -DPYTHON_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpython2.7.so
endif

Expand Down

0 comments on commit 0d2e008

Please sign in to comment.