Skip to content

Commit

Permalink
debian packaging: add support for yakkety
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Oct 14, 2016
1 parent 3efbc0b commit f002a4a
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion debian/compat.in
@@ -1,3 +1,3 @@
#stretch sid jessie trusty utopic vivid wily xenial#9
#stretch sid jessie trusty utopic vivid wily xenial yakkety#9
#wheezy jessie#8
#precise#7
24 changes: 12 additions & 12 deletions debian/control.in
Expand Up @@ -7,14 +7,14 @@ Build-Depends:
bison,
cmake (>= 2.8),
#wily# cmake (<< 3.3.2),
#sid stretch jessie wheezy saucy trusty utopic vivid wily xenial# debhelper (>= 9),
#sid stretch jessie trusty vivid wily xenial# dh-python,
#sid stretch jessie wheezy saucy trusty utopic vivid wily xenial yakkety# debhelper (>= 9),
#sid stretch jessie trusty vivid wily xenial yakkety# dh-python,
#precise# debhelper (>= 7),
flex,
grass-dev,
libexpat1-dev,
libfcgi-dev,
#sid stretch jessie trusty utopic vivid wily xenial# libgdal-dev (>= 1.10.1-0~),
#sid stretch jessie trusty utopic vivid wily xenial yakkety# libgdal-dev (>= 1.10.1-0~),
#precise# libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
#saucy# libgdal-dev (>= 1.9.0),
#wheezy# libgdal1-dev,
Expand All @@ -30,7 +30,7 @@ Build-Depends:
libqca2-plugin-ossl,
libqtwebkit-dev,
#stretch jessie wheezy# libqwt-dev,
#precise saucy trusty utopic vivid wily xenial sid# libqwt5-qt4-dev,
#precise saucy trusty utopic vivid wily xenial yakkety sid# libqwt5-qt4-dev,
libspatialite-dev,
libsqlite3-dev,
libspatialindex-dev,
Expand All @@ -45,10 +45,10 @@ Build-Depends:
#precise saucy# python-central (>= 0.5),
#saucy wheezy# python-dev,
#saucy# libpython2.7-dev,
#sid stretch jessie trusty utopic vivid wily xenial# python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
#sid stretch jessie wily xenial# pyqt4.qsci-dev,
#sid stretch jessie trusty utopic vivid wily xenial# python-pyspatialite,
#sid wheezy jessie stretch trusty vivid wily xenial# python-nose2,
#sid stretch jessie trusty utopic vivid wily xenial yakkety# python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
#sid stretch jessie wily xenial yakkety# pyqt4.qsci-dev,
#sid stretch jessie trusty utopic vivid wily xenial yakkety# python-pyspatialite,
#sid wheezy jessie stretch trusty vivid wily xenial yakkety# python-nose2,
python-sip (>= 4.5.0),
python-sip-dev (>= 4.5.0),
libosgearth-dev,
Expand All @@ -64,11 +64,11 @@ Build-Depends:
spawn-fcgi, lighttpd, poppler-utils, locales, qt4-doc-html,
libqt4-sql-sqlite, python-psycopg2, ca-certificates
Build-Conflicts: libqgis-dev, qgis-dev
#sid stretch jessie vivid wily xenial#Standards-Version: 3.9.6
#sid stretch jessie vivid wily xenial yakkety#Standards-Version: 3.9.6
#wheezy#Standards-Version: 3.9.3
#precise saucy trusty utopic#Standards-Version: 3.8.4
#sid stretch jessie#X-Python-Version: >= 2.7, << 2.8
#wheezy precise saucy trusty utopic vivid wily xenial#XS-Python-Version: current
#wheezy precise saucy trusty utopic vivid wily xenial yakkety#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 @@ -241,7 +241,7 @@ Section: libdevel
Depends:
grass-dev,
libexpat1-dev,
#sid stretch jessie trusty utopic vivid wily xenial# libgdal-dev (>= 1.10.1-0~),
#sid stretch jessie trusty utopic vivid wily xenial yakkety# libgdal-dev (>= 1.10.1-0~),
#precise# libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
#saucy# libgdal-dev (>= 1.9.0),
#wheezy# libgdal1-dev,
Expand Down Expand Up @@ -383,7 +383,7 @@ Depends:
python-tz,
python-six,
python-yaml,
#sid stretch jessie trusty utopic vivid wily xenial# python-pyspatialite,
#sid stretch jessie trusty utopic vivid wily xenial yakkety# python-pyspatialite,
libqgispython{QGIS_ABI},
${shlibs:Depends},
${python:Depends},
Expand Down
4 changes: 2 additions & 2 deletions debian/rules
Expand Up @@ -31,7 +31,7 @@ ifneq (,$(findstring -oracle,$(DISTRIBUTION)))
WITH_ORACLE=1
endif

ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"wheezy jessie stretch precise trusty utopic vivid wily xenial"))
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"wheezy jessie stretch precise trusty utopic vivid wily xenial yakkety"))
DISTRIBUTION := sid
endif

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

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

Expand Down

0 comments on commit f002a4a

Please sign in to comment.