From b321869dd2b73d197525ad3ce9815905aa3cf36f Mon Sep 17 00:00:00 2001 From: Bas Couwenberg Date: Mon, 23 Feb 2015 23:44:38 +0100 Subject: [PATCH] Merged and squashed pull requests #1923 & #1928 from sebastic/debian PR#1923: Debian packaging improvements * Update copyright file. - Remove unused Files paragraph for the python plugin_installer - Fix qwtpolar-1.0 typo - Remove unused License paragraph for Apache-2.0 - Add License paragraph for Zlib * Remove unused substitution variable. * Update watch file, add version mangle. * Add upstream metadata. * Fix libqgis-customwidgets package name in dh_makeshlibs override, doesn't contain ABI anymore. * Also install scalable icons. PR#1928 Additional Debian packaging improvements * Update copyright file. - Add additional copyright holders to general files section - Add copyright years to general files section - Order copyright holder by year - Group files sections - Sort groups files sections alphanumerically - Document copyright holders & licenses for external modules - Add license specifications for: Apache-2.0, BSD-2-Clause, dxflib-Commercial-License, GPL-2, LGPL-2.1+, QT-Commericial, LGPL-2.1 with Digia Qt LGPL Exception 1.1 & GPL-3. * Remove extra license file for MetaSearch plugin. * Install libqgis_server.so in libqgis-dev. * Install schemaExtension.xsd in qgis-server. * Install contributors.json & developersmap.html in qgis-common. --- debian/control.in | 1 - debian/copyright | 694 +++++++++++++++++++++++++++++-------- debian/libqgis-dev.install | 1 + debian/qgis-common.install | 2 + debian/qgis-server.install | 1 + debian/qgis.install | 1 + debian/rules | 3 +- debian/upstream/metadata | 10 + debian/watch | 1 + 9 files changed, 568 insertions(+), 146 deletions(-) create mode 100644 debian/upstream/metadata diff --git a/debian/control.in b/debian/control.in index a9a7f661b8d7..2185d83b53ab 100644 --- a/debian/control.in +++ b/debian/control.in @@ -262,7 +262,6 @@ Architecture: all Depends: #sid jessie saucy sid-oracle trusty# python2.7, #wheezy precise# python, - ${python:Depends}, ${misc:Depends} Breaks: qgis-common (<< 1.5) Replaces: qgis-common (<< 1.5) diff --git a/debian/copyright b/debian/copyright index f9bdc06b6efd..7e87ebf3892c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,60 +4,228 @@ Upstream-Contact: qgis-developer@lists.osgeo.org Source: https://github.com/qgis/QGIS Files: * -Comment: The upstream contributors are listed in the PROVENANCE file - and here reported. -Copyright: Gary E.Sherman - Steve Halasz - Marco Hugentobler - Tim Sutton - Denis Antipov - Mark Coletti - Lars Luthman - Jens Oberender - Christoph Spoerri - Carl Anderson <> - Gavin Macaulay - Masaru Hoshi - Peter Brewer - Radim Blazek - Tom Elwertowski - Godofredo Contreras - Martin Dobias - Brendan Morley - Magnus Homann - Jürgen E. Fischer - Tisham Dhar - Leonardo Lami - Marco Pasetti - Mateusz Loskot - Peter Ersts - Borys Jurgiel - Paolo Cavallini - Carson J. Q. Farmer - Lorenzo Masini - Werner Macho - Giuseppe Sucameli - Alessandro Furieri - 2008 Paolo L. Scala, Barbara Rita Barricelli, Marco Padula +Copyright: Carl Anderson + Christoph Spoerri + Ivan Lucena + Jens Oberender + Leonardo Lami + Marco Pasetti + Masaru Hoshi + Mateusz Loskot + Tisham Dhar + Werner Macho + 1997-1998, Lars Doelle + 2003, Denis Antipov + 2003-2004, Steve Halasz + 2004, Peter Brewer + 2004-2005, Gavin Macaulay + 2004-2005, Lars Luthman + 2004-2005, Mark Coletti + 2005, Brendan Morley + 2006, Ionut Iosifescu Enescu + 2006-2007, Robert Knight + 2006-2007, Tom Elwertowski + 2007, Peter Ersts + 2007-2008, Matthew Perry + 2008, Alessandro Furieri + 2008, Paolo L. Scala, Barbara Rita Barricelli, Marco Padula + 2008, Stefan Ziegler + 2000, 2009, Richard Kostecky + 2008-2009, Maciej Sieczka + 2009, Andres Manz + 2009, Diego Moreira + 2009, Florian El Ahdab + 2009, Godofredo Contreras + 2009, Lorenzo Masini + 2009, Mathias Walker + 2009, Paolo Cavallini + 2009, Vita Cizek + 2002-2005, 2007, 2009-2010, Gary E.Sherman + 2009-2010, Manuel Massing + 2010, Ivan Mincik + 2010, Jack R, Maxim Dubinin (GIS-Lab) + 2010, Jeremy Palmer + 2010, Michael Minn + 2010, NextGIS (http://nextgis.org) + 2010, Pirmin Kalberer + 2010, Sourcepole + 2008-2011, Carson J. Q. Farmer + 2009-2011, Sergey Yakushev + 2009, 2011, Luiz Motta + 2011, German Carrillo + 2011, SunilRajKiran-kCube + 2007, 2009, 2012, Magnus Homann + 2009-2012, Giuseppe Sucameli + 2010-2012, Marco Bernasocchi + 2012, Arunmozhi + 2012, Anita Graser + 2012, Australia Indonesia Facility for Disaster Reduction + 2012, Carterix Geomatics + 2012, Etienne Tourigny + 2008, 2012, Horst Düster + 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, CS Systemes d'information (CS SI) + 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, Matthias Kuhn + 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 + 2015, Tom Kralidis + 2004-2006, 2009-2015, Radim Blazek + 2005-2015, Martin Dobias + 2012-2015, Victor Olaya + 2012-2015, The QGIS Project + 2012-2015, Denis Rouzaud + 2013-2015, Nyall Dawson + 2014-2015, Arnaud Morvan + 2014-2015, Sandro Mani + 2014-2015, Sandro Santilli + 2015, Michael Kirk License: GPL-2+ +Files: qgis.dtd +Copyright: disclaimed +License: public-domain + This DTD describes the maplayers and their symbology and + is used when saving/restoring a QGIS project. + This file is in the public domain + +Files: python/ext-libs/dateutil/* +Copyright: 2003-2010, Gustavo Niemeyer +License: BSD-3-Clause + +Files: python/ext-libs/httplib2/* +Copyright: 2006, 2012, Joe Gregorio +License: GPL-2+ + +Files: python/ext-libs/httplib2/socks.py +Copyright: 2006, Dan-Haim +License: BSD-2-Clause + +Files: python/ext-libs/jinja2/* +Copyright: 2006-2010, the Jinja Team +License: BSD-3-Clause + +Files: python/ext-libs/markupsafe/* +Copyright: 2010, 2013, Armin Ronacher +License: BSD-3-Clause + +Files: python/ext-libs/owslib/* +Copyright: 2006, Ancient World Mapping Center + 2008-2013, Tom Kralidis + 2013, Christian Ledermann + 2012, Brad Hards + 2012, Jachym Cepicky + 2007-2009, STFC + 2004-2006, Sean C. Gillies + 2005, Nuxeo SARL +License: BSD-3-Clause + +Files: python/ext-libs/pygments/* +Copyright: 2006-2013, the Pygments team +License: BSD-2-Clause + +Files: python/ext-libs/pygments/lexers/_robotframeworklexer.py +Copyright: 2006-2013, the Pygments team + 2012, Nokia Siemens Networks Oyj +License: BSD-2-Clause and Apache-2.0 + Files: python/ext-libs/pyspatialite/* -Copyright: 2004-2007 Gerhard Häring +Copyright: 2004-2010, Gerhard Häring License: Zlib -Files: src/plugins/dxf2shp_converter/builder.cpp -Copyright: 1999, Frank Warmerdam -Comment: The code is heavily based on Christopher Michaelis' DXF to - Shapefile Converter (http://www.wanderingidea.com/content/view/12/25/), - released under GPL License - . - This code is based on two other products: - DXFLIB (http://www.ribbonsoft.com/dxflib.html) - This is a library for reading DXF files, also GPL. - SHAPELIB (http://shapelib.maptools.org/) - Used for the Shapefile functionality. +Files: python/ext-libs/pytz/* +Copyright: 2003-2009, Stuart Bishop +License: MIT + +Files: python/ext-libs/six.py +Copyright: 2010-2014, Benjamin Peterson License: MIT +Files: python/plugins/fTools/* +Copyright: 2009, Carson J.Q. Farmer +License: MIT + +Files: python/plugins/GdalTools/* +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 +License: BSD-3-Clause + +Files: python/plugins/processing/algs/qgis/voronoi.py +Copyright: 2012, Victor Olaya + 1994, AT&T Bell Laboratories +Comment: Voronoi diagram calculator/ Delaunay triangulator + Translated to Python by Bill Simons + September, 2005 + . + Additional changes by Carson Farmer added November 2010 + . + Calculate Delaunay triangulation or the Voronoi polygons for a set of + 2D input points. + . + Derived from code bearing the following notice: + . + The author of this software is Steven Fortune. Copyright (c) 1994 by AT&T + Bell Laboratories. + Permission to use, copy, modify, and distribute this software for any + purpose without fee is hereby granted, provided that this entire notice + is included in all copies of any software which is or includes a copy + or modification of this software and in all copies of the supporting + documentation for such software. + THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED + WARRANTY. IN PARTICULAR, NEITHER THE AUTHORS NOR AT&T MAKE ANY + REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY + OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE. + . + Comments were incorporated from Shane O'Sullivan's translation of the + original code into C++ (http://mapviewer.skynet.ie/voronoi.html) + . + Steve Fortune's homepage: http://netlib.bell-labs.com/cm/cs/who/sjf/index.html +License: GPL-2+ + +Files: src/app/gps/qwtpolar-0.1/* + src/app/gps/qwtpolar-1.0/* +Copyright: 2008, Uwe Rathmann +Comment: This library is free software; you can redistribute it and/or + modify it under the terms of the Qwt License, Version 1.0 +License: QWT-1.0 + +Files: src/app/qtmain_android.cpp +Copyright: 2009-2011, BogDan Vatra +License: BSD-3-Clause + +Files: src/astyle/* +Copyright: Jim Pattee + Tal Davidson +Comment: Artistic Style is maintained and updated by Jim Pattee. + The original author was Tal Davidson, Israel. +License: LGPL-2.1+ + Files: src/core/gps/config.h src/core/gps/context.c src/core/gps/context.h @@ -78,35 +246,155 @@ Files: src/core/gps/config.h Copyright: Tim License: LGPL-2+ -Files: src/plugins/dxf2shp_converter/shapelib-1.2.10/dbfopen.c - src/plugins/dxf2shp_converter/shapelib-1.2.10/shapefil.h -Copyright: 1999, Frank Warmerdam +Files: src/core/pal/* +Copyright: 2008, Maxence Laurent, MIS-TIC, HEIG-VD +License: GPL-3+ + +Files: src/core/pal/rtree.hpp +Copyright: disclaimed +Comment: from http://www.superliminal.com/ + . + AUTORS + - 1983 Original algorithm and test code by Antonin Guttman and Michael Stonebraker, UC Berkely + - 1994 ANCI C ported from original test code by Melinda Green - melinda@superliminal.com + - 1995 Sphere volume fix for degeneracy problem submitted by Paul Brook + - 2004 Templated C++ port by Greg Douglas + - 2008 Portability issues fixed by Maxence Laurent +License: public-domain + LICENSE : Entirely free for all uses. Enjoy! + This File is in the public domain + +Files: src/core/symbology-ng/qgscolorbrewerpalette.cpp +Copyright: 2002, Cynthia Brewer, Mark Harrower, and The Pennsylvania State University + 2009, by Martin Dobias +License: Apache-2.0 and GPL-2+ + +Files: src/gui/raster/qwt5_histogram_item.h +Copyright: 1997, Josef Wilgen + 2002, Uwe Rathmann +License: QWT-1.0 + +Files: src/gui/symbology-ng/characterwidget.cpp + src/gui/symbology-ng/characterwidget.h +Copyright: 2009, Nokia Corporation and/or its subsidiary(-ies) +License: QT-Commercial or LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3 + +Files: src/plugins/dxf2shp_converter/builder.cpp + src/plugins/dxf2shp_converter/builder.h +Copyright: 1999, Frank Warmerdam +Comment: The code is heavily based on Christopher Michaelis' DXF to + Shapefile Converter (http://www.wanderingidea.com/content/view/12/25/), + released under GPL License + . + This code is based on two other products: + DXFLIB (http://www.ribbonsoft.com/dxflib.html) + This is a library for reading DXF files, also GPL. + SHAPELIB (http://shapelib.maptools.org/) + Used for the Shapefile functionality. +License: MIT + +Files: src/plugins/dxf2shp_converter/getInsertions.h +Copyright: Christopher Michaelis +License: GPL-2 + +Files: src/plugins/dxf2shp_converter/getInsertions.cpp +Copyright: Christopher Michaelis +License: GPL-2+ + +Files: src/plugins/dxf2shp_converter/shapelib-1.2.10/* +Copyright: 1999, 2001-2002, Frank Warmerdam +License: MIT or LGPL-2+ + +Files: src/plugins/dxf2shp_converter/dxflib/src/* +Copyright: 2001-2003, RibbonSoft + 2001, Robert J. Campbell Jr +License: GPL-2 or dxflib-Commercial-License + +Files: src/plugins/evis/* +Copyright: 2007, American Museum of Natural History License: LGPL-2+ -Files: src/plugins/dxf2shp_converter/shapelib-1.2.10/shpopen.c -Copyright: 1999, 2001, Frank Warmerdam +Files: src/plugins/globe/osgEarthQt/ViewerWidget.cpp + src/plugins/globe/osgEarthUtil/Controls.cpp +Copyright: 2008-2012, Pelican Mapping License: LGPL-2+ -Files: src/plugins/dxf2shp_converter/shapelib-1.2.10/shprewind.c -Copyright: 2002, Frank Warmerdam +Files: src/plugins/grass/qtermwidget/BlockArray.* +Copyright: 2000, Stephan Kulow + 2008, e_k +License: GPL-2+ + +Files: src/plugins/grass/qtermwidget/Emulation.cpp +Copyright: 1996, Matthias Ettrich + 1997-1998, Lars Doelle + 2007, Robert Knight + 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 +Copyright: 1997, Christian Czezakte + 2008, e_k License: LGPL-2+ -Files: cmake/PythonCompile.py -Copyright: Simon Edwards +Files: src/plugins/grass/qtermwidget/konsole_wcwidth.* +Copyright: 2011, Markus Kuhn 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. + This file is in the public domain + +Files: src/plugins/grass/qtermwidget/kpty.cpp + src/plugins/grass/qtermwidget/kpty.h + src/plugins/grass/qtermwidget/kpty_p.h +Copyright: 2002, Waldo Bastian + 2002-2003, 2007, Oswald Buddenhagen + 2008, e_k +License: LGPL-2+ -Files: cmake/FindLibPython.py - cmake/FindPyQt.py - cmake/FindSIP.py -Copyright: 2007, Simon Edwards -License: BSD-3-Clause +Files: src/plugins/grass/qtermwidget/qtermwidget.cpp + src/plugins/grass/qtermwidget/qtermwidget.h +Copyright: 2008, e_k + 2009, Lorenzo "Il Rugginoso" Masini +License: LGPL-2+ -Files: cmake/FindQsci.py -Copyright: 2012, Larry Shaffer - 2012, The QGIS Project' -License: BSD-3-Clause +Files: src/plugins/grass/qtermwidget/TerminalCharacterDecoder.cpp + src/plugins/grass/qtermwidget/TerminalCharacterDecoder.h +Copyright: 2006-2007, Robert Knight + 2008, e_k +License: LGPL-2+ + +Files: src/providers/oracle/ocispatial/main.cpp + src/providers/oracle/ocispatial/qsql_ocispatial.cpp +Copyright: 2012, Digia Plc and/or its subsidiary(-ies) + 2012-2013, Juergen E. Fischer +License: QT-Commercial or LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3 + +Files: src/providers/oracle/ocispatial/qsql_ocispatial.h + src/providers/oracle/ocispatial/qsqlcachedresult_p.h + src/providers/spatialite/qspatialite/qsql_spatialite.cpp + src/providers/spatialite/qspatialite/qsql_spatialite.h + src/providers/spatialite/qspatialite/qsqlcachedresult_p.h + src/providers/spatialite/qspatialite/smain.cpp +Copyright: 2012, Digia Plc and/or its subsidiary(-ies) +License: QT-Commercial or LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3 + +Files: tests/qt_modeltest/modeltest.cpp + tests/qt_modeltest/modeltest.h + tests/qt_modeltest/tst_modeltest.cpp +Copyright: 2011, Nokia Corporation and/or its subsidiary(-ies) +License: QT-Commercial or LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3 + +Files: tests/qt_modeltest/dynamictreemodel.cpp + tests/qt_modeltest/dynamictreemodel.h +Copyright: 2009, Stephen Kelly +License: QT-Commercial or LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3 + +Files: tests/testdata/cpt-city/gmt/* +Copyright: 2004, 2010, Paul Wessel, SOEST + 2004, 2010, Andreas Trawoeger + 2004, 2010, Walter Smith, NOAA +License: GPL-2+ Files: cmake/Bison.cmake cmake/FindExpat.cmake @@ -118,6 +406,10 @@ Files: cmake/Bison.cmake Copyright: 2007, Martin Dobias License: BSD-3-Clause +Files: cmake/FindFcgi.cmake +Copyright: 2010, Marco Hugentobler +License: BSD-3-Clause + Files: cmake/FindGDAL.cmake Copyright: 2007, Magnus Homann License: BSD-3-Clause @@ -129,7 +421,7 @@ License: BSD-3-Clause Files: cmake/FindGSL.cmake Copyright: 2004, Felix Woelk - Jan Woetzel + Jan Woetzel License: BSD-3-Clause Files: cmake/FindIconv.cmake @@ -137,6 +429,18 @@ Files: cmake/FindIconv.cmake Copyright: 2009, Juergen E. Fischer License: BSD-3-Clause +Files: cmake/FindLibPython.py + cmake/FindPyQt.py + cmake/FindSIP.py +Copyright: 2007, Simon Edwards +License: BSD-3-Clause + +Files: cmake/FindOSGEARTH.cmake +Copyright: 2011-2013, Pirmin Kalberer + 2011, Jürgen E. Fischer + 2013, William Kyngesburye +License: BSD-3-Clause + Files: cmake/FindPyQt4.cmake Copyright: 2007-2008, Simon Edwards License: BSD-3-Clause @@ -158,53 +462,63 @@ Files: cmake/FindQGIS.cmake Copyright: Tim Sutton License: BSD-3-Clause -Files: cmake/FindQwt.cmake -Copyright: 2010, Tim Sutton -License: BSD-3-Clause - Files: cmake/FindQsci.cmake cmake/QsciAPI.cmake Copyright: 2012, Larry Shaffer License: BSD-3-Clause -Files: cmake/FindQScintilla.cmake -Copyright: 2007 Thomas Moenicke thomas.moenicke@kdemail.net -License: BSD-3-Clause - -Files: cmake/FindSPATIALITE.cmake -Copyright: 2009, Sandro Furieri +Files: cmake/FindQsci.py +Copyright: 2012, Larry Shaffer + 2012, The QGIS Project License: BSD-3-Clause -Files: cmake/UsePythonTest.cmake -Copyright: 2006-2010 Mathieu Malaterre +Files: cmake/FindQScintilla.cmake +Copyright: 2007, Thomas Moenicke thomas.moenicke@kdemail.net License: BSD-3-Clause -Files: cmake/FindFcgi.cmake -Copyright: 2010, Marco Hugentobler +Files: cmake/FindQwt.cmake +Copyright: 2010, Tim Sutton License: BSD-3-Clause -Files: cmake/FindOSGEARTH.cmake -Copyright: 2011-2013, Pirmin Kalberer - 2011, Jürgen E. Fischer - 2013, William Kyngesburye +Files: cmake/FindSPATIALITE.cmake +Copyright: 2009, Sandro Furieri License: BSD-3-Clause Files: cmake/MacBundleMacros.cmake Copyright: 2010-2013, William Kyngesburye - 2012, Larry Shaffer + 2012, Larry Shaffer License: BSD-3-Clause Files: cmake/MacPlistMacros.cmake Copyright: 2011, William Kyngesburye License: BSD-3-Clause +Files: cmake/PythonCompile.py +Copyright: Simon Edwards +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/UsePythonTest.cmake +Copyright: 2006-2010, Mathieu Malaterre +License: BSD-3-Clause + +Files: images/themes/default/* +Copyright: 2011, Robert Szczepanek + Anita Graser +Comment: GIS icons by Robert Szczepanek is licensed under a Creative Commons + Attribution-Share Alike 3.0 Unported License. Feel free to use it in any GIS + software or for other purposes. I only ask you to let me know about that and + to include licence.txt file in your work. +License: CC-BY-SA-3.0 + Files: resources/cpt-city-qgis-min/bhw/* Copyright: 2011, Blackheartedworf (http://blackheartedwolf.deviantart.com/) License: CC-BY-3.0 Files: resources/cpt-city-qgis-min/cb/* Copyright: 2002, Cynthia Brewer, Pennsylvania State University - 2002, Mark Harrower, University of Wisconsin-Madison + 2002, Mark Harrower, University of Wisconsin-Madison Comment: This product includes color specifications and designs developed by Cynthia Brewer (http://colorbrewer.org/). License: Apache-Style-Software-License-Version-1.1 @@ -340,8 +654,8 @@ License: BSD-like-gist Files: resources/cpt-city-qgis-min/gmt/* Copyright: 2004, 2010, Paul Wessel, SOEST - 2004, 2010, Andreas Trawoeger - 2004, 2010, Walter Smith, NOAA + 2004, 2010, Andreas Trawoeger + 2004, 2010, Walter Smith, NOAA License: GPL-2+ Files: resources/cpt-city-qgis-min/go2/webtwo/* @@ -487,9 +801,9 @@ License: CC-BY-SA-3.0 Files: resources/cpt-city-qgis-min/ngdc/* Copyright: 2009, Elliot Lim, NOAA/NGDC - 2009, Greg Reed, Australian Ocean Data Centre Joint Facility - 2009, Lester M. Anderson, CASP, UK - 2009, Jesse Varner, NOAA/NGDC + 2009, Greg Reed, Australian Ocean Data Centre Joint Facility + 2009, Lester M. Anderson, CASP, UK + 2009, Jesse Varner, NOAA/NGDC Comment: Derived from GMT_globe and GMT_haxby which are licensed under the GPL. . @@ -523,7 +837,7 @@ License: public-domain-attribution Files: resources/cpt-city-qgis-min/saga/* Copyright: 2012, O. Conrad, Universität Hamburg - 2012, J. Böhner, Universität Hamburg + 2012, J. Böhner, Universität Hamburg License: GPL-2+ Files: resources/cpt-city-qgis-min/tp/* @@ -562,8 +876,8 @@ License: OPL-PSI-1.0 Files: resources/cpt-city-qgis-min/wkp/country/* Copyright: 2008, 2011, 2012, Bourrichon - 2008, 2011, 2012, Eric Gaba - 2008, 2011, 2012, PZmaps + 2008, 2011, 2012, Eric Gaba + 2008, 2011, 2012, PZmaps License: CC-BY-SA-3.0 Files: resources/cpt-city-qgis-min/wkp/encyclopedia/* @@ -635,41 +949,6 @@ Files: resources/cpt-city-qgis-min/wkp/tubs/* Copyright: 2012, TUBS License: CC-BY-SA-3.0 -Files: tests/testdata/cpt-city/gmt/* -Copyright: 2004, 2010, Paul Wessel, SOEST - 2004, 2010, Andreas Trawoeger - 2004, 2010, Walter Smith, NOAA -License: GPL-2+ - -Files: images/themes/default/* -Copyright: 2011, Robert Szczepanek - Anita Graser -Comment: GIS icons by Robert Szczepanek is licensed under a Creative Commons - Attribution-Share Alike 3.0 Unported License. Feel free to use it in any GIS - software or for other purposes. I only ask you to let me know about that and - to include licence.txt file in your work. -License: CC-BY-SA-3.0 - -Files: python/plugins/GdalTools/* -Copyright: 2009 Faunalia -License: MIT - -Files: python/plugins/fTools/* -Copyright: 2009 Carson J.Q. Farmer -License: MIT - -Files: python/plugins/plugin_installer -Copyright: 2007 Matthew T. Perry - 2008-2009 Borys Jurgiel -License: MIT - -Files: src/app/gps/qwtpolar-0.1/* - src/app/gps/qwtpolor-1.0/* -Copyright: 2008 Uwe Rathmann -Comment: This library is free software; you can redistribute it and/or - modify it under the terms of the Qwt License, Version 1.0 -License: QWT-1.0 - License: Apache-2.0 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -728,6 +1007,30 @@ License: Apache-Style-Software-License-Version-1.1 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +License: BSD-2-Clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + . + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + License: BSD-3-Clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -1466,6 +1769,33 @@ License: CC-BY-SA-3.0 . Creative Commons may be contacted at http://creativecommons.org/. +License: dxflib-Commercial-License + Licensees holding valid dxflib Professional Edition licenses may use + this file in accordance with the dxflib Commercial License + Agreement provided with the Software. + . + This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE + WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + . + See http://www.ribbonsoft.com for further details. + . + 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 @@ -1480,6 +1810,22 @@ License: GPL-2+ On Debian systems, the complete text of the GNU General Public License can be found in the `/usr/share/common-licenses/GPL-2' file. +License: GPL-3 + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License version 3 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. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL-3'. + License: GPL-3+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1509,6 +1855,55 @@ License: LGPL-2+ On Debian systems, the complete text of the GNU Lesser General Public License can be found in the `/usr/share/common-licenses/LGPL-2' file. +License: LGPL-2.1+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + . + This library 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 + Lesser General Public License for more details. + . + On Debian systems, the full text of the GNU Lesser General Public + License version 2.1 can be found in the file + `/usr/share/common-licenses/LGPL-2.1'. + +License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 + Alternatively, this file may be used under the terms of the GNU Lesser + General Public License version 2.1 as published by the Free Software + Foundation and appearing in the file LICENSE.LGPL included in the + packaging of this file. Please review the following information to + ensure the GNU Lesser General Public License version 2.1 requirements + will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + . + In addition, as a special exception, Digia gives you certain additional + rights. These rights are described in the Digia Qt LGPL Exception + version 1.1, included in the file LGPL_EXCEPTION.txt in this package. + . + Digia Qt LGPL Exception version 1.1 + As an additional permission to the GNU Lesser General Public License version + 2.1, the object code form of a "work that uses the Library" may incorporate + material from a header file that is part of the Library. You may distribute + such object code under terms of your choice, provided that: + (i) the header files of the Library have not been modified; and + (ii) the incorporated material is limited to numerical parameters, data + structure layouts, accessors, macros, inline functions and + templates; and + (iii) you comply with the terms of Section 6 of the GNU Lesser General + Public License version 2.1. + . + Moreover, you may apply this exception to a modified version of the Library, + provided that such modification does not involve copying material from the + Library into the modified Library's header files unless such material is + limited to (i) numerical parameters; (ii) data structure layouts; + (iii) accessors; and (iv) small macros, templates and inline functions of + five lines or less in length. + . + Furthermore, you are not required to apply this additional permission to a + modified version of the Library. + License: MIT Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation @@ -1782,6 +2177,15 @@ 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: QT-Commercial + Commercial License Usage + Licensees holding valid commercial Qt licenses may use this file in + accordance with the commercial license agreement provided with the + Software or, alternatively, in accordance with the terms contained in + a written agreement between you and Digia. For licensing terms and + conditions see http://qt.digia.com/licensing. For further information + use the contact form at http://qt.digia.com/contact-us. + License: QWT-1.0 The Qwt library and included programs are provided under the terms of the GNU LESSER GENERAL PUBLIC LICENSE (LGPL) with the following @@ -1816,19 +2220,21 @@ License: QWT-1.0 the Qwt project (http://qwt.sf.net). License: Zlib - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. + This software is provided 'as-is', without any express or implied warranty. In + no event will the authors be held liable for any damages arising from the use + of this software. . Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - . - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. + including commercial applications, and to alter it and redistribute it freely, + subject to the following restrictions: + . + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software in + a product, an acknowledgment in the product documentation would be + appreciated but is not required. + . + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + . + 3. This notice may not be removed or altered from any source distribution. diff --git a/debian/libqgis-dev.install b/debian/libqgis-dev.install index 913d4726bdae..a6fdc2f2ab65 100644 --- a/debian/libqgis-dev.install +++ b/debian/libqgis-dev.install @@ -3,6 +3,7 @@ usr/lib/libqgis_core.so usr/lib/libqgis_gui.so usr/lib/libqgis_analysis.so usr/lib/libqgis_networkanalysis.so +usr/lib/libqgis_server.so usr/lib/libqgisgrass.so usr/lib/libqgispython.so usr/share/qgis/FindQGIS.cmake diff --git a/debian/qgis-common.install b/debian/qgis-common.install index a36c3e3a26a5..5836131570c5 100644 --- a/debian/qgis-common.install +++ b/debian/qgis-common.install @@ -7,6 +7,8 @@ usr/share/qgis/doc/INSTALL usr/share/qgis/doc/INSTALL.html usr/share/qgis/doc/SPONSORS usr/share/qgis/doc/TRANSLATORS +usr/share/qgis/doc/contributors.json +usr/share/qgis/doc/developersmap.html usr/share/qgis/doc/favicon.ico usr/share/qgis/doc/images usr/share/qgis/doc/index.html diff --git a/debian/qgis-server.install b/debian/qgis-server.install index 616a8a649ee7..153d7843370a 100644 --- a/debian/qgis-server.install +++ b/debian/qgis-server.install @@ -1,3 +1,4 @@ usr/lib/cgi-bin/qgis_mapserv.fcgi usr/lib/cgi-bin/admin.sld usr/lib/cgi-bin/wms_metadata.xml +usr/lib/cgi-bin/schemaExtension.xsd diff --git a/debian/qgis.install b/debian/qgis.install index d2be41f20595..58596140cdb8 100644 --- a/debian/qgis.install +++ b/debian/qgis.install @@ -19,3 +19,4 @@ usr/share/applications/ usr/share/mime/packages/ usr/share/mimelnk/ usr/share/icons/hicolor/ +usr/share/icons/scalable/ diff --git a/debian/rules b/debian/rules index e2c350674746..9a109da7b404 100755 --- a/debian/rules +++ b/debian/rules @@ -243,6 +243,7 @@ override_dh_install: -find $(CURDIR)/debian/tmp/usr/share/qgis/resources/cpt-city-qgis-min/ -name COPYING.xml -delete $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/LICENSE $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/python/plugins/db_manager/LICENSE + $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/python/plugins/MetaSearch/LICENSE.txt # Man pages are installed by dh_installman $(RM) $(CURDIR)/debian/tmp/usr/man/man1/qgis.1 @@ -267,7 +268,7 @@ override_dh_compress: dh_compress --exclude=pdf override_dh_makeshlibs: - dh_makeshlibs -Xqgis-plugin-grass -Xlibqgis-customwidgets$(QGIS_ABI) -- -c0 -v$(QGIS_VERSION) + dh_makeshlibs -Xqgis-plugin-grass -Xlibqgis-customwidgets -- -c0 -v$(QGIS_VERSION) override_dh_shlibdeps: dh_shlibdeps -l/usr/lib/$(GRASS)/lib diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 000000000000..98ff99b59e2b --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,10 @@ +--- +Bug-Database: http://hub.qgis.org/projects/quantum-gis/issues +Bug-Submit: http://hub.qgis.org/projects/quantum-gis/issues/new +Contact: qgis-developer@lists.osgeo.org +Donation: http://qgis.org/en/site/getinvolved/donations.html +Name: QGIS +Registration: https://www2.osgeo.org/cgi-bin/ldap_create_user.py +Repository: https://github.com/qgis/QGIS.git +Repository-Browse: https://github.com/qgis/QGIS +Screenshots: http://qgis.org/en/site/about/screenshots.html diff --git a/debian/watch b/debian/watch index 6c00bb92b154..917e0e3e2649 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,3 @@ version=3 +opts="dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/" \ http://qgis.org/downloads/ (?:.*/)?(?:rel|v|qgis)[\-\_](\d[\d\-\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))