From 5c4bf99ce2cb53e8f07edeaf3d8710f44bd9385d Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Sat, 20 Feb 2016 16:53:24 +0100 Subject: [PATCH] debian packaging update: manually merge some changes from PR#2818 and some spelling fixes. --- debian/changelog | 11 +- debian/compat.in | 2 +- debian/control.in | 32 +- debian/copyright | 297 +++++++++++++++--- debian/rules | 11 +- python/core/qgscoordinatereferencesystem.sip | 2 +- python/core/qgscoordinatetransform.sip | 10 +- python/core/qgsproject.sip | 2 +- .../editorwidgets/core/qgswidgetwrapper.sip | 2 +- python/server/qgsserver.sip | 2 +- scripts/spelling.dat | 2 + .../interpolation/qgstininterpolator.h | 2 +- .../composer/qgscomposerscalebarwidget.cpp | 2 +- src/app/qgisapp.cpp | 6 +- src/core/qgsclipper.cpp | 2 +- src/core/qgscoordinatereferencesystem.cpp | 2 +- src/core/qgscoordinatereferencesystem.h | 2 +- src/core/qgscoordinatetransform.cpp | 4 +- src/core/qgscoordinatetransform.h | 12 +- src/core/qgscrscache.h | 4 +- src/core/qgspointlocator.cpp | 2 +- src/core/qgsproject.h | 2 +- src/core/raster/qgsrasterlayer.cpp | 2 +- src/core/symbology-ng/qgs25drenderer.cpp | 2 +- src/gui/editorwidgets/core/qgswidgetwrapper.h | 2 +- .../georeferencer/qgsgeoreftransform.h | 2 +- src/providers/gdal/qgsgdalprovider.h | 2 +- src/providers/grass/qgsgrassgislib.h | 2 +- src/server/qgsserver.cpp | 2 +- src/server/qgsserver.h | 2 +- tests/src/python/test_provider_memory.py | 2 +- tests/src/python/test_qgsblendmodes.py | 2 +- tests/src/python/test_qgscomposereffects.py | 2 +- tests/src/python/test_qgscomposermap.py | 2 +- tests/src/python/test_qgscomposermapgrid.py | 2 +- tests/src/python/test_qgscomposerpicture.py | 2 +- tests/src/python/test_qgscomposershapes.py | 2 +- tests/src/python/test_qgsfeatureiterator.py | 2 +- tests/src/python/test_qgsgeometry.py | 2 +- .../python/test_qgsnetworkcontentfetcher.py | 2 +- tests/src/python/test_qgspoint.py | 2 +- tests/src/python/test_qgsproject.py | 2 +- tests/src/python/test_qgsvectorfilewriter.py | 6 +- 43 files changed, 349 insertions(+), 110 deletions(-) diff --git a/debian/changelog b/debian/changelog index a96fe93c3d1..bf73b155e76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Fri, 23 Oct 2015 14:11:22 +0200 + -- Jürgen E. Fischer Sat, 20 Feb 2016 16:55:08 +0100 qgis (2.12.0) unstable; urgency=medium diff --git a/debian/compat.in b/debian/compat.in index 64dae5d8561..b7b843cfe0d 100644 --- a/debian/compat.in +++ b/debian/compat.in @@ -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 diff --git a/debian/control.in b/debian/control.in index 2fb8609e78a..56a68af4bea 100644 --- a/debian/control.in +++ b/debian/control.in @@ -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 diff --git a/debian/copyright b/debian/copyright index 087fc0fd279..dbb8e3b8ff8 100644 --- a/debian/copyright +++ b/debian/copyright @@ -23,9 +23,9 @@ Copyright: Carl Anderson 2004-2005, Mark Coletti 2005, Brendan Morley 2006, Ionut Iosifescu Enescu - 2006-2007, Robert Knight 2006-2007, Tom Elwertowski 2007, Peter Ersts + 2006-2008, Robert Knight 2007-2008, Matthew Perry 2008, Alessandro Furieri 2008, Paolo L. Scala, Barbara Rita Barricelli, Marco Padula @@ -66,42 +66,56 @@ Copyright: Carl Anderson 2003-2005, 2007-2013, Tim Sutton 2008-2013, Borys Jurgiel 2012-2013, Chris Crook - 2012-2013, Larry Shaffer 2012-2013, Massimo Endrighi 2012-2013, Salvatore Larosa 2012-2013, Vinayan Parameswaran 2013, Alvaro Huarte + 2013, Christian Surlykke 2013, CS Systemes d'information (CS SI) + 2013, Daniel Vaz + 2013, Emilio Loi 2013, Joshua Arnott - 2004-2014, Marco Hugentobler - 2005, 2012, 2014, Hugo Mercier 2011-2012, 2014, Nathan Woodrow - 2008-2012, 2014, Jürgen E. Fischer 2011, 2014, Tamas Szekeres - 2009-2014, Alexander Bruy 2012-2014, Piotr Pociask 2011, 2013-2014, Bernhard Ströbl 2013-2014, Martin Isenburg 2014, Agresta S. Coop - 2014, Alessandro Pasotti 2014, Angelos Tzotsos 2014, Giovanni Allegri 2014, Michael Douchin 2014, Niccolo' Marchi 2014, Radoslaw Guzinski 2004-2006, 2009-2015, Radim Blazek - 2005-2015, Martin Dobias - 2012-2015, Victor Olaya + 2004-2015, Marco Hugentobler + 2008-2012, 2014-2015, Jürgen E. Fischer + 2009-2015, Alexander Bruy 2012-2015, The QGIS Project - 2012-2015, Denis Rouzaud - 2012-2015, Matthias Kuhn - 2013-2015, Nyall Dawson + 2012-2015, Larry Shaffer + 2014-2015, Alessandro Pasotti 2014-2015, Arnaud Morvan - 2014-2015, Sandro Mani + 2014-2015, Boundless Spatial, Inc. + 2014-2015, Sandro Mani 2014-2015, Sandro Santilli 2014-2015, Tom Kralidis + 2014-2015, Vincent Mora + 2015, Etienne Trimaille + 2015, Giovanni Manghi + 2015, Karolina Alexiou + 2015, Loïc BARTOLETTI + 2015, Luigi Pirelli 2015, Michael Kirk + 2015, Pedro Venancio + 2015, René-Luc Dhont + 2008, 2015, Stéphane Brunner + 2005, 2012, 2014-2016, Hugo Mercier + 2005-2016, Martin Dobias + 2012-2016, Denis Rouzaud + 2012-2016, Matthias Kuhn + 2012-2016, Victor Olaya + 2013-2016, Nyall Dawson + 2014-2016, Médéric RIBREUX 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 +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 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 License: MIT Files: python/plugins/fTools/* @@ -172,8 +207,12 @@ Copyright: 2009, Faunalia License: MIT Files: python/plugins/processing/modeler/ModelerArrowItem.py -Copyright: 2010, Nokia Corporation and/or its subsidiary(-ies) - 2010, Riverbank Computing Limited + 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 Files: python/plugins/processing/algs/qgis/voronoi.py @@ -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 2008, e_k 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 + 2007, Oswald Buddenhagen 2008, e_k + 2010, KDE e.V. 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 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 License: BSD-3-Clause @@ -444,6 +494,11 @@ Files: cmake/FindPythonLibrary.cmake Copyright: 2007, Simon Edwards License: BSD-3-Clause +Files: cmake/FindQCA.cmake +Copyright: 2006, Michael Larouche + 2014, Larry Shaffer +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 +License: BSD-3-Clause + +Files: cmake/QCAMacros.cmake +Copyright: 2014, Larry Shaffer +License: BSD-3-Clause + Files: cmake/UsePythonTest.cmake Copyright: 2006-2010, Mathieu Malaterre 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 diff --git a/debian/rules b/debian/rules index 287687321d0..d3e1c3f41fc 100755 --- a/debian/rules +++ b/debian/rules @@ -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 diff --git a/python/core/qgscoordinatereferencesystem.sip b/python/core/qgscoordinatereferencesystem.sip index 0afd78b077e..8525a4ce615 100644 --- a/python/core/qgscoordinatereferencesystem.sip +++ b/python/core/qgscoordinatereferencesystem.sip @@ -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 diff --git a/python/core/qgscoordinatetransform.sip b/python/core/qgscoordinatetransform.sip index 85863cf79b2..c14ba53f767 100644 --- a/python/core/qgscoordinatetransform.sip +++ b/python/core/qgscoordinatetransform.sip @@ -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. diff --git a/python/core/qgsproject.sip b/python/core/qgsproject.sip index 8215a9e4a81..845bde4aaf1 100644 --- a/python/core/qgsproject.sip +++ b/python/core/qgsproject.sip @@ -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. * diff --git a/python/gui/editorwidgets/core/qgswidgetwrapper.sip b/python/gui/editorwidgets/core/qgswidgetwrapper.sip index aa8ec50be1f..f8257e1484c 100644 --- a/python/gui/editorwidgets/core/qgswidgetwrapper.sip +++ b/python/gui/editorwidgets/core/qgswidgetwrapper.sip @@ -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*)}. diff --git a/python/server/qgsserver.sip b/python/server/qgsserver.sip index e5f01774ada..d5c7691d05e 100644 --- a/python/server/qgsserver.sip +++ b/python/server/qgsserver.sip @@ -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 diff --git a/scripts/spelling.dat b/scripts/spelling.dat index 37d8312e09a..d1603cccdc3 100644 --- a/scripts/spelling.dat +++ b/scripts/spelling.dat @@ -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 diff --git a/src/analysis/interpolation/qgstininterpolator.h b/src/analysis/interpolation/qgstininterpolator.h index ec270d6a4e3..a27c3a0b71f 100644 --- a/src/analysis/interpolation/qgstininterpolator.h +++ b/src/analysis/interpolation/qgstininterpolator.h @@ -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; diff --git a/src/app/composer/qgscomposerscalebarwidget.cpp b/src/app/composer/qgscomposerscalebarwidget.cpp index ccc5391c0f3..f595def0802 100644 --- a/src/app/composer/qgscomposerscalebarwidget.cpp +++ b/src/app/composer/qgscomposerscalebarwidget.cpp @@ -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() ) ) ); } } diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp index 4ef5a7de199..3b3751a2638 100644 --- a/src/app/qgisapp.cpp +++ b/src/app/qgisapp.cpp @@ -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; } diff --git a/src/core/qgsclipper.cpp b/src/core/qgsclipper.cpp index 81d64e5547a..58e7155194d 100644 --- a/src/core/qgsclipper.cpp +++ b/src/core/qgsclipper.cpp @@ -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 diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp index ed0280f27bc..c4240098417 100644 --- a/src/core/qgscoordinatereferencesystem.cpp +++ b/src/core/qgscoordinatereferencesystem.cpp @@ -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 ); diff --git a/src/core/qgscoordinatereferencesystem.h b/src/core/qgscoordinatereferencesystem.h index fc6fb15a46e..9af388dcf5f 100644 --- a/src/core/qgscoordinatereferencesystem.h +++ b/src/core/qgscoordinatereferencesystem.h @@ -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 diff --git a/src/core/qgscoordinatetransform.cpp b/src/core/qgscoordinatetransform.cpp index 2e682cadbf7..05180003671 100644 --- a/src/core/qgscoordinatetransform.cpp +++ b/src/core/qgscoordinatetransform.cpp @@ -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(); } diff --git a/src/core/qgscoordinatetransform.h b/src/core/qgscoordinatetransform.h index 6745777f6a2..dc99b63a8be 100644 --- a/src/core/qgscoordinatetransform.h +++ b/src/core/qgscoordinatetransform.h @@ -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; diff --git a/src/core/qgscrscache.h b/src/core/qgscrscache.h index 48bae2264e2..077dcbc2d11 100644 --- a/src/core/qgscrscache.h +++ b/src/core/qgscrscache.h @@ -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; }; diff --git a/src/core/qgspointlocator.cpp b/src/core/qgspointlocator.cpp index aac47101392..dcd31db679b 100644 --- a/src/core/qgspointlocator.cpp +++ b/src/core/qgspointlocator.cpp @@ -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 diff --git a/src/core/qgsproject.h b/src/core/qgsproject.h index 857e03fcbef..79c0cbd9994 100644 --- a/src/core/qgsproject.h +++ b/src/core/qgsproject.h @@ -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. * diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp index 2622679701c..2e41268d93c 100644 --- a/src/core/raster/qgsrasterlayer.cpp +++ b/src/core/raster/qgsrasterlayer.cpp @@ -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" ); diff --git a/src/core/symbology-ng/qgs25drenderer.cpp b/src/core/symbology-ng/qgs25drenderer.cpp index aa61dcd6be4..16f50cfbb1b 100644 --- a/src/core/symbology-ng/qgs25drenderer.cpp +++ b/src/core/symbology-ng/qgs25drenderer.cpp @@ -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" ) ); diff --git a/src/gui/editorwidgets/core/qgswidgetwrapper.h b/src/gui/editorwidgets/core/qgswidgetwrapper.h index 05a2ecee24c..3592f2b3bda 100644 --- a/src/gui/editorwidgets/core/qgswidgetwrapper.h +++ b/src/gui/editorwidgets/core/qgswidgetwrapper.h @@ -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*)}. diff --git a/src/plugins/georeferencer/qgsgeoreftransform.h b/src/plugins/georeferencer/qgsgeoreftransform.h index c681694e3c0..f99da9fd6c5 100644 --- a/src/plugins/georeferencer/qgsgeoreftransform.h +++ b/src/plugins/georeferencer/qgsgeoreftransform.h @@ -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; /** diff --git a/src/providers/gdal/qgsgdalprovider.h b/src/providers/gdal/qgsgdalprovider.h index f00bbb44ee8..b58d1567560 100644 --- a/src/providers/gdal/qgsgdalprovider.h +++ b/src/providers/gdal/qgsgdalprovider.h @@ -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(); /** diff --git a/src/providers/grass/qgsgrassgislib.h b/src/providers/grass/qgsgrassgislib.h index 39922d940e0..6905cd40152 100644 --- a/src/providers/grass/qgsgrassgislib.h +++ b/src/providers/grass/qgsgrassgislib.h @@ -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 */ diff --git a/src/server/qgsserver.cpp b/src/server/qgsserver.cpp index 4899386be51..0ba4a4e8ac0 100644 --- a/src/server/qgsserver.cpp +++ b/src/server/qgsserver.cpp @@ -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; } diff --git a/src/server/qgsserver.h b/src/server/qgsserver.h index 369038afddd..fff487d2dec 100644 --- a/src/server/qgsserver.h +++ b/src/server/qgsserver.h @@ -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 diff --git a/tests/src/python/test_provider_memory.py b/tests/src/python/test_provider_memory.py index 85c22ae4393..ba2f94943c8 100644 --- a/tests/src/python/test_provider_memory.py +++ b/tests/src/python/test_provider_memory.py @@ -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 diff --git a/tests/src/python/test_qgsblendmodes.py b/tests/src/python/test_qgsblendmodes.py index 57343a4875b..76aa6b6471d 100644 --- a/tests/src/python/test_qgsblendmodes.py +++ b/tests/src/python/test_qgsblendmodes.py @@ -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() diff --git a/tests/src/python/test_qgscomposereffects.py b/tests/src/python/test_qgscomposereffects.py index 8ef2ef4f8d9..8647b6d67a2 100644 --- a/tests/src/python/test_qgscomposereffects.py +++ b/tests/src/python/test_qgscomposereffects.py @@ -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 diff --git a/tests/src/python/test_qgscomposermap.py b/tests/src/python/test_qgscomposermap.py index 2435be9c125..6a7699746c2 100644 --- a/tests/src/python/test_qgscomposermap.py +++ b/tests/src/python/test_qgscomposermap.py @@ -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) diff --git a/tests/src/python/test_qgscomposermapgrid.py b/tests/src/python/test_qgscomposermapgrid.py index bb4aa98dd3d..e907f4b9985 100644 --- a/tests/src/python/test_qgscomposermapgrid.py +++ b/tests/src/python/test_qgscomposermapgrid.py @@ -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 diff --git a/tests/src/python/test_qgscomposerpicture.py b/tests/src/python/test_qgscomposerpicture.py index ec82a95a454..a4246f1f9a0 100644 --- a/tests/src/python/test_qgscomposerpicture.py +++ b/tests/src/python/test_qgscomposerpicture.py @@ -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() diff --git a/tests/src/python/test_qgscomposershapes.py b/tests/src/python/test_qgscomposershapes.py index 6b9ace58c71..895414f9081 100644 --- a/tests/src/python/test_qgscomposershapes.py +++ b/tests/src/python/test_qgscomposershapes.py @@ -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() diff --git a/tests/src/python/test_qgsfeatureiterator.py b/tests/src/python/test_qgsfeatureiterator.py index 8e6e5683ab6..2d58707c075 100644 --- a/tests/src/python/test_qgsfeatureiterator.py +++ b/tests/src/python/test_qgsfeatureiterator.py @@ -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): diff --git a/tests/src/python/test_qgsgeometry.py b/tests/src/python/test_qgsgeometry.py index ef05cc26104..ac99c958997 100644 --- a/tests/src/python/test_qgsgeometry.py +++ b/tests/src/python/test_qgsgeometry.py @@ -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 diff --git a/tests/src/python/test_qgsnetworkcontentfetcher.py b/tests/src/python/test_qgsnetworkcontentfetcher.py index db1c403be4f..2cd011fe48f 100644 --- a/tests/src/python/test_qgsnetworkcontentfetcher.py +++ b/tests/src/python/test_qgsnetworkcontentfetcher.py @@ -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 diff --git a/tests/src/python/test_qgspoint.py b/tests/src/python/test_qgspoint.py index 077e3e1a8aa..906f946ddb9 100644 --- a/tests/src/python/test_qgspoint.py +++ b/tests/src/python/test_qgspoint.py @@ -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): diff --git a/tests/src/python/test_qgsproject.py b/tests/src/python/test_qgsproject.py index 2553dab3666..4152ed30e88 100644 --- a/tests/src/python/test_qgsproject.py +++ b/tests/src/python/test_qgsproject.py @@ -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 diff --git a/tests/src/python/test_qgsvectorfilewriter.py b/tests/src/python/test_qgsvectorfilewriter.py index 884eebade28..be8b861bbb6 100644 --- a/tests/src/python/test_qgsvectorfilewriter.py +++ b/tests/src/python/test_qgsvectorfilewriter.py @@ -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