Skip to content

Commit b8a2bc4

Browse files
jef-njef-n
committedOct 14, 2016
debian packaging: add support for yakkety
·
ltr-2_18archive/master_2
1 parent dd85796 commit b8a2bc4

File tree

4 files changed

+23
-23
lines changed

4 files changed

+23
-23
lines changed
 

‎debian/compat.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
#stretch sid jessie trusty xenial#9
1+
#stretch sid jessie trusty xenial yakkety#9
22
#jessie#8
33
#precise#7

‎debian/control.in

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ Priority: optional
66
Build-Depends:
77
bison,
88
cmake (>= 2.8),
9-
#sid stretch jessie trusty xenial# debhelper (>= 9),
10-
#sid stretch jessie trusty xenial# dh-python,
9+
#sid stretch jessie trusty xenial yakkety# debhelper (>= 9),
10+
#sid stretch jessie trusty xenial yakkety# dh-python,
1111
#precise# debhelper (>= 7),
1212
flex,
1313
grass-dev,
1414
libexpat1-dev,
1515
libfcgi-dev,
16-
#sid stretch jessie trusty xenial# libgdal-dev (>= 1.10.1-0~),
16+
#sid stretch jessie trusty xenial yakkety# libgdal-dev (>= 1.10.1-0~),
1717
#precise# libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
1818
gdal-bin,
1919
python-gdal,
2020
libgeos-dev (>= 3.0.0),
2121
#jessie precise trusty# libgsl0-dev,
22-
#sid stretch xenial# libgsl-dev,
22+
#sid stretch xenial yakkety# libgsl-dev,
2323
libpq-dev,
2424
libproj-dev,
2525
libqt4-dev (>= 4.7.0),
@@ -28,8 +28,8 @@ Build-Depends:
2828
libqca2-plugin-ossl,
2929
libqtwebkit-dev,
3030
#stretch jessie# libqwt-dev,
31-
#precise trusty xenial sid# libqwt5-qt4-dev,
32-
#sid stretch jessie trusty xenial# libqjson-dev,
31+
#precise trusty xenial yakkety sid# libqwt5-qt4-dev,
32+
#sid stretch jessie trusty xenial yakkety# libqjson-dev,
3333
libspatialite-dev,
3434
libsqlite3-dev,
3535
libspatialindex-dev,
@@ -40,13 +40,13 @@ Build-Depends:
4040
python-qt4-dev,
4141
python-qt4-sql,
4242
python-yaml, python-mock,
43-
#stretch sid xenial# python-future,
43+
#stretch sid xenial yakkety# python-future,
4444
#precise# python,
4545
#precise# python-central (>= 0.5),
46-
#sid stretch jessie trusty xenial# python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
47-
#sid stretch jessie xenial# pyqt4.qsci-dev,
48-
#sid stretch jessie trusty xenial# python-pyspatialite,
49-
#sid jessie stretch trusty xenial# python-nose2,
46+
#sid stretch jessie trusty xenial yakkety# python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
47+
#sid stretch jessie xenial yakkety# pyqt4.qsci-dev,
48+
#sid stretch jessie trusty xenial yakkety# python-pyspatialite,
49+
#sid jessie stretch trusty xenial yakkety# python-nose2,
5050
python-sip (>= 4.5.0),
5151
python-sip-dev (>= 4.5.0),
5252
libosgearth-dev,
@@ -63,11 +63,11 @@ Build-Depends:
6363
qt4-dev-tools,
6464
libqt4-sql-sqlite, python-psycopg2, ca-certificates
6565
Build-Conflicts: libqgis-dev, qgis-dev
66-
#sid stretch xenial#Standards-Version: 3.9.7
66+
#sid stretch xenial yakkety#Standards-Version: 3.9.7
6767
#jessie#Standards-Version: 3.9.6
6868
#precise trusty#Standards-Version: 3.8.4
6969
#sid stretch jessie#X-Python-Version: >= 2.7, << 2.8
70-
#precise trusty xenial#XS-Python-Version: current
70+
#precise trusty xenial yakkety#XS-Python-Version: current
7171
Vcs-Browser: https://github.com/qgis/QGIS/
7272
Vcs-Git: https://github.com/qgis/QGIS.git
7373
Homepage: http://qgis.org/
@@ -240,11 +240,11 @@ Section: libdevel
240240
Depends:
241241
grass-dev,
242242
libexpat1-dev,
243-
#sid stretch jessie trusty xenial# libgdal-dev (>= 1.10.1-0~),
243+
#sid stretch jessie trusty xenial yakkety# libgdal-dev (>= 1.10.1-0~),
244244
#precise# libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
245245
libgeos-dev (>= 3.0.0),
246246
#jessie precise trusty# libgsl0-dev,
247-
#sid stretch xenial# libgsl-dev,
247+
#sid stretch xenial yakkety# libgsl-dev,
248248
libpq-dev,
249249
libproj-dev,
250250
libqgis-app{QGIS_ABI} (= ${binary:Version}),
@@ -382,8 +382,8 @@ Depends:
382382
python-tz,
383383
python-six,
384384
python-yaml,
385-
#stretch sid xenial# python-future,
386-
#sid stretch jessie trusty xenial# python-pyspatialite,
385+
#stretch sid xenial yakkety# python-future,
386+
#sid stretch jessie trusty xenial yakkety# python-pyspatialite,
387387
libqgispython{QGIS_ABI},
388388
${shlibs:Depends},
389389
${python:Depends},

‎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#usr/lib/qgis/plugins/libarcgismapserverprovider.so
21-
#sid stretch jessie trusty xenial#usr/lib/qgis/plugins/libarcgisfeatureserverprovider.so
20+
#sid stretch jessie trusty xenial yakkety#usr/lib/qgis/plugins/libarcgismapserverprovider.so
21+
#sid stretch jessie trusty xenial yakkety#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 precise trusty xenial"))
37+
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"jessie stretch precise trusty xenial yakkety"))
3838
DISTRIBUTION := sid
3939
endif
4040

@@ -107,7 +107,7 @@ else
107107
CMAKE_OPTS += -DWITH_INTERNAL_NOSE2=FALSE -DWITH_INTERNAL_SIX=FALSE
108108
endif
109109

110-
ifeq (,$(findstring $(DISTRIBUTION),"stretch sid xenial"))
110+
ifeq (,$(findstring $(DISTRIBUTION),"stretch sid xenial yakkety"))
111111
CMAKE_OPTS += -DWITH_INTERNAL_FUTURE=TRUE
112112
else
113113
CMAKE_OPTS += -DWITH_INTERNAL_FUTURE=FALSE
@@ -133,7 +133,7 @@ ifneq (,$(findstring $(DISTRIBUTION),"sid"))
133133
CMAKE_OPTS += -DGEOS_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libgeos_c.so
134134
endif
135135

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

0 commit comments

Comments
 (0)
Please sign in to comment.