Skip to content

Commit f002a4a

Browse files
committed
debian packaging: add support for yakkety
1 parent 3efbc0b commit f002a4a

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
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 utopic vivid wily xenial#9
1+
#stretch sid jessie trusty utopic vivid wily xenial yakkety#9
22
#wheezy jessie#8
33
#precise#7

debian/control.in

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ Build-Depends:
77
bison,
88
cmake (>= 2.8),
99
#wily# cmake (<< 3.3.2),
10-
#sid stretch jessie wheezy saucy trusty utopic vivid wily xenial# debhelper (>= 9),
11-
#sid stretch jessie trusty vivid wily xenial# dh-python,
10+
#sid stretch jessie wheezy saucy trusty utopic vivid wily xenial yakkety# debhelper (>= 9),
11+
#sid stretch jessie trusty vivid wily xenial yakkety# dh-python,
1212
#precise# debhelper (>= 7),
1313
flex,
1414
grass-dev,
1515
libexpat1-dev,
1616
libfcgi-dev,
17-
#sid stretch jessie trusty utopic vivid wily xenial# libgdal-dev (>= 1.10.1-0~),
17+
#sid stretch jessie trusty utopic vivid wily xenial yakkety# libgdal-dev (>= 1.10.1-0~),
1818
#precise# libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
1919
#saucy# libgdal-dev (>= 1.9.0),
2020
#wheezy# libgdal1-dev,
@@ -30,7 +30,7 @@ Build-Depends:
3030
libqca2-plugin-ossl,
3131
libqtwebkit-dev,
3232
#stretch jessie wheezy# libqwt-dev,
33-
#precise saucy trusty utopic vivid wily xenial sid# libqwt5-qt4-dev,
33+
#precise saucy trusty utopic vivid wily xenial yakkety sid# libqwt5-qt4-dev,
3434
libspatialite-dev,
3535
libsqlite3-dev,
3636
libspatialindex-dev,
@@ -45,10 +45,10 @@ Build-Depends:
4545
#precise saucy# python-central (>= 0.5),
4646
#saucy wheezy# python-dev,
4747
#saucy# libpython2.7-dev,
48-
#sid stretch jessie trusty utopic vivid wily xenial# python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
49-
#sid stretch jessie wily xenial# pyqt4.qsci-dev,
50-
#sid stretch jessie trusty utopic vivid wily xenial# python-pyspatialite,
51-
#sid wheezy jessie stretch trusty vivid wily xenial# python-nose2,
48+
#sid stretch jessie trusty utopic vivid wily xenial yakkety# python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
49+
#sid stretch jessie wily xenial yakkety# pyqt4.qsci-dev,
50+
#sid stretch jessie trusty utopic vivid wily xenial yakkety# python-pyspatialite,
51+
#sid wheezy jessie stretch trusty vivid wily xenial yakkety# python-nose2,
5252
python-sip (>= 4.5.0),
5353
python-sip-dev (>= 4.5.0),
5454
libosgearth-dev,
@@ -64,11 +64,11 @@ Build-Depends:
6464
spawn-fcgi, lighttpd, poppler-utils, locales, qt4-doc-html,
6565
libqt4-sql-sqlite, python-psycopg2, ca-certificates
6666
Build-Conflicts: libqgis-dev, qgis-dev
67-
#sid stretch jessie vivid wily xenial#Standards-Version: 3.9.6
67+
#sid stretch jessie vivid wily xenial yakkety#Standards-Version: 3.9.6
6868
#wheezy#Standards-Version: 3.9.3
6969
#precise saucy trusty utopic#Standards-Version: 3.8.4
7070
#sid stretch jessie#X-Python-Version: >= 2.7, << 2.8
71-
#wheezy precise saucy trusty utopic vivid wily xenial#XS-Python-Version: current
71+
#wheezy precise saucy trusty utopic vivid wily xenial yakkety#XS-Python-Version: current
7272
Vcs-Browser: https://github.com/qgis/QGIS/
7373
Vcs-Git: https://github.com/qgis/QGIS.git
7474
Homepage: http://qgis.org/
@@ -241,7 +241,7 @@ Section: libdevel
241241
Depends:
242242
grass-dev,
243243
libexpat1-dev,
244-
#sid stretch jessie trusty utopic vivid wily xenial# libgdal-dev (>= 1.10.1-0~),
244+
#sid stretch jessie trusty utopic vivid wily xenial yakkety# libgdal-dev (>= 1.10.1-0~),
245245
#precise# libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
246246
#saucy# libgdal-dev (>= 1.9.0),
247247
#wheezy# libgdal1-dev,
@@ -383,7 +383,7 @@ Depends:
383383
python-tz,
384384
python-six,
385385
python-yaml,
386-
#sid stretch jessie trusty utopic vivid wily xenial# python-pyspatialite,
386+
#sid stretch jessie trusty utopic vivid wily xenial yakkety# python-pyspatialite,
387387
libqgispython{QGIS_ABI},
388388
${shlibs:Depends},
389389
${python:Depends},

debian/rules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ifneq (,$(findstring -oracle,$(DISTRIBUTION)))
3131
WITH_ORACLE=1
3232
endif
3333

34-
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"wheezy jessie stretch precise trusty utopic vivid wily xenial"))
34+
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"wheezy jessie stretch precise trusty utopic vivid wily xenial yakkety"))
3535
DISTRIBUTION := sid
3636
endif
3737

@@ -118,7 +118,7 @@ ifneq (,$(findstring $(DISTRIBUTION),"sid"))
118118
CMAKE_OPTS += -DGEOS_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libgeos_c.so
119119
endif
120120

121-
ifneq (,$(findstring $(DISTRIBUTION),"jessie stretch trusty utopic vivid wily xenial sid"))
121+
ifneq (,$(findstring $(DISTRIBUTION),"jessie stretch trusty utopic vivid wily xenial yakkety sid"))
122122
CMAKE_OPTS += -DPYTHON_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpython2.7.so
123123
endif
124124

0 commit comments

Comments
 (0)