Skip to content

Commit

Permalink
* remove ext-libs/pyproj
Browse files Browse the repository at this point in the history
* for owslib pyproj 1.8.9 in jessie and trusty is sufficient
  • Loading branch information
jef-n committed Mar 10, 2017
1 parent 7bda715 commit 7da0830
Show file tree
Hide file tree
Showing 53 changed files with 3 additions and 24,559 deletions.
5 changes: 2 additions & 3 deletions debian/control.in
Expand Up @@ -369,11 +369,10 @@ Depends:
python-qscintilla2,
python-httplib2,
python-jinja2,
#!trusty# python-markupsafe, python-dateutil, python-yaml,
#sid stretch xenial yakkety# python-owslib, python-tz, python-pyproj, python-future, python-six,
python-pygments,
python-requests,
#sid stretch jessie trusty xenial yakkety# python-pyspatialite,
#!trusty# python-markupsafe, python-dateutil, python-yaml,
#sid stretch jessie trusty xenial yakkety# python-owslib, python-tz, python-pyproj, python-future, python-six, python-pyspatialite,

This comment has been minimized.

Copy link
@niklasholm

niklasholm Mar 27, 2017

python-future does not exist in trusty!

libqgispython{QGIS_ABI},
${shlibs:Depends},
${python:Depends},
Expand Down
2 changes: 0 additions & 2 deletions debian/rules
Expand Up @@ -90,13 +90,11 @@ 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
Expand Down
1 change: 0 additions & 1 deletion ms-windows/osgeo4w/package-nightly.cmd
Expand Up @@ -192,7 +192,6 @@ cmake %CMAKE_OPT% ^
-D WITH_INTERNAL_MOCK=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
1 change: 0 additions & 1 deletion ms-windows/osgeo4w/package.cmd
Expand Up @@ -189,7 +189,6 @@ cmake %CMAKE_OPT% ^
-D WITH_INTERNAL_MOCK=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
2 changes: 1 addition & 1 deletion python/ext-libs/CMakeLists.txt
Expand Up @@ -33,7 +33,7 @@ MACRO(EXT_PYLIB lib)
ENDIF(WITH_INTERNAL_${ulib})
ENDMACRO(EXT_PYLIB lib)

FOREACH(pkg markupsafe owslib dateutil pytz yaml nose2 pyproj)
FOREACH(pkg markupsafe owslib dateutil pytz yaml nose2)
EXT_PYLIB(${pkg})
ENDFOREACH(pkg)

Expand Down
24 changes: 0 additions & 24 deletions python/ext-libs/pyproj-1.9.5.1-py2.7.egg-info/PKG-INFO

This file was deleted.

267 changes: 0 additions & 267 deletions python/ext-libs/pyproj-1.9.5.1-py2.7.egg-info/SOURCES.txt

This file was deleted.

This file was deleted.

50 changes: 0 additions & 50 deletions python/ext-libs/pyproj-1.9.5.1-py2.7.egg-info/installed-files.txt

This file was deleted.

0 comments on commit 7da0830

Please sign in to comment.