Skip to content
Permalink
Browse files

debian packaging update: manually merge some changes from PR#2818 and

some spelling fixes.
  • Loading branch information
jef-n committed Feb 20, 2016
1 parent 0c0d72b commit 5c4bf99ce2cb53e8f07edeaf3d8710f44bd9385d
Showing with 350 additions and 111 deletions.
  1. +11 −2 debian/changelog
  2. +1 −1 debian/compat.in
  3. +16 −16 debian/control.in
  4. +261 −36 debian/copyright
  5. +7 −4 debian/rules
  6. +1 −1 python/core/qgscoordinatereferencesystem.sip
  7. +5 −5 python/core/qgscoordinatetransform.sip
  8. +1 −1 python/core/qgsproject.sip
  9. +1 −1 python/gui/editorwidgets/core/qgswidgetwrapper.sip
  10. +1 −1 python/server/qgsserver.sip
  11. +2 −0 scripts/spelling.dat
  12. +1 −1 src/analysis/interpolation/qgstininterpolator.h
  13. +1 −1 src/app/composer/qgscomposerscalebarwidget.cpp
  14. +3 −3 src/app/qgisapp.cpp
  15. +1 −1 src/core/qgsclipper.cpp
  16. +1 −1 src/core/qgscoordinatereferencesystem.cpp
  17. +1 −1 src/core/qgscoordinatereferencesystem.h
  18. +2 −2 src/core/qgscoordinatetransform.cpp
  19. +6 −6 src/core/qgscoordinatetransform.h
  20. +2 −2 src/core/qgscrscache.h
  21. +1 −1 src/core/qgspointlocator.cpp
  22. +1 −1 src/core/qgsproject.h
  23. +1 −1 src/core/raster/qgsrasterlayer.cpp
  24. +1 −1 src/core/symbology-ng/qgs25drenderer.cpp
  25. +1 −1 src/gui/editorwidgets/core/qgswidgetwrapper.h
  26. +1 −1 src/plugins/georeferencer/qgsgeoreftransform.h
  27. +1 −1 src/providers/gdal/qgsgdalprovider.h
  28. +1 −1 src/providers/grass/qgsgrassgislib.h
  29. +1 −1 src/server/qgsserver.cpp
  30. +1 −1 src/server/qgsserver.h
  31. +1 −1 tests/src/python/test_provider_memory.py
  32. +1 −1 tests/src/python/test_qgsblendmodes.py
  33. +1 −1 tests/src/python/test_qgscomposereffects.py
  34. +1 −1 tests/src/python/test_qgscomposermap.py
  35. +1 −1 tests/src/python/test_qgscomposermapgrid.py
  36. +1 −1 tests/src/python/test_qgscomposerpicture.py
  37. +1 −1 tests/src/python/test_qgscomposershapes.py
  38. +1 −1 tests/src/python/test_qgsfeatureiterator.py
  39. +1 −1 tests/src/python/test_qgsgeometry.py
  40. +1 −1 tests/src/python/test_qgsnetworkcontentfetcher.py
  41. +1 −1 tests/src/python/test_qgspoint.py
  42. +1 −1 tests/src/python/test_qgsproject.py
  43. +3 −3 tests/src/python/test_qgsvectorfilewriter.py
@@ -1,8 +1,17 @@
qgis (2.13.0) UNRELEASED; urgency=medium

* New development version 2.13 after branch of 2.12

-- Jürgen E. Fischer <jef@norbit.de> Fri, 23 Oct 2015 14:11:22 +0200
* add dependencies to python-psycopg2, python-yaml, python-mack and
python-node2 for tests
* update optional oracle dependency to 12.1
* upgrade python-qgis from Recommends to Depends
* downgrade liblwgeom dependency to Recommends
* remove coding documentation
* replace grass plugin diversion to wrapper in qgis package
* remove spit plugin
* add support for ubuntu xenial

-- Jürgen E. Fischer <jef@norbit.de> Sat, 20 Feb 2016 16:55:08 +0100

qgis (2.12.0) unstable; urgency=medium

@@ -1,3 +1,3 @@
#stretch sid jessie trusty utopic vivid wily#9
#stretch sid jessie trusty utopic vivid wily xenial#9
#wheezy jessie#8
#precise#7
@@ -6,14 +6,15 @@ Priority: optional
Build-Depends:
bison,
cmake (>= 2.8),
#sid stretch jessie wheezy saucy trusty utopic vivid wily# debhelper (>= 9),
#sid stretch jessie trusty vivid wily# dh-python,
#wily xenial# 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,
#precise# debhelper (>= 7),
flex,
grass-dev,
libexpat1-dev,
libfcgi-dev,
#sid stretch jessie trusty utopic vivid wily# libgdal-dev (>= 1.10.1-0~),
#sid stretch jessie trusty utopic vivid wily xenial# 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,
@@ -28,7 +29,7 @@ Build-Depends:
libqca2-plugin-ossl,
libqtwebkit-dev,
#stretch jessie wheezy# libqwt-dev,
#precise saucy trusty utopic vivid wily sid# libqwt5-qt4-dev,
#precise saucy trusty utopic vivid wily xenial sid# libqwt5-qt4-dev,
libspatialite-dev,
libsqlite3-dev,
libspatialindex-dev,
@@ -43,10 +44,10 @@ Build-Depends:
#precise saucy# python-central (>= 0.5),
#saucy wheezy# python-dev,
#saucy# libpython2.7-dev,
#sid stretch jessie trusty utopic vivid wily# python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
#sid stretch jessie wily# pyqt4.qsci-dev,
#sid stretch jessie trusty utopic vivid wily# python-pyspatialite,
#sid wheezy jessie stretch trusty vivid wily# python-nose2,
#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,
python-sip (>= 4.5.0),
python-sip-dev (>= 4.5.0),
libosgearth-dev,
@@ -62,11 +63,11 @@ Build-Depends:
spawn-fcgi, lighttpd, poppler-utils, locales, qt4-doc-html,
libqt4-sql-sqlite, python-psycopg2
Build-Conflicts: libqgis-dev, qgis-dev
#sid stretch jessie vivid wily#Standards-Version: 3.9.6
#sid stretch jessie vivid wily xenial#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#XS-Python-Version: current
#wheezy precise saucy trusty utopic vivid wily xenial#XS-Python-Version: current
Vcs-Browser: https://github.com/qgis/QGIS/
Vcs-Git: https://github.com/qgis/QGIS.git
Homepage: http://qgis.org/
@@ -239,7 +240,7 @@ Section: libdevel
Depends:
grass-dev,
libexpat1-dev,
#sid stretch jessie trusty utopic vivid wily# libgdal-dev (>= 1.10.1-0~),
#sid stretch jessie trusty utopic vivid wily xenial# 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,
@@ -299,7 +300,7 @@ Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends}
Description: GRASS plugin for QGIS
Description: GRASS provider for QGIS
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
@@ -310,7 +311,7 @@ Architecture: any
Depends:
qgis (= ${binary:Version}),
qgis-plugin-grass-common (= ${source:Version}),
qgis-provider-grass (= ${source:Version}),
qgis-provider-grass (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends},
#!precise# grass-core
@@ -381,15 +382,14 @@ Depends:
python-tz,
python-six,
python-yaml,
#sid stretch jessie trusty utopic vivid wily# python-pyspatialite,
#jessie# liblwgeom-2.1.4,
#stretch sid# liblwgeom-2.2-5,
#sid stretch jessie trusty utopic vivid wily xenial# python-pyspatialite,
libqgispython{QGIS_ABI},
${shlibs:Depends},
${python:Depends},
${misc:Depends},
${sip:Depends}
Provides: ${python:Provides}
Recommends: liblwgeom-dev
#wheezy precise#XB-Python-Version: ${python:Versions}
Description: Python bindings to QGIS
QGIS is a Geographic Information System (GIS) which manages, analyzes and

0 comments on commit 5c4bf99

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