Skip to content
Permalink
Browse files

* remove ext-libs/pyproj

* 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 7da0830577d4520ab7ef7b5090bf11e106807404
Showing with 3 additions and 24,559 deletions.
  1. +2 −3 debian/control.in
  2. +0 −2 debian/rules
  3. +0 −1 ms-windows/osgeo4w/package-nightly.cmd
  4. +0 −1 ms-windows/osgeo4w/package.cmd
  5. +1 −1 python/ext-libs/CMakeLists.txt
  6. +0 −24 python/ext-libs/pyproj-1.9.5.1-py2.7.egg-info/PKG-INFO
  7. +0 −267 python/ext-libs/pyproj-1.9.5.1-py2.7.egg-info/SOURCES.txt
  8. +0 −1 python/ext-libs/pyproj-1.9.5.1-py2.7.egg-info/dependency_links.txt
  9. +0 −50 python/ext-libs/pyproj-1.9.5.1-py2.7.egg-info/installed-files.txt
  10. +0 −1 python/ext-libs/pyproj-1.9.5.1-py2.7.egg-info/top_level.txt
  11. +0 −892 python/ext-libs/pyproj/__init__.py
  12. BIN python/ext-libs/pyproj/_proj.so
  13. BIN python/ext-libs/pyproj/data/FL
  14. +0 −22 python/ext-libs/pyproj/data/GL27
  15. +0 −487 python/ext-libs/pyproj/data/IGNF
  16. BIN python/ext-libs/pyproj/data/MD
  17. +0 −72 python/ext-libs/pyproj/data/README
  18. BIN python/ext-libs/pyproj/data/TN
  19. BIN python/ext-libs/pyproj/data/WI
  20. BIN python/ext-libs/pyproj/data/WO
  21. BIN python/ext-libs/pyproj/data/alaska
  22. BIN python/ext-libs/pyproj/data/conus
  23. +0 −10,228 python/ext-libs/pyproj/data/epsg
  24. +0 −5,937 python/ext-libs/pyproj/data/esri
  25. +0 −948 python/ext-libs/pyproj/data/esri.extra
  26. BIN python/ext-libs/pyproj/data/hawaii
  27. +0 −142 python/ext-libs/pyproj/data/nad.lst
  28. +0 −809 python/ext-libs/pyproj/data/nad27
  29. +0 −744 python/ext-libs/pyproj/data/nad83
  30. BIN python/ext-libs/pyproj/data/ntf_r93.gsb
  31. BIN python/ext-libs/pyproj/data/ntv1_can.dat
  32. +0 −11 python/ext-libs/pyproj/data/ntv2_out.dist
  33. BIN python/ext-libs/pyproj/data/null
  34. BIN python/ext-libs/pyproj/data/nzgd2kgrid0005.gsb
  35. +0 −53 python/ext-libs/pyproj/data/other.extra
  36. +0 −265 python/ext-libs/pyproj/data/pj_out27.dist
  37. +0 −225 python/ext-libs/pyproj/data/pj_out83.dist
  38. +0 −17 python/ext-libs/pyproj/data/proj_def.dat
  39. +0 −40 python/ext-libs/pyproj/data/proj_outIGNF.dist
  40. BIN python/ext-libs/pyproj/data/prvi
  41. BIN python/ext-libs/pyproj/data/stgeorge
  42. BIN python/ext-libs/pyproj/data/stlrnc
  43. BIN python/ext-libs/pyproj/data/stpaul
  44. +0 −25 python/ext-libs/pyproj/data/td_out.dist
  45. +0 −848 python/ext-libs/pyproj/data/test27
  46. +0 −729 python/ext-libs/pyproj/data/test83
  47. +0 −167 python/ext-libs/pyproj/data/testIGNF
  48. +0 −114 python/ext-libs/pyproj/data/testdatumfile
  49. +0 −74 python/ext-libs/pyproj/data/testntv2
  50. +0 −788 python/ext-libs/pyproj/data/testvarious
  51. +0 −353 python/ext-libs/pyproj/data/tv_out.dist
  52. +0 −212 python/ext-libs/pyproj/data/world
  53. +0 −6 python/ext-libs/pyproj/datadir.py
@@ -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},
@@ -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
@@ -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)
@@ -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)
@@ -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)

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 7da0830

Please sign in to comment.
You can’t perform that action at this time.