mirror of
https://github.com/qgis/QGIS.git
synced 2025-10-09 00:08:52 -04:00
debian packaging update: manually merge some changes from PR#2818 and
some spelling fixes.
This commit is contained in:
Juergen E. Fischer
parent
0c0d72bb03
commit
5c4bf99ce2
11
debian/changelog
vendored
11
debian/changelog
vendored
@ -1,8 +1,17 @@
|
||||
qgis (2.13.0) UNRELEASED; urgency=medium
|
||||
|
||||
* New development version 2.13 after branch of 2.12
|
||||
* 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> Fri, 23 Oct 2015 14:11:22 +0200
|
||||
-- Jürgen E. Fischer <jef@norbit.de> Sat, 20 Feb 2016 16:55:08 +0100
|
||||
|
||||
qgis (2.12.0) unstable; urgency=medium
|
||||
|
||||
|
||||
2
debian/compat.in
vendored
2
debian/compat.in
vendored
@ -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
|
||||
|
||||
32
debian/control.in
vendored
32
debian/control.in
vendored
@ -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
|
||||
|
||||
295
debian/copyright
vendored
295
debian/copyright
vendored
@ -23,9 +23,9 @@ Copyright: Carl Anderson
|
||||
2004-2005, Mark Coletti <mcoletti@users.sourceforge.net>
|
||||
2005, Brendan Morley <morb@beagle.com.au>
|
||||
2006, Ionut Iosifescu Enescu
|
||||
2006-2007, Robert Knight <robertknight@gmail.com>
|
||||
2006-2007, Tom Elwertowski <telwertowski@users.sourceforge.net>
|
||||
2007, Peter Ersts <ersts@amnh.org>
|
||||
2006-2008, Robert Knight <robertknight@gmail.com>
|
||||
2007-2008, Matthew Perry
|
||||
2008, Alessandro Furieri <a.furieri@lqt.it>
|
||||
2008, Paolo L. Scala, Barbara Rita Barricelli, Marco Padula
|
||||
@ -66,42 +66,56 @@ Copyright: Carl Anderson
|
||||
2003-2005, 2007-2013, Tim Sutton <tim@linfiniti.com>
|
||||
2008-2013, Borys Jurgiel <borysiasty@aster.pl>
|
||||
2012-2013, Chris Crook <ccrook@linz.govt.nz>
|
||||
2012-2013, Larry Shaffer <larrys@dakcarto.com>
|
||||
2012-2013, Massimo Endrighi <massimo.endrighi@geopartner.it>
|
||||
2012-2013, Salvatore Larosa <lrssvtml@gmail.com>
|
||||
2012-2013, Vinayan Parameswaran <vinayan123@gmail.com>
|
||||
2013, Alvaro Huarte <ahuarte47@yahoo.es>
|
||||
2013, Christian Surlykke
|
||||
2013, CS Systemes d'information (CS SI) <otb@c-s.fr>
|
||||
2013, Daniel Vaz <danielvaz@gmail.com>
|
||||
2013, Emilio Loi <loi@faunalia.it>
|
||||
2013, Joshua Arnott <josh@snorfalorpagus.net
|
||||
2012-2013, René-Luc D'Hont <rldhont@3liz.com>
|
||||
2004-2014, Marco Hugentobler <mhugent@users.sourceforge.net>
|
||||
2005, 2012, 2014, Hugo Mercier <hugo.mercier@oslandia.com>
|
||||
2011-2012, 2014, Nathan Woodrow <madmanwoo@gmail.com>
|
||||
2008-2012, 2014, Jürgen E. Fischer <jef@norbit.de>
|
||||
2011, 2014, Tamas Szekeres <szekerest@gmail.com>
|
||||
2009-2014, Alexander Bruy <alexander.bruy@gmail.com>
|
||||
2012-2014, Piotr Pociask <opengis84@gmail.com>
|
||||
2011, 2013-2014, Bernhard Ströbl <bernhard.stroebl@jena.de>
|
||||
2013-2014, Martin Isenburg <martin@rapidlasso.com>
|
||||
2014, Agresta S. Coop <iescamochero@agresta.org>
|
||||
2014, Alessandro Pasotti <a.pasotti@itopen.it>
|
||||
2014, Angelos Tzotsos <tzotsos@gmail.com>
|
||||
2014, Giovanni Allegri
|
||||
2014, Michael Douchin
|
||||
2014, Niccolo' Marchi <sciurusurbanus@hotmail.it>
|
||||
2014, Radoslaw Guzinski <rmgu@dhi-gras.com>
|
||||
2004-2006, 2009-2015, Radim Blazek <blazek@itc.it>
|
||||
2005-2015, Martin Dobias <wonder.sk@gmail.com>
|
||||
2012-2015, Victor Olaya <volayaf@gmail.com>
|
||||
2004-2015, Marco Hugentobler <marco@sourcepole.ch>
|
||||
2008-2012, 2014-2015, Jürgen E. Fischer <jef@norbit.de>
|
||||
2009-2015, Alexander Bruy <alexander.bruy@gmail.com>
|
||||
2012-2015, The QGIS Project
|
||||
2012-2015, Denis Rouzaud <denis.rouzaud@gmail.com>
|
||||
2012-2015, Matthias Kuhn <matthias@opengis.ch>
|
||||
2013-2015, Nyall Dawson <nyall.dawson@gmail.com>
|
||||
2012-2015, Larry Shaffer <lshaffer@boundlessgeo.com>
|
||||
2014-2015, Alessandro Pasotti <a.pasotti@itopen.it>
|
||||
2014-2015, Arnaud Morvan <arnaud.morvan@camptocamp.com>
|
||||
2014-2015, Sandro Mani <manisandro@gmail.com>
|
||||
2014-2015, Boundless Spatial, Inc.
|
||||
2014-2015, Sandro Mani <smani@sourcepole.ch>
|
||||
2014-2015, Sandro Santilli <strk@keybit.net>
|
||||
2014-2015, Tom Kralidis <tomkralidis@gmail.com>
|
||||
2014-2015, Vincent Mora <vincent dor mora@oslandia.com>
|
||||
2015, Etienne Trimaille
|
||||
2015, Giovanni Manghi <giovanni.manghi@naturalgis.pt>
|
||||
2015, Karolina Alexiou <carolinegr@gmail.com>
|
||||
2015, Loïc BARTOLETTI <coder@tuxfamily.org>
|
||||
2015, Luigi Pirelli <luipir@gmail.com>
|
||||
2015, Michael Kirk <michael.john.kirk@gmail.com>
|
||||
2015, Pedro Venancio <pedrongvenancio@gmail.com>
|
||||
2015, René-Luc Dhont <volayaf@gmail.com>
|
||||
2008, 2015, Stéphane Brunner <stephane.brunner@camptocamp.org>
|
||||
2005, 2012, 2014-2016, Hugo Mercier <hugo.mercier@oslandia.com>
|
||||
2005-2016, Martin Dobias <wonder.sk@gmail.com>
|
||||
2012-2016, Denis Rouzaud <denis.rouzaud@gmail.com>
|
||||
2012-2016, Matthias Kuhn <matthias@opengis.ch>
|
||||
2012-2016, Victor Olaya <volayaf@gmail.com>
|
||||
2013-2016, Nyall Dawson <nyall.dawson@gmail.com>
|
||||
2014-2016, Médéric RIBREUX <mederic.ribreux@gmail.com>
|
||||
License: GPL-2+
|
||||
|
||||
Files: qgis.dtd
|
||||
@ -131,6 +145,23 @@ Files: python/ext-libs/markupsafe/*
|
||||
Copyright: 2010, 2013, Armin Ronacher
|
||||
License: BSD-3-Clause
|
||||
|
||||
Files: python/ext-libs/nose2/*
|
||||
Copyright: Jason Pellerin <jpellerin+nose@gmail.com>
|
||||
License: BSD-2-Clause
|
||||
|
||||
Files: python/ext-libs/nose2/events.py
|
||||
python/ext-libs/nose2/exceptions.py
|
||||
python/ext-libs/nose2/loader.py
|
||||
python/ext-libs/nose2/runner.py
|
||||
python/ext-libs/nose2/tools/params.py
|
||||
python/ext-libs/nose2/util.py
|
||||
Copyright: 2001-2010, Python Software Foundation
|
||||
License: Python-2.0
|
||||
|
||||
Files: python/ext-libs/nose2/backports/ordereddict.py
|
||||
Copyright: Python Software Foundation
|
||||
License: MIT
|
||||
|
||||
Files: python/ext-libs/owslib/*
|
||||
Copyright: 2006, Ancient World Mapping Center
|
||||
2008-2013, Tom Kralidis
|
||||
@ -160,7 +191,11 @@ Copyright: 2003-2009, Stuart Bishop <stuart@stuartbishop.net>
|
||||
License: MIT
|
||||
|
||||
Files: python/ext-libs/six.py
|
||||
Copyright: 2010-2014, Benjamin Peterson
|
||||
Copyright: 2010-2015, Benjamin Peterson
|
||||
License: MIT
|
||||
|
||||
Files: python/ext-libs/yaml/*
|
||||
Copyright: 2006, Kirill Simonov <xi@resolvent.net>
|
||||
License: MIT
|
||||
|
||||
Files: python/plugins/fTools/*
|
||||
@ -172,7 +207,11 @@ Copyright: 2009, Faunalia
|
||||
License: MIT
|
||||
|
||||
Files: python/plugins/processing/modeler/ModelerArrowItem.py
|
||||
Copyright: 2010, Nokia Corporation and/or its subsidiary(-ies)
|
||||
src/app/qgssettingstree.cpp
|
||||
src/app/qgssettingstree.h
|
||||
src/app/qgsvariantdelegate.cpp
|
||||
src/app/qgsvariantdelegate.h
|
||||
Copyright: 2010-2011, Nokia Corporation and/or its subsidiary(-ies)
|
||||
2010, Riverbank Computing Limited
|
||||
License: BSD-3-Clause
|
||||
|
||||
@ -250,6 +289,11 @@ Files: src/core/pal/*
|
||||
Copyright: 2008, Maxence Laurent, MIS-TIC, HEIG-VD
|
||||
License: GPL-3+
|
||||
|
||||
Files: src/core/pal/costcalculator.cpp
|
||||
src/core/pal/costcalculator.h
|
||||
Copyright: 2009, Martin Dobias
|
||||
License: GPL-2+
|
||||
|
||||
Files: src/core/pal/rtree.hpp
|
||||
Copyright: disclaimed
|
||||
Comment: from http://www.superliminal.com/
|
||||
@ -323,12 +367,16 @@ Copyright: 1996, Matthias Ettrich <ettrich@kde.org>
|
||||
2008, e_k <e_k@users.sourceforge.net>
|
||||
License: GPL-2+
|
||||
|
||||
Files: src/plugins/grass/qtermwidget/k3process.cpp
|
||||
src/plugins/grass/qtermwidget/k3process.h
|
||||
src/plugins/grass/qtermwidget/k3processcontroller.cpp
|
||||
src/plugins/grass/qtermwidget/k3processcontroller.h
|
||||
Files: src/plugins/grass/qtermwidget/kprocess.cpp
|
||||
src/plugins/grass/qtermwidget/kprocess.h
|
||||
src/plugins/grass/qtermwidget/kptydevice.cpp
|
||||
src/plugins/grass/qtermwidget/kptydevice.h
|
||||
src/plugins/grass/qtermwidget/kptyprocess.cpp
|
||||
src/plugins/grass/qtermwidget/kptyprocess.h
|
||||
Copyright: 1997, Christian Czezakte <e9025461@student.tuwien.ac.at>
|
||||
2007, Oswald Buddenhagen <ossi@kde.org>
|
||||
2008, e_k <e_k@users.sourceforge.net>
|
||||
2010, KDE e.V. <kde-ev-board@kde.org>
|
||||
License: LGPL-2+
|
||||
|
||||
Files: src/plugins/grass/qtermwidget/konsole_wcwidth.*
|
||||
@ -417,12 +465,14 @@ Copyright: 2004, Felix Woelk
|
||||
License: BSD-3-Clause
|
||||
|
||||
Files: cmake/FindIconv.cmake
|
||||
cmake/PyQt4Macros.cmake
|
||||
Copyright: 2009, Juergen E. Fischer <jef at norbit dot de>
|
||||
License: BSD-3-Clause
|
||||
|
||||
Files: cmake/FindLibPython.py
|
||||
cmake/FindPyQt.py
|
||||
cmake/FindPyQt4.cmake
|
||||
cmake/FindPyQt4.py
|
||||
cmake/FindPyQt5.cmake
|
||||
cmake/FindPyQt5.py
|
||||
cmake/FindSIP.py
|
||||
Copyright: 2007, Simon Edwards <simon@simonzone.com>
|
||||
License: BSD-3-Clause
|
||||
@ -444,6 +494,11 @@ Files: cmake/FindPythonLibrary.cmake
|
||||
Copyright: 2007, Simon Edwards <simon@simonzone.com>
|
||||
License: BSD-3-Clause
|
||||
|
||||
Files: cmake/FindQCA.cmake
|
||||
Copyright: 2006, Michael Larouche <michael.larouche@kdemail.net>
|
||||
2014, Larry Shaffer <larrys@dakotacarto.com>
|
||||
License: BSD-3-Clause
|
||||
|
||||
Files: cmake/FindQextserialport.cmake
|
||||
cmake/FindQwtPolar.cmake
|
||||
cmake/Txt2Tags.cmake
|
||||
@ -491,6 +546,14 @@ License: public-domain
|
||||
PythonCompile.py was written by Simon Edwards, and is placed in the public
|
||||
domain. The author hereby disclaims copyright to this source code.
|
||||
|
||||
Files: cmake/PyQtMacros.cmake
|
||||
Copyright: 2009, Juergen E. Fischer <jef@norbit.de>
|
||||
License: BSD-3-Clause
|
||||
|
||||
Files: cmake/QCAMacros.cmake
|
||||
Copyright: 2014, Larry Shaffer <larrys@dakotacarto.com>
|
||||
License: BSD-3-Clause
|
||||
|
||||
Files: cmake/UsePythonTest.cmake
|
||||
Copyright: 2006-2010, Mathieu Malaterre <mathieu.malaterre@gmail.com>
|
||||
License: BSD-3-Clause
|
||||
@ -1774,20 +1837,6 @@ License: dxflib-Commercial-License
|
||||
Contact info@ribbonsoft.com if any conditions of this licensing are
|
||||
not clear to you.
|
||||
|
||||
License: GPL-2
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License version 3 or
|
||||
version 2 as published by the Free Software Foundation.
|
||||
.
|
||||
This program is distributed in the hope that it will be useful, but
|
||||
WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
General Public License for more details.
|
||||
.
|
||||
On Debian systems, the full text of the GNU General Public License
|
||||
version 2 can be found in the file
|
||||
`/usr/share/common-licenses/GPL-2'.
|
||||
|
||||
License: GPL-2+
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License as
|
||||
@ -2169,6 +2218,182 @@ License: OPL-PSI-1.0
|
||||
Licensing Framework section on The National Archives website.
|
||||
http://www.nationalarchives.gov.uk/information-management/uk-gov-licensing-framework.htm
|
||||
|
||||
License: Python-2.0
|
||||
PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
|
||||
--------------------------------------------
|
||||
1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"),
|
||||
and the Individual or Organization ("Licensee") accessing and otherwise using
|
||||
this software ("Python") in source or binary form and its associated
|
||||
documentation.
|
||||
.
|
||||
2. Subject to the terms and conditions of this License Agreement, PSF hereby
|
||||
grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
|
||||
analyze, test, perform and/or display publicly, prepare derivative works,
|
||||
distribute, and otherwise use Python alone or in any derivative version,
|
||||
provided, however, that PSF's License Agreement and PSF's notice of copyright,
|
||||
i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Python Software
|
||||
Foundation; All Rights Reserved" are retained in Python alone or in any
|
||||
derivative version prepared by Licensee.
|
||||
.
|
||||
3. In the event Licensee prepares a derivative work that is based on or
|
||||
incorporates Python or any part thereof, and wants to make the derivative work
|
||||
available to others as provided herein, then Licensee hereby agrees to include
|
||||
in any such work a brief summary of the changes made to Python.
|
||||
.
|
||||
4. PSF is making Python available to Licensee on an "AS IS" basis. PSF MAKES
|
||||
NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT
|
||||
NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY OF
|
||||
MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF
|
||||
PYTHON WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
|
||||
.
|
||||
5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON FOR ANY
|
||||
INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
|
||||
MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, OR ANY DERIVATIVE THEREOF,
|
||||
EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
|
||||
.
|
||||
6. This License Agreement will automatically terminate upon a material breach
|
||||
of its terms and conditions.
|
||||
.
|
||||
7. Nothing in this License Agreement shall be deemed to create any
|
||||
relationship of agency, partnership, or joint venture between PSF and
|
||||
Licensee. This License Agreement does not grant permission to use PSF
|
||||
trademarks or trade name in a trademark sense to endorse or promote products
|
||||
or services of Licensee, or any third party.
|
||||
8. By copying, installing or otherwise using Python, Licensee agrees to be
|
||||
bound by the terms and conditions of this License Agreement.
|
||||
.
|
||||
BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0
|
||||
-------------------------------------------
|
||||
.
|
||||
BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
|
||||
.
|
||||
1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an office
|
||||
at 160 Saratoga Avenue, Santa Clara, CA 95051, and the Individual or
|
||||
Organization ("Licensee") accessing and otherwise using this software in
|
||||
source or binary form and its associated documentation ("the Software").
|
||||
.
|
||||
2. Subject to the terms and conditions of this BeOpen Python License
|
||||
Agreement, BeOpen hereby grants Licensee a non-exclusive, royalty-free,
|
||||
world-wide license to reproduce, analyze, test, perform and/or display
|
||||
publicly, prepare derivative works, distribute, and otherwise use the Software
|
||||
alone or in any derivative version, provided, however, that the BeOpen Python
|
||||
License is retained in the Software, alone or in any derivative version
|
||||
prepared by Licensee.
|
||||
.
|
||||
3. BeOpen is making the Software available to Licensee on an "AS IS" basis.
|
||||
BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF
|
||||
EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND DISCLAIMS ANY REPRESENTATION
|
||||
OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT
|
||||
THE USE OF THE SOFTWARE WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
|
||||
.
|
||||
4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE SOFTWARE
|
||||
FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
|
||||
USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY DERIVATIVE THEREOF, EVEN
|
||||
IF ADVISED OF THE POSSIBILITY THEREOF.
|
||||
.
|
||||
5. This License Agreement will automatically terminate upon a material breach
|
||||
of its terms and conditions.
|
||||
.
|
||||
6. This License Agreement shall be governed by and interpreted in all respects
|
||||
by the law of the State of California, excluding conflict of law provisions.
|
||||
Nothing in this License Agreement shall be deemed to create any relationship
|
||||
of agency, partnership, or joint venture between BeOpen and Licensee. This
|
||||
License Agreement does not grant permission to use BeOpen trademarks or trade
|
||||
names in a trademark sense to endorse or promote products or services of
|
||||
Licensee, or any third party. As an exception, the "BeOpen Python" logos
|
||||
available at http://www.pythonlabs.com/logos.html may be used according to the
|
||||
permissions granted on that web page.
|
||||
.
|
||||
7. By copying, installing or otherwise using the software, Licensee agrees to
|
||||
be bound by the terms and conditions of this License Agreement.
|
||||
.
|
||||
CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1
|
||||
---------------------------------------
|
||||
1. This LICENSE AGREEMENT is between the Corporation for National Research
|
||||
Initiatives, having an office at 1895 Preston White Drive, Reston, VA 20191
|
||||
("CNRI"), and the Individual or Organization ("Licensee") accessing and
|
||||
otherwise using Python 1.6.1 software in source or binary form and its
|
||||
associated documentation.
|
||||
.
|
||||
2. Subject to the terms and conditions of this License Agreement, CNRI hereby
|
||||
grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
|
||||
analyze, test, perform and/or display publicly, prepare derivative works,
|
||||
distribute, and otherwise use Python 1.6.1 alone or in any derivative version,
|
||||
provided, however, that CNRI's License Agreement and CNRI's notice of
|
||||
copyright, i.e., "Copyright (c) 1995-2001 Corporation for National Research
|
||||
Initiatives; All Rights Reserved" are retained in Python 1.6.1 alone or in any
|
||||
derivative version prepared by Licensee. Alternately, in lieu of CNRI's
|
||||
License Agreement, Licensee may substitute the following text (omitting the
|
||||
quotes): "Python 1.6.1 is made available subject to the terms and conditions
|
||||
in CNRI's License Agreement. This Agreement together with Python 1.6.1 may be
|
||||
located on the Internet using the following unique, persistent identifier
|
||||
(known as a handle): 1895.22/1013. This Agreement may also be obtained from a
|
||||
proxy server on the Internet using the following URL:
|
||||
http://hdl.handle.net/1895.22/1013".
|
||||
.
|
||||
3. In the event Licensee prepares a derivative work that is based on or
|
||||
incorporates Python 1.6.1 or any part thereof, and wants to make the
|
||||
derivative work available to others as provided herein, then Licensee hereby
|
||||
agrees to include in any such work a brief summary of the changes made to
|
||||
Python 1.6.1.
|
||||
.
|
||||
4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS" basis. CNRI
|
||||
MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE,
|
||||
BUT NOT LIMITATION, CNRI MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY
|
||||
OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF
|
||||
PYTHON 1.6.1 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
|
||||
.
|
||||
5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON 1.6.1 FOR
|
||||
ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
|
||||
MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1, OR ANY DERIVATIVE
|
||||
THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
|
||||
.
|
||||
6. This License Agreement will automatically terminate upon a material breach
|
||||
of its terms and conditions.
|
||||
.
|
||||
7. This License Agreement shall be governed by the federal intellectual
|
||||
property law of the United States, including without limitation the federal
|
||||
copyright law, and, to the extent such U.S. federal law does not apply, by the
|
||||
law of the Commonwealth of Virginia, excluding Virginia's conflict of law
|
||||
provisions. Notwithstanding the foregoing, with regard to derivative works
|
||||
based on Python 1.6.1 that incorporate non-separable material that was
|
||||
previously distributed under the GNU General Public License (GPL), the law of
|
||||
the Commonwealth of Virginia shall govern this License Agreement only as to
|
||||
issues arising under or with respect to Paragraphs 4, 5, and 7 of this License
|
||||
Agreement. Nothing in this License Agreement shall be deemed to create any
|
||||
relationship of agency, partnership, or joint venture between CNRI and
|
||||
Licensee. This License Agreement does not grant permission to use CNRI
|
||||
trademarks or trade name in a trademark sense to endorse or promote products
|
||||
or services of Licensee, or any third party.
|
||||
.
|
||||
8. By clicking on the "ACCEPT" button where indicated, or by copying,
|
||||
installing or otherwise using Python 1.6.1, Licensee agrees to be bound by the
|
||||
terms and conditions of this License Agreement.
|
||||
.
|
||||
ACCEPT
|
||||
.
|
||||
CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
|
||||
--------------------------------------------------
|
||||
.
|
||||
Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, The
|
||||
Netherlands. All rights reserved.
|
||||
.
|
||||
Permission to use, copy, modify, and distribute this software and its
|
||||
documentation for any purpose and without fee is hereby granted, provided that
|
||||
the above copyright notice appear in all copies and that both that copyright
|
||||
notice and this permission notice appear in supporting documentation, and that
|
||||
the name of Stichting Mathematisch Centrum or CWI not be used in advertising
|
||||
or publicity pertaining to distribution of the software without specific,
|
||||
written prior permission.
|
||||
.
|
||||
STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
|
||||
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
|
||||
NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE FOR ANY SPECIAL,
|
||||
INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
|
||||
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
||||
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
License: QT-Commercial
|
||||
Commercial License Usage
|
||||
Licensees holding valid commercial Qt licenses may use this file in
|
||||
|
||||
11
debian/rules
vendored
11
debian/rules
vendored
@ -31,7 +31,7 @@ ifneq (,$(findstring -oracle,$(DISTRIBUTION)))
|
||||
WITH_ORACLE=1
|
||||
endif
|
||||
|
||||
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"wheezy jessie stretch precise trusty utopic vivid wily"))
|
||||
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"wheezy jessie stretch precise trusty utopic vivid wily xenial"))
|
||||
DISTRIBUTION := sid
|
||||
endif
|
||||
|
||||
@ -109,7 +109,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 sid"))
|
||||
ifneq (,$(findstring $(DISTRIBUTION),"jessie stretch trusty utopic vivid wily xenial sid"))
|
||||
CMAKE_OPTS += -DPYTHON_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpython2.7.so
|
||||
endif
|
||||
|
||||
@ -214,7 +214,7 @@ binary binary-arch binary-indep build build-arch build-indep clean install insta
|
||||
dh $@ --with python2 --parallel --builddirectory=$(QGIS_BUILDDIR)
|
||||
|
||||
override_dh_clean: cleantemplates
|
||||
dh_clean
|
||||
dh_clean qgis.bin.1 qbrowser.bin.1
|
||||
|
||||
# automatically generated files
|
||||
-$(RM) $(CURDIR)/src/core/qgscontexthelp_texts.cpp
|
||||
@ -334,7 +334,10 @@ override_dh_installchangelogs:
|
||||
dh_installchangelogs ChangeLog
|
||||
|
||||
override_dh_installman:
|
||||
dh_installman -pqgis qgis.1 qbrowser.1
|
||||
cp qgis.1 qgis.bin.1
|
||||
cp qbrowser.1 qbrowser.bin.1
|
||||
|
||||
dh_installman -pqgis qgis.1 qbrowser.1 qgis.bin.1 qbrowser.bin.1
|
||||
|
||||
override_dh_installmime:
|
||||
dh_installmime -pqgis
|
||||
|
||||
@ -144,7 +144,7 @@ class QgsCoordinateReferenceSystem
|
||||
*/
|
||||
static void setupESRIWktFix();
|
||||
|
||||
/** Returns whether this CRS is correctly initialised and usable */
|
||||
/** Returns whether this CRS is correctly initialized and usable */
|
||||
bool isValid() const;
|
||||
|
||||
/** Perform some validation on this CRS. If the sts doesn't validate the
|
||||
|
||||
@ -19,7 +19,7 @@ class QgsCoordinateTransform : QObject
|
||||
%End
|
||||
|
||||
public:
|
||||
/** Default constructor. Make sure you use initialised() manually if you use this one! */
|
||||
/** Default constructor. Make sure you use initialized() manually if you use this one! */
|
||||
QgsCoordinateTransform();
|
||||
|
||||
/** Constructs a QgsCoordinateTransform using QgsCoordinateReferenceSystem objects.
|
||||
@ -161,8 +161,8 @@ class QgsCoordinateTransform : QObject
|
||||
void transformCoords( int numPoint, double *x, double *y, double *z, TransformDirection direction = ForwardTransform ) const throw (QgsCsException);
|
||||
|
||||
/*!
|
||||
* Flag to indicate whether the coordinate systems have been initialised
|
||||
* @return true if initialised, otherwise false
|
||||
* Flag to indicate whether the coordinate systems have been initialized
|
||||
* @return true if initialized, otherwise false
|
||||
*/
|
||||
bool isInitialised() const;
|
||||
|
||||
@ -177,7 +177,7 @@ class QgsCoordinateTransform : QObject
|
||||
* @note This slot will usually be called if the
|
||||
* project properties change and a different coordinate system is
|
||||
* selected.
|
||||
* @note This coord transform will be reinitialised when this slot is called
|
||||
* @note This coord transform will be reinitialized when this slot is called
|
||||
* to check if short circuiting is needed or not etc.
|
||||
* @param theCRSID - A long representing the srsid of the srs to be used */
|
||||
void setDestCRSID( long theCRSID );
|
||||
@ -197,7 +197,7 @@ class QgsCoordinateTransform : QObject
|
||||
void setDestinationDatumTransform( int dt );
|
||||
|
||||
public slots:
|
||||
//!initialise is used to actually create the Transformer instance
|
||||
//!initialize is used to actually create the Transformer instance
|
||||
void initialise();
|
||||
|
||||
/** Restores state from the given Dom node.
|
||||
|
||||
@ -311,7 +311,7 @@ class QgsProject : QObject
|
||||
void writeProject( QDomDocument & );
|
||||
|
||||
/**
|
||||
* Emitted, after the basic initialisation of a layer from the project
|
||||
* Emitted, after the basic initialization of a layer from the project
|
||||
* file is done. You can use this signal to read additional information
|
||||
* from the project file.
|
||||
*
|
||||
|
||||
@ -135,7 +135,7 @@ class QgsWidgetWrapper : QObject
|
||||
/**
|
||||
* This method should create a new widget with the provided parent. This will only be called
|
||||
* if the form did not already provide a widget, so it is not guaranteed to be called!
|
||||
* You should not do initialisation stuff, which also has to be done for custom editor
|
||||
* You should not do initialization stuff, which also has to be done for custom editor
|
||||
* widgets inside this method. Things like filling comboboxes and assigning other data which
|
||||
* will also be used to make widgets on forms created in the QtDesigner usable should be assigned
|
||||
* in {@link initWidget(QWidget*)}.
|
||||
|
||||
@ -164,7 +164,7 @@ class QgsServer
|
||||
public:
|
||||
QgsServer();
|
||||
~QgsServer();
|
||||
/** Server initialisation: intialise QGIS ang QT core application.
|
||||
/** Server initialization: intialise QGIS ang QT core application.
|
||||
* This method is automatically called by handleRequest if it wasn't
|
||||
* explicitly called before
|
||||
* @note Not available in Python bindings
|
||||
|
||||
@ -232,6 +232,7 @@ informatiom:information
|
||||
informations:information
|
||||
infromation:information
|
||||
initalize:initialize
|
||||
initialisation:initalization
|
||||
initators:initiators
|
||||
initializiation:initialization
|
||||
inofficial:unofficial
|
||||
@ -245,6 +246,7 @@ intermittant:intermittent
|
||||
intersecton:intersection
|
||||
intersectons:intersections
|
||||
interupted:interrupted
|
||||
intialised:initialized
|
||||
jave:java
|
||||
kilometre:kilometer
|
||||
kilometres:kilometers
|
||||
|
||||
@ -53,7 +53,7 @@ class ANALYSIS_EXPORT QgsTINInterpolator: public QgsInterpolator
|
||||
TriangleInterpolator* mTriangleInterpolator;
|
||||
bool mIsInitialized;
|
||||
bool mShowProgressDialog;
|
||||
/** If true: export triangulation to shapefile after initialisation*/
|
||||
/** If true: export triangulation to shapefile after initialization*/
|
||||
bool mExportTriangulationToFile;
|
||||
/** File path to export the triangulation*/
|
||||
QString mTriangulationFilePath;
|
||||
|
||||
@ -111,7 +111,7 @@ void QgsComposerScaleBarWidget::refreshMapComboBox()
|
||||
|
||||
if ( saveCurrentComboText.isEmpty() && mComposerScaleBar->composerMap() )
|
||||
{
|
||||
//combo box was not initialised before
|
||||
//combo box was not initialized before
|
||||
mMapComboBox->setCurrentIndex( mMapComboBox->findText( tr( "Map %1" ).arg( mComposerScaleBar->composerMap()->id() ) ) );
|
||||
}
|
||||
}
|
||||
|
||||
@ -882,8 +882,8 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
|
||||
setupConnections();
|
||||
//
|
||||
// Please make sure this is the last thing the ctor does so that we can ensure the
|
||||
// widgets are all initialised before trying to restore their state.
|
||||
//
|
||||
// widgets are all initialized before trying to restore their state.
|
||||
z /
|
||||
mSplash->showMessage( tr( "Restoring window state" ), Qt::AlignHCenter | Qt::AlignBottom );
|
||||
qApp->processEvents();
|
||||
restoreWindowState();
|
||||
@ -2559,7 +2559,7 @@ void QgisApp::createCanvasTools()
|
||||
mMapTools.mRotateLabel->setAction( mActionRotateLabel );
|
||||
mMapTools.mChangeLabelProperties = new QgsMapToolChangeLabelProperties( mMapCanvas );
|
||||
mMapTools.mChangeLabelProperties->setAction( mActionChangeLabelProperties );
|
||||
//ensure that non edit tool is initialised or we will get crashes in some situations
|
||||
//ensure that non edit tool is initialized or we will get crashes in some situations
|
||||
mNonEditMapTool = mMapTools.mPan;
|
||||
}
|
||||
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
|
||||
// It's been inlined, so its in the qgsclipper.h file.
|
||||
|
||||
// But the static members must be initialised outside the class! (or GCC 4 dies)
|
||||
// But the static members must be initialized outside the class! (or GCC 4 dies)
|
||||
|
||||
// Qt also does clipping when the coordinates go over +/- 32767
|
||||
// moreover from Qt 4.6, Qt clips also when the width/height of a painter path
|
||||
|
||||
@ -436,7 +436,7 @@ bool QgsCoordinateReferenceSystem::createFromWkt( const QString &theWkt )
|
||||
|
||||
if ( theWkt.isEmpty() )
|
||||
{
|
||||
QgsDebugMsg( "theWkt is uninitialised, operation failed" );
|
||||
QgsDebugMsg( "theWkt is uninitialized, operation failed" );
|
||||
return mIsValidFlag;
|
||||
}
|
||||
QgsDebugMsg( "wkt: " + theWkt );
|
||||
|
||||
@ -190,7 +190,7 @@ class CORE_EXPORT QgsCoordinateReferenceSystem
|
||||
*/
|
||||
static void setupESRIWktFix();
|
||||
|
||||
/** Returns whether this CRS is correctly initialised and usable */
|
||||
/** Returns whether this CRS is correctly initialized and usable */
|
||||
bool isValid() const;
|
||||
|
||||
/** Perform some validation on this CRS. If the sts doesn't validate the
|
||||
|
||||
@ -91,7 +91,7 @@ QgsCoordinateTransform::QgsCoordinateTransform( const QString& theSourceCRS, con
|
||||
// initialize the coordinate system data structures
|
||||
//XXX Who spells initialize initialise?
|
||||
//XXX A: Its the queen's english....
|
||||
//XXX : Long live the queen! Lets get on with the initialisation...
|
||||
//XXX : Long live the queen! Lets get on with the initialization...
|
||||
initialise();
|
||||
}
|
||||
|
||||
@ -112,7 +112,7 @@ QgsCoordinateTransform::QgsCoordinateTransform( long theSourceSrid,
|
||||
// initialize the coordinate system data structures
|
||||
//XXX Who spells initialize initialise?
|
||||
//XXX A: Its the queen's english....
|
||||
//XXX : Long live the queen! Lets get on with the initialisation...
|
||||
//XXX : Long live the queen! Lets get on with the initialization...
|
||||
initialise();
|
||||
}
|
||||
|
||||
|
||||
@ -53,7 +53,7 @@ class CORE_EXPORT QgsCoordinateTransform : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
/** Default constructor. Make sure you use initialised() manually if you use this one! */
|
||||
/** Default constructor. Make sure you use initialized() manually if you use this one! */
|
||||
QgsCoordinateTransform();
|
||||
|
||||
/** Constructs a QgsCoordinateTransform using QgsCoordinateReferenceSystem objects.
|
||||
@ -195,8 +195,8 @@ class CORE_EXPORT QgsCoordinateTransform : public QObject
|
||||
void transformCoords( int numPoint, double *x, double *y, double *z, TransformDirection direction = ForwardTransform ) const;
|
||||
|
||||
/*!
|
||||
* Flag to indicate whether the coordinate systems have been initialised
|
||||
* @return true if initialised, otherwise false
|
||||
* Flag to indicate whether the coordinate systems have been initialized
|
||||
* @return true if initialized, otherwise false
|
||||
*/
|
||||
bool isInitialised() const { return mInitialisedFlag; }
|
||||
|
||||
@ -211,7 +211,7 @@ class CORE_EXPORT QgsCoordinateTransform : public QObject
|
||||
* @note This slot will usually be called if the
|
||||
* project properties change and a different coordinate system is
|
||||
* selected.
|
||||
* @note This coord transform will be reinitialised when this slot is called
|
||||
* @note This coord transform will be reinitialized when this slot is called
|
||||
* to check if short circuiting is needed or not etc.
|
||||
* @param theCRSID - A long representing the srsid of the srs to be used */
|
||||
void setDestCRSID( long theCRSID );
|
||||
@ -231,7 +231,7 @@ class CORE_EXPORT QgsCoordinateTransform : public QObject
|
||||
void setDestinationDatumTransform( int dt ) { mDestinationDatumTransform = dt; }
|
||||
|
||||
public slots:
|
||||
//!initialise is used to actually create the Transformer instance
|
||||
//!initialize is used to actually create the Transformer instance
|
||||
void initialise();
|
||||
|
||||
/** Restores state from the given Dom node.
|
||||
@ -260,7 +260,7 @@ class CORE_EXPORT QgsCoordinateTransform : public QObject
|
||||
bool mShortCircuit;
|
||||
|
||||
/*!
|
||||
* flag to show whether the transform is properly initialised or not
|
||||
* flag to show whether the transform is properly initialized or not
|
||||
*/
|
||||
bool mInitialisedFlag;
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
class QgsCoordinateTransform;
|
||||
|
||||
/** Cache coordinate transform by authid of source/dest transformation to avoid the
|
||||
overhead of initialisation for each redraw*/
|
||||
overhead of initialization for each redraw*/
|
||||
class CORE_EXPORT QgsCoordinateTransformCache
|
||||
{
|
||||
public:
|
||||
@ -66,7 +66,7 @@ class CORE_EXPORT QgsCRSCache
|
||||
|
||||
private:
|
||||
QHash< QString, QgsCoordinateReferenceSystem > mCRS;
|
||||
/** CRS that is not initialised (returned in case of error)*/
|
||||
/** CRS that is not initialized (returned in case of error)*/
|
||||
QgsCoordinateReferenceSystem mInvalidCRS;
|
||||
};
|
||||
|
||||
|
||||
@ -215,7 +215,7 @@ struct _CohenSutherland
|
||||
|
||||
OutCode computeOutCode( double x, double y )
|
||||
{
|
||||
OutCode code = INSIDE; // initialised as being inside of clip window
|
||||
OutCode code = INSIDE; // initialized as being inside of clip window
|
||||
if ( x < mRect.xMinimum() ) // to the left of clip window
|
||||
code |= LEFT;
|
||||
else if ( x > mRect.xMaximum() ) // to the right of clip window
|
||||
|
||||
@ -357,7 +357,7 @@ class CORE_EXPORT QgsProject : public QObject
|
||||
void writeProject( QDomDocument & );
|
||||
|
||||
/**
|
||||
* Emitted, after the basic initialisation of a layer from the project
|
||||
* Emitted, after the basic initialization of a layer from the project
|
||||
* file is done. You can use this signal to read additional information
|
||||
* from the project file.
|
||||
*
|
||||
|
||||
@ -1324,7 +1324,7 @@ bool QgsRasterLayer::readSymbology( const QDomNode& layer_node, QString& errorMe
|
||||
bool QgsRasterLayer::readXml( const QDomNode& layer_node )
|
||||
{
|
||||
QgsDebugMsgLevel( "Entered", 4 );
|
||||
//! @note Make sure to read the file first so stats etc are initialised properly!
|
||||
//! @note Make sure to read the file first so stats etc are initialized properly!
|
||||
|
||||
//process provider key
|
||||
QDomNode pkeyNode = layer_node.namedItem( "provider" );
|
||||
|
||||
@ -90,7 +90,7 @@ Qgs25DRenderer::Qgs25DRenderer()
|
||||
effectStack->appendEffect( glowEffect );
|
||||
floor->setPaintEffect( effectStack );
|
||||
|
||||
// These methods must only be used after the above initialisation!
|
||||
// These methods must only be used after the above initialization!
|
||||
|
||||
setRoofColor( QColor( "#fdbf6f" ) );
|
||||
setWallColor( QColor( "#777777" ) );
|
||||
|
||||
@ -136,7 +136,7 @@ class GUI_EXPORT QgsWidgetWrapper : public QObject
|
||||
/**
|
||||
* This method should create a new widget with the provided parent. This will only be called
|
||||
* if the form did not already provide a widget, so it is not guaranteed to be called!
|
||||
* You should not do initialisation stuff, which also has to be done for custom editor
|
||||
* You should not do initialization stuff, which also has to be done for custom editor
|
||||
* widgets inside this method. Things like filling comboboxes and assigning other data which
|
||||
* will also be used to make widgets on forms created in the QtDesigner usable should be assigned
|
||||
* in {@link initWidget(QWidget*)}.
|
||||
|
||||
@ -101,7 +101,7 @@ class QgsGeorefTransform : public QgsGeorefTransformInterface
|
||||
/** True for linear, Helmert, first order polynomial*/
|
||||
bool providesAccurateInverseTransformation() const;
|
||||
|
||||
//! \returns whether the parameters of this transform have been initialised by \ref updateParametersFromGCPs
|
||||
//! \returns whether the parameters of this transform have been initialized by \ref updateParametersFromGCPs
|
||||
bool parametersInitialized() const;
|
||||
|
||||
/**
|
||||
|
||||
@ -254,7 +254,7 @@ class QgsGdalProvider : public QgsRasterDataProvider, QgsGdalProviderBase
|
||||
// initialize CRS from wkt
|
||||
bool crsFromWkt( const char *wkt );
|
||||
|
||||
/** Do some initialisation on the dataset (e.g. handling of south-up datasets)*/
|
||||
/** Do some initialization on the dataset (e.g. handling of south-up datasets)*/
|
||||
void initBaseDataset();
|
||||
|
||||
/**
|
||||
|
||||
@ -120,7 +120,7 @@ class GRASS_LIB_EXPORT QgsGrassGisLib
|
||||
double noDataValueForGrassType( RASTER_MAP_TYPE grassType );
|
||||
|
||||
/** Grass does not seem to have any function to init Cell_head,
|
||||
* initialisation is done in G__read_Cell_head_array */
|
||||
* initialization is done in G__read_Cell_head_array */
|
||||
void initCellHead( struct Cell_head *cellhd );
|
||||
|
||||
/** Get raster from map of opened rasters, open it if it is not yet open */
|
||||
|
||||
@ -416,7 +416,7 @@ bool QgsServer::init( int & argc, char ** argv )
|
||||
|
||||
QgsEditorWidgetRegistry::initEditors();
|
||||
mInitialised = true;
|
||||
QgsMessageLog::logMessage( "Server intialised", "Server", QgsMessageLog::INFO );
|
||||
QgsMessageLog::logMessage( "Server initialized", "Server", QgsMessageLog::INFO );
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@ -49,7 +49,7 @@ class SERVER_EXPORT QgsServer
|
||||
public:
|
||||
QgsServer();
|
||||
~QgsServer();
|
||||
/** Server initialisation: intialise QGIS ang QT core application.
|
||||
/** Server initialization: intialise QGIS ang QT core application.
|
||||
* This method is automatically called by handleRequest if it wasn't
|
||||
* explicitly called before
|
||||
* @note Not available in Python bindings
|
||||
|
||||
@ -214,7 +214,7 @@ class TestPyQgsMemoryProvider(unittest.TestCase, ProviderTestCase):
|
||||
'test',
|
||||
'memory')
|
||||
|
||||
assert myMemoryLayer is not None, 'Provider not initialised'
|
||||
assert myMemoryLayer is not None, 'Provider not initialized'
|
||||
myProvider = myMemoryLayer.dataProvider()
|
||||
assert myProvider is not None
|
||||
|
||||
|
||||
@ -52,7 +52,7 @@ TEST_DATA_DIR = unitTestDataPath()
|
||||
class TestQgsBlendModes(unittest.TestCase):
|
||||
|
||||
def __init__(self, methodName):
|
||||
"""Run once on class initialisation."""
|
||||
"""Run once on class initialization."""
|
||||
unittest.TestCase.__init__(self, methodName)
|
||||
|
||||
self.iface = get_iface()
|
||||
|
||||
@ -32,7 +32,7 @@ TEST_DATA_DIR = unitTestDataPath()
|
||||
class TestQgsComposerEffects(unittest.TestCase):
|
||||
|
||||
def __init__(self, methodName):
|
||||
"""Run once on class initialisation."""
|
||||
"""Run once on class initialization."""
|
||||
unittest.TestCase.__init__(self, methodName)
|
||||
|
||||
# create composition
|
||||
|
||||
@ -41,7 +41,7 @@ TEST_DATA_DIR = unitTestDataPath()
|
||||
class TestQgsComposerMap(unittest.TestCase):
|
||||
|
||||
def __init__(self, methodName):
|
||||
"""Run once on class initialisation."""
|
||||
"""Run once on class initialization."""
|
||||
unittest.TestCase.__init__(self, methodName)
|
||||
myPath = os.path.join(TEST_DATA_DIR, 'rgb256x256.png')
|
||||
rasterFileInfo = QFileInfo(myPath)
|
||||
|
||||
@ -37,7 +37,7 @@ TEST_DATA_DIR = unitTestDataPath()
|
||||
class TestQgsComposerMap(unittest.TestCase):
|
||||
|
||||
def __init__(self, methodName):
|
||||
"""Run once on class initialisation."""
|
||||
"""Run once on class initialization."""
|
||||
unittest.TestCase.__init__(self, methodName)
|
||||
|
||||
# create composition with composer map
|
||||
|
||||
@ -51,7 +51,7 @@ class TestQgsComposerPicture(unittest.TestCase):
|
||||
cls.httpd_thread.start()
|
||||
|
||||
def __init__(self, methodName):
|
||||
"""Run once on class initialisation."""
|
||||
"""Run once on class initialization."""
|
||||
unittest.TestCase.__init__(self, methodName)
|
||||
|
||||
TEST_DATA_DIR = unitTestDataPath()
|
||||
|
||||
@ -33,7 +33,7 @@ TEST_DATA_DIR = unitTestDataPath()
|
||||
class TestQgsComposerShapes(unittest.TestCase):
|
||||
|
||||
def __init__(self, methodName):
|
||||
"""Run once on class initialisation."""
|
||||
"""Run once on class initialization."""
|
||||
unittest.TestCase.__init__(self, methodName)
|
||||
|
||||
self.mapSettings = QgsMapSettings()
|
||||
|
||||
@ -29,7 +29,7 @@ TEST_DATA_DIR = unitTestDataPath()
|
||||
class TestQgsFeatureIterator(unittest.TestCase):
|
||||
|
||||
def __init__(self, methodName):
|
||||
"""Run once on class initialisation."""
|
||||
"""Run once on class initialization."""
|
||||
unittest.TestCase.__init__(self, methodName)
|
||||
|
||||
def test_FilterExpression(self):
|
||||
|
||||
@ -369,7 +369,7 @@ class TestQgsGeometry(unittest.TestCase):
|
||||
'clip-in',
|
||||
'memory')
|
||||
|
||||
assert myMemoryLayer is not None, 'Provider not initialised'
|
||||
assert myMemoryLayer is not None, 'Provider not initialized'
|
||||
myProvider = myMemoryLayer.dataProvider()
|
||||
assert myProvider is not None
|
||||
|
||||
|
||||
@ -41,7 +41,7 @@ class TestQgsNetworkContentFetcher(unittest.TestCase):
|
||||
cls.httpd_thread.start()
|
||||
|
||||
def __init__(self, methodName):
|
||||
"""Run once on class initialisation."""
|
||||
"""Run once on class initialization."""
|
||||
unittest.TestCase.__init__(self, methodName)
|
||||
|
||||
self.loaded = False
|
||||
|
||||
@ -24,7 +24,7 @@ start_app()
|
||||
class TestQgsPoint(unittest.TestCase):
|
||||
|
||||
def __init__(self, methodName):
|
||||
"""Run once on class initialisation."""
|
||||
"""Run once on class initialization."""
|
||||
unittest.TestCase.__init__(self, methodName)
|
||||
|
||||
def setUp(self):
|
||||
|
||||
@ -24,7 +24,7 @@ start_app()
|
||||
class TestQgsProject(unittest.TestCase):
|
||||
|
||||
def __init__(self, methodName):
|
||||
"""Run once on class initialisation."""
|
||||
"""Run once on class initialization."""
|
||||
unittest.TestCase.__init__(self, methodName)
|
||||
self.messageCaught = False
|
||||
|
||||
|
||||
@ -46,7 +46,7 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
'test',
|
||||
'memory')
|
||||
|
||||
assert self.mMemoryLayer is not None, 'Provider not initialised'
|
||||
assert self.mMemoryLayer is not None, 'Provider not initialized'
|
||||
myProvider = self.mMemoryLayer.dataProvider()
|
||||
assert myProvider is not None
|
||||
|
||||
@ -67,7 +67,7 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
'test',
|
||||
'memory')
|
||||
|
||||
assert ml is not None, 'Provider not initialised'
|
||||
assert ml is not None, 'Provider not initialized'
|
||||
assert ml.isValid(), 'Source layer not valid'
|
||||
provider = ml.dataProvider()
|
||||
assert provider is not None
|
||||
@ -123,7 +123,7 @@ class TestQgsVectorLayer(unittest.TestCase):
|
||||
'test',
|
||||
'memory')
|
||||
|
||||
assert ml is not None, 'Provider not initialised'
|
||||
assert ml is not None, 'Provider not initialized'
|
||||
assert ml.isValid(), 'Source layer not valid'
|
||||
provider = ml.dataProvider()
|
||||
assert provider is not None
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user