Skip to content

Commit 0d2e008

Browse files
jef-njef-n
committedJan 13, 2018
debian packaging: add bionic
·
final-2_18_28final-2_18_16
1 parent 697509e commit 0d2e008

File tree

5 files changed

+22
-22
lines changed

5 files changed

+22
-22
lines changed
 

‎debian/compat.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#stretch sid jessie trusty xenial yakkety zesty artful#9
1+
#stretch sid jessie trusty xenial yakkety zesty artful bionic#9
22
#jessie#8

‎debian/control.in

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ Build-Depends:
2222
libqca2-dev,
2323
libqca2-plugin-ossl,
2424
libqtwebkit-dev,
25-
# jessie trusty # libgsl0-dev, libqca2-plugin-ossl,
26-
#sid stretch xenial yakkety zesty artful# libgsl-dev, libqca2-plugins,
27-
# jessie stretch # libqwt-dev,
28-
#sid trusty xenial yakkety zesty artful# libqwt5-qt4-dev,
25+
# jessie trusty # libgsl0-dev, libqca2-plugin-ossl,
26+
#sid stretch xenial yakkety zesty artful bionic# libgsl-dev, libqca2-plugins,
27+
# jessie stretch # libqwt-dev,
28+
#sid trusty xenial yakkety zesty artful bionic# libqwt5-qt4-dev,
2929
libqjson-dev,
3030
libspatialite-dev,
3131
libsqlite3-dev,
@@ -38,13 +38,13 @@ Build-Depends:
3838
python-qt4-sql,
3939
python-yaml, python-mock,
4040
python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~), python-pyspatialite,
41-
#sid stretch xenial yakkety zesty artful# python-future,
42-
#sid jessie stretch xenial yakkety zesty artful# pyqt4.qsci-dev, python-nose2,
41+
#sid stretch xenial yakkety zesty artful bionic# python-future,
42+
#sid jessie stretch xenial yakkety zesty artful bionic# pyqt4.qsci-dev, python-nose2,
4343
python-sip (>= 4.5.0),
4444
python-sip-dev (>= 4.5.0),
4545
libosgearth-dev,
46-
# jessie stretch trusty xenial yakkety zesty artful# libqscintilla2-dev,
47-
#sid # libqscintilla2-qt4-dev,
46+
# jessie stretch trusty xenial yakkety zesty artful bionic# libqscintilla2-dev,
47+
#sid # libqscintilla2-qt4-dev,
4848
git,
4949
doxygen,
5050
graphviz,
@@ -56,11 +56,11 @@ Build-Depends:
5656
qt4-dev-tools,
5757
libqt4-sql-sqlite, python-psycopg2, ca-certificates
5858
Build-Conflicts: libqgis-dev, qgis-dev
59-
#sid stretch xenial yakkety zesty artful#Standards-Version: 3.9.7
59+
#sid stretch xenial yakkety zesty artful bionic#Standards-Version: 3.9.7
6060
#jessie#Standards-Version: 3.9.6
6161
#trusty#Standards-Version: 3.8.4
6262
#sid stretch jessie#X-Python-Version: >= 2.7, << 2.8
63-
#trusty xenial yakkety zesty artful#XS-Python-Version: current
63+
#trusty xenial yakkety zesty artful bionic#XS-Python-Version: current
6464
Vcs-Browser: https://github.com/qgis/QGIS/
6565
Vcs-Git: https://github.com/qgis/QGIS.git
6666
Homepage: http://qgis.org/
@@ -235,8 +235,8 @@ Depends:
235235
libexpat1-dev,
236236
libgdal-dev (>= 1.10.1-0~),
237237
libgeos-dev (>= 3.0.0),
238-
# jessie trusty # libgsl0-dev,
239-
#sid stretch xenial yakkety zesty artful# libgsl-dev,
238+
# jessie trusty # libgsl0-dev,
239+
#sid stretch xenial yakkety zesty artful bionic# libgsl-dev,
240240
libpq-dev,
241241
libproj-dev,
242242
libqgis-app{QGIS_ABI} (= ${binary:Version}),
@@ -373,8 +373,8 @@ Depends:
373373
python-pyproj,
374374
python-six,
375375
python-pyspatialite,
376-
#sid stretch xenial yakkety zesty artful# python-future,
377-
#sid stretch jessie xenial yakkety zesty artful# python-markupsafe, python-dateutil, python-yaml, python-owslib,
376+
#sid stretch xenial yakkety zesty artful bionic# python-future,
377+
#sid stretch jessie xenial yakkety zesty artful bionic# python-markupsafe, python-dateutil, python-yaml, python-owslib,
378378
libqgispython{QGIS_ABI},
379379
${shlibs:Depends},
380380
${python:Depends},

‎debian/python-qgis.install.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ usr/lib/python*/*-packages/qgis/networkanalysis/*
77
usr/lib/python*/*-packages/qgis/PyQt/*
88
usr/lib/python*/*-packages/qgis/server/*
99
usr/lib/python*/*-packages/qgis/testing/*
10-
#sid stretch yakkety zesty artful#usr/lib/python*/*-packages/PyQt4/*.so
11-
#sid stretch yakkety zesty artful#usr/lib/python*/*-packages/PyQt4/uic/widget-plugins/qtwebkit.py
10+
#sid stretch yakkety zesty artful bionic#usr/lib/python*/*-packages/PyQt4/*.so
11+
#sid stretch yakkety zesty artful bionic#usr/lib/python*/*-packages/PyQt4/uic/widget-plugins/qtwebkit.py

‎debian/qgis-providers.install.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ usr/lib/qgis/plugins/libvirtuallayerprovider.so
1717
usr/lib/qgis/plugins/libwcsprovider.so
1818
usr/lib/qgis/plugins/libwfsprovider.so
1919
usr/lib/qgis/plugins/libwmsprovider.so
20-
#sid stretch jessie trusty xenial yakkety zesty artful#usr/lib/qgis/plugins/libarcgismapserverprovider.so
21-
#sid stretch jessie trusty xenial yakkety zesty artful#usr/lib/qgis/plugins/libarcgisfeatureserverprovider.so
20+
#sid stretch jessie trusty xenial yakkety zesty artful bionic#usr/lib/qgis/plugins/libarcgismapserverprovider.so
21+
#sid stretch jessie trusty xenial yakkety zesty artful bionic#usr/lib/qgis/plugins/libarcgisfeatureserverprovider.so
2222
{QT_PLUGIN_DIR}/sqldrivers/libqsqlspatialite.so

‎debian/rules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ ifneq (,$(findstring -oracle,$(DISTRIBUTION)))
3434
WITH_ORACLE=1
3535
endif
3636

37-
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"jessie stretch trusty xenial yakkety zesty artful"))
37+
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"jessie stretch trusty xenial yakkety zesty artful bionic"))
3838
DISTRIBUTION := sid
3939
endif
4040

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

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

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

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

0 commit comments

Comments
 (0)
Please sign in to comment.