Skip to content

Commit

Permalink
* remove ext-libs that are already available on target platforms
Browse files Browse the repository at this point in the history
* drop ubuntu precise support (not built anymore anyway)
  • Loading branch information
jef-n committed Mar 10, 2017
1 parent bd2b452 commit a3ec30a
Show file tree
Hide file tree
Showing 236 changed files with 54 additions and 90,338 deletions.
1 change: 0 additions & 1 deletion debian/compat.in
@@ -1,3 +1,2 @@
#stretch sid jessie trusty xenial yakkety#9
#jessie#8
#precise#7
29 changes: 9 additions & 20 deletions debian/control.in
Expand Up @@ -8,17 +8,15 @@ Build-Depends:
cmake (>= 2.8),
#sid stretch jessie trusty xenial yakkety# debhelper (>= 9),
#sid stretch jessie trusty xenial yakkety# dh-python,
#precise# debhelper (>= 7),
flex,
grass-dev,
libexpat1-dev,
libfcgi-dev,
#sid stretch jessie trusty xenial yakkety# libgdal-dev (>= 1.10.1-0~),
#precise# libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
gdal-bin,
python-gdal,
libgeos-dev (>= 3.0.0),
#jessie precise trusty# libgsl0-dev,
#jessie trusty# libgsl0-dev,
#sid stretch xenial yakkety# libgsl-dev,
libpq-dev,
libproj-dev,
Expand All @@ -28,7 +26,7 @@ Build-Depends:
libqca2-plugin-ossl,
libqtwebkit-dev,
#stretch jessie# libqwt-dev,
#precise trusty xenial yakkety sid# libqwt5-qt4-dev,
#trusty xenial yakkety sid# libqwt5-qt4-dev,
#sid stretch jessie trusty xenial yakkety# libqjson-dev,
libspatialite-dev,
libsqlite3-dev,
Expand All @@ -41,12 +39,10 @@ Build-Depends:
python-qt4-sql,
python-yaml, python-mock,
#stretch sid xenial yakkety# python-future,
#precise# python,
#precise# python-central (>= 0.5),
#sid stretch jessie trusty xenial yakkety# python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
#sid stretch jessie xenial yakkety# pyqt4.qsci-dev,
#sid stretch jessie trusty xenial yakkety# python-pyspatialite,
#sid jessie stretch trusty xenial yakkety# python-nose2,
#sid jessie stretch xenial yakkety# python-nose2,
python-sip (>= 4.5.0),
python-sip-dev (>= 4.5.0),
libosgearth-dev,
Expand All @@ -65,9 +61,9 @@ Build-Depends:
Build-Conflicts: libqgis-dev, qgis-dev
#sid stretch xenial yakkety#Standards-Version: 3.9.7
#jessie#Standards-Version: 3.9.6
#precise trusty#Standards-Version: 3.8.4
#trusty#Standards-Version: 3.8.4
#sid stretch jessie#X-Python-Version: >= 2.7, << 2.8
#precise trusty xenial yakkety#XS-Python-Version: current
#trusty 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,9 +237,8 @@ Depends:
grass-dev,
libexpat1-dev,
#sid stretch jessie trusty xenial yakkety# libgdal-dev (>= 1.10.1-0~),
#precise# libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
libgeos-dev (>= 3.0.0),
#jessie precise trusty# libgsl0-dev,
#jessie trusty# libgsl0-dev,
#sid stretch xenial yakkety# libgsl-dev,
libpq-dev,
libproj-dev,
Expand Down Expand Up @@ -313,8 +308,7 @@ Depends:
qgis-provider-grass (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends},
#!precise# grass-core
#precise# grass
grass-core
Replaces: qgis-provider-grass (<< 1:2.11.0+git20151002)
Conflicts: qgis-provider-grass (<< 1:2.11.0+git20151002)
Description: GRASS plugin for QGIS
Expand Down Expand Up @@ -375,14 +369,10 @@ Depends:
python-qscintilla2,
python-httplib2,
python-jinja2,
python-markupsafe,
#!trusty# python-markupsafe, python-dateutil, python-yaml,
#sid stretch xenial yakkety# python-owslib, python-tz, python-pyproj, python-future, python-six,
python-pygments,
python-dateutil,
python-requests,
python-tz,
python-six,
python-yaml,
#stretch sid xenial yakkety# python-future,
#sid stretch jessie trusty xenial yakkety# python-pyspatialite,
libqgispython{QGIS_ABI},
${shlibs:Depends},
Expand All @@ -391,7 +381,6 @@ Depends:
${sip:Depends}
Provides: ${python:Provides}
Recommends: liblwgeom-dev
#precise#XB-Python-Version: ${python:Versions}
Description: Python bindings to QGIS
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
Expand Down
13 changes: 0 additions & 13 deletions debian/copyright
Expand Up @@ -137,10 +137,6 @@ Files: python/ext-libs/httplib2/socks.py
Copyright: 2006, Dan-Haim
License: BSD-2-Clause

Files: python/ext-libs/jinja2/*
Copyright: 2006-2010, the Jinja Team
License: BSD-3-Clause

Files: python/ext-libs/markupsafe/*
Copyright: 2010, 2013, Armin Ronacher
License: BSD-3-Clause
Expand Down Expand Up @@ -173,15 +169,6 @@ Copyright: 2006, Ancient World Mapping Center
2005, Nuxeo SARL <http://nuxeo.com>
License: BSD-3-Clause

Files: python/ext-libs/pygments/*
Copyright: 2006-2013, the Pygments team
License: BSD-2-Clause

Files: python/ext-libs/pygments/lexers/_robotframeworklexer.py
Copyright: 2006-2013, the Pygments team
2012, Nokia Siemens Networks Oyj
License: BSD-2-Clause and Apache-2.0

Files: python/ext-libs/pyspatialite/*
Copyright: 2004-2010, Gerhard Häring <gh@ghaering.de>
License: Zlib
Expand Down
2 changes: 0 additions & 2 deletions debian/python-qgis.install.in
Expand Up @@ -7,6 +7,4 @@ usr/lib/python*/*-packages/qgis/networkanalysis/*
usr/lib/python*/*-packages/qgis/PyQt/*
usr/lib/python*/*-packages/qgis/server/*
usr/lib/python*/*-packages/qgis/testing/*
#precise#usr/lib/python*/*-packages/pyspatialite/*.py
#precise#usr/lib/python*/*-packages/pyspatialite/*.so
#sid stretch#usr/lib/python*/*-packages/PyQt4/*.so
60 changes: 36 additions & 24 deletions debian/rules
Expand Up @@ -34,7 +34,7 @@ ifneq (,$(findstring -oracle,$(DISTRIBUTION)))
WITH_ORACLE=1
endif

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

Expand Down Expand Up @@ -70,16 +70,44 @@ CMAKE_OPTS := \
-DGENERATE_QHP=TRUE \
-DSUPPRESS_SIP_WARNINGS=TRUE \
-DWITH_CUSTOM_WIDGETS=TRUE \
-DWITH_INTERNAL_HTTPLIB2=FALSE \
-DWITH_INTERNAL_JINJA2=FALSE \
-DWITH_INTERNAL_MARKUPSAFE=FALSE \
-DWITH_INTERNAL_PYGMENTS=FALSE \
-DWITH_INTERNAL_DATEUTIL=FALSE \
-DWITH_INTERNAL_PYTZ=FALSE \
-DWITH_INTERNAL_YAML=FALSE \
-DQT_TAG_FILE=/usr/share/qt4/doc/html/qt.tags \
-DQT_DOC_URL=/usr/share/qt4/doc/html/

ifneq (,$(findstring $(DISTRIBUTION),"trusty"))
CMAKE_OPTS += \
-DWITH_INTERNAL_MARKUPSAFE=TRUE \
-DWITH_INTERNAL_DATEUTIL=TRUE \
-DWITH_INTERNAL_NOSE2=TRUE \
-DWITH_INTERNAL_YAML=TRUE
else
CMAKE_OPTS += \
-DWITH_INTERNAL_MARKUPSAFE=FALSE \
-DWITH_INTERNAL_DATEUTIL=FALSE \
-DWITH_INTERNAL_NOSE2=FALSE \
-DWITH_INTERNAL_YAML=FALSE
endif

ifneq (,$(findstring $(DISTRIBUTION),"jessie trusty"))
CMAKE_OPTS += \
-DWITH_INTERNAL_FUTURE=TRUE \
-DWITH_INTERNAL_PYPROJ=TRUE \
-DWITH_INTERNAL_PYTZ=TRUE \
-DWITH_INTERNAL_SIX=TRUE
else
CMAKE_OPTS += \
-DWITH_INTERNAL_FUTURE=FALSE \
-DWITH_INTERNAL_PYPROJ=FALSE \
-DWITH_INTERNAL_PYTZ=FALSE \
-DWITH_INTERNAL_SIX=FALSE
endif

ifneq (,$(findstring $(DISTRIBUTION),"jessie trusty xenial"))
CMAKE_OPTS += -DWITH_INTERNAL_OWSLIB=TRUE
else
CMAKE_OPTS += -DWITH_INTERNAL_OWSLIB=FALSE
endif


ifneq ($(SHA),)
CMAKE_OPTS += -DSHA=$(SHA)
endif
Expand All @@ -101,26 +129,10 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
endif

ifneq (,$(findstring $(DISTRIBUTION),"precise"))
CMAKE_OPTS += -DWITH_INTERNAL_NOSE2=TRUE -DWITH_INTERNAL_SIX=TRUE
else
CMAKE_OPTS += -DWITH_INTERNAL_NOSE2=FALSE -DWITH_INTERNAL_SIX=FALSE
endif

ifeq (,$(findstring $(DISTRIBUTION),"stretch sid xenial yakkety"))
CMAKE_OPTS += -DWITH_INTERNAL_FUTURE=TRUE
else
CMAKE_OPTS += -DWITH_INTERNAL_FUTURE=FALSE
endif

ifneq (,$(WITH_GLOBE))
CMAKE_OPTS += -DWITH_GLOBE=TRUE
endif

ifneq (,$(findstring $(DISTRIBUTION),"precise"))
CMAKE_OPTS += -DWITH_PYSPATIALITE=TRUE
endif

ifneq (,$(findstring $(DISTRIBUTION),"sid stretch"))
CMAKE_OPTS += -DPOSTGRES_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpq.so
endif
Expand Down
6 changes: 3 additions & 3 deletions ms-windows/osgeo4w/package-nightly.cmd
Expand Up @@ -184,16 +184,16 @@ cmake %CMAKE_OPT% ^
-D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/%PACKAGENAME% ^
-D FCGI_INCLUDE_DIR=%O4W_ROOT%/include ^
-D FCGI_LIBRARY=%O4W_ROOT%/lib/libfcgi.lib ^
-D WITH_INTERNAL_JINJA2=FALSE ^
-D WITH_INTERNAL_MARKUPSAFE=FALSE ^
-D WITH_INTERNAL_PYGMENTS=FALSE ^
-D WITH_INTERNAL_DATEUTIL=FALSE ^
-D WITH_INTERNAL_PYTZ=FALSE ^
-D WITH_INTERNAL_SIX=FALSE ^
-D WITH_INTERNAL_NOSE2=FALSE ^
-D WITH_INTERNAL_MOCK=FALSE ^
-D WITH_INTERNAL_HTTPLIB2=FALSE ^
-D WITH_INTERNAL_FUTURE=FALSE ^
-D WITH_INTERNAL_YAML=FALSE ^
-D WITH_INTERNAL_PYPROJ=FALSE ^
-D WITH_INTERNAL_OWSLIB=FALSE ^
%SRCDIR%
if errorlevel 1 (echo cmake failed & goto error)

Expand Down
7 changes: 5 additions & 2 deletions ms-windows/osgeo4w/package.cmd
Expand Up @@ -181,13 +181,16 @@ cmake %CMAKE_OPT% ^
-D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/%PACKAGENAME% ^
-D FCGI_INCLUDE_DIR=%O4W_ROOT%/include ^
-D FCGI_LIBRARY=%O4W_ROOT%/lib/libfcgi.lib ^
-D WITH_INTERNAL_JINJA2=FALSE ^
-D WITH_INTERNAL_MARKUPSAFE=FALSE ^
-D WITH_INTERNAL_PYGMENTS=FALSE ^
-D WITH_INTERNAL_DATEUTIL=FALSE ^
-D WITH_INTERNAL_PYTZ=FALSE ^
-D WITH_INTERNAL_SIX=FALSE ^
-D WITH_INTERNAL_NOSE2=FALSE ^