[SCM] qgis branch, master, updated. upstream/2.0.1-13436-g7969474
Bas Couwenberg
sebastic at xs4all.nl
Fri Sep 27 22:02:00 UTC 2013
The following commit has been merged in the master branch:
commit 5fd3fbd20c41a3eb165df05552267d605a89289d
Merge: 6c4c96a884feb8bd13106edf7520636e497518ac 553457c22900283dd3e82d72a4f4a6b0ccaf6bbb
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Sep 27 01:20:24 2013 +0200
Merge branch 'debian'
Conflicts:
debian/changelog
debian/control
debian/copyright
debian/rules
diff --combined debian/changelog
index 679c788,96a3d08..77920c6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,62 -1,54 +1,113 @@@
+qgis (2.0.1) UNRELEASED; urgency=low
+
+ * branch of version 2.0
+
+ -- Jürgen E. Fischer <jef at norbit.de> Tue, 10 Sep 2013 16:05:29 +0200
+
+qgis (1.9.0) UNRELEASED; urgency=low
+
+ * new development version 1.9 after branch of 1.8
+ * include ows provider
+ * include wcs provider
+ * symbology-ng-style now in sqlite3
+ * include cpt-city files
+ * support DEB_BUILD_OPTIONS' parallel=n
+ * add python-unittest2 build dependency for maverick and squeeze
+ * disable PyQgsRectangle test on lucid (depends on unittest2)
+ * add python-psycopg2 and python-qscintilla2 dependency to python-qgis
+ * add python-matplotlib dependency to python-qgis-common (for sextante)
+ * add support for ubuntu quantal and raring
+ * remove js files and add libjs-jquery/libjs-underscore dependency
+ * add spatialite qt sql driver
+ * include topology plugin
+ * drop delimited text and diagram overlay plugin (now in core)
+ * drop context_help, function_help and qgis_help.db files
+ * use dh_sip
+ * add build dependency to xfonts (100dpi, 75dpi, scalable) for tests
+ * raise Qt dependency to 4.6
+
+ -- Jürgen E. Fischer <jef at norbit.de> Sat, 27 Jul 2013 16:45:43 +0200
+
+qgis (1.8.0) UNRELEASED; urgency=low
+
+ * new development version 1.8 after branch
+ * include function help in package
+ * include heatmap plugin
+ * drop extra include path for QtWebkit on oneiric and natty
+ * add translations for desktop link
+ * add browser desktop entry
+ * add support for Debian wheezy and Ubuntu precise
+ * build package with internal libspatialite where libspatialite not available
+ * drop support for Ubuntu hardy, intrepid, jaunty and karmic
+ * add mssqlprovider plugin
+ * copyright & policy update (synced from debiangis)
+ * run crssync in postinst
+ * run tests with xvfb and upload to results to (c)dashboard
+ * new development version 1.8 after branch
+ * add qgis browser (qbrowser)
+ * add zonal statistics plugins and globe plugin
+ * migrate unstable package to dh_python2
+ * add ubuntu oneiric
+ * include internal pyspatialite in python-qgis
+ * update watch
+ * drop abi postfix from sqlanywhere plugin
+ * include network analysis library
+ * build package with libspatialindex where available
+ * drop wfsplugin & displaceplugin
+
+ -- Jürgen E. Fischer <jef at norbit.de> Thu, 14 Jun 2012 10:56:27 +0200
+
+ qgis (1.7.4+1.7.5~20120320-1.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Fix FTBFS with gcc 4.7 due to uncoordinated gcc-defaults switch, patch
+ by Steven Chamberlain, thanks! (Closes: #673567)
+ - 10_fix_gcc4.7_build.patch
+ * Set urgency to “high” for the RC bug fix, needed for the gdal
+ transition.
+
+ -- Cyril Brulebois <kibi at debian.org> Tue, 22 May 2012 02:34:43 +0200
+
+ qgis (1.7.4+1.7.5~20120320-1) unstable; urgency=low
+
+ The "Sometimes they come back" release.
+
+ * Branching from Qgis tree and adapting to current Debian Policy and
+ standards. The target tree is currently set to release-1.7.
+ (closes: #661491, #606304, #615683, #616182, #600308)
+ * Policy bumped to 3.9.3.
+ * Moving to debhelper compatibility level 9.
+ * Source format is now 3.0 with quilt support.
+ * Merged with 2bf42287 upstream git snapshot.
+ * Migrated to dh_python2 instead of python-central.
+ (closes: #617048)
+ * Snapshot in qgis.org release-1.7: c936d031
+ * Added an automagic creation of a lintian override for sqlite embedding.
+ This is required for uploading currently.
+ * Added missing ${misc:Depends} to make lintian happy.
+ * Copyright notes updated and debian/copyright moved to format 1.0.
+ * More licenses notices now reported in debian/copyright. Thanks ftpmasters.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Tue, 24 Apr 2012 15:12:20 +0200
+
+ qgis (1.7.4-1) UNRELEASED; urgency=low
+
+ * new upstream bugfix release
+
+ -- Jürgen E. Fischer <jef at norbit.de> Sun, 19 Feb 2012 22:35:23 +0100
+
+ qgis (1.7.3-1) UNRELEASED; urgency=low
+
+ * new upstream bugfix release
+
+ -- Jürgen E. Fischer <jef at norbit.de> Sat, 10 Dec 2011 17:17:57 +0100
+
+ qgis (1.7.2-1) UNRELEASED; urgency=low
+
+ * new upstream bugfix release
+
+ -- Jürgen E. Fischer <jef at norbit.de> Wed, 16 Nov 2011 21:43:47 +0100
+
qgis (1.7.0) UNRELEASED; urgency=low
* new development version 1.7 after branch
@@@ -81,7 -73,7 +132,7 @@@ qgis (1.6.0) UNRELEASED; urgency=lo
* add subversion as build dependency for trunk
* add qgis-mapserver package
* trim dependencies
-
+
-- Jürgen E. Fischer <jef at norbit.de> Sun, 17 Oct 2010 12:09:23 +0200
qgis (1.5.0) UNRELEASED; urgency=low
@@@ -150,7 -142,7 +201,7 @@@ qgis (1.1.0-4) UNRELEASED; urgency=lo
qgis (1.1.0-3) UNRELEASED; urgency=low
- * include diagram overlays
+ * include diagram overlays
-- Jürgen E. Fischer <jef at norbit.de> Wed, 08 Apr 2009 16:30:57 +0200
@@@ -186,10 -178,10 +237,10 @@@ qgis (1.1.0) UNRELEASED; urgency=lo
-- Jürgen E. Fischer <jef at norbit.de> Fri, 13 Feb 2009 22:03:25 +0100
qgis (1.0.0) experimental; urgency=low
-
+
* new upstream release
* update qgis.mime
- * add qgis.desktop and qgis.xml
+ * add qgis.desktop and qgis.xml
* add mime types for KDE
* don't ignore errors in preinst and postrm
* run ldconfig in postrm
@@@ -290,7 -282,7 +341,7 @@@ qgis (0.11.0test3) experimental; urgenc
qgis (0.11.0test2) experimental; urgency=low
- * removed 'upstream' changes from changelog
+ * removed 'upstream' changes from changelog
* policy update 3.7.2 to 3.7.3
* python support: renamed qgis-python-plugin to python-qgis, moved to python
section, added Python:Provides
@@@ -310,13 -302,13 +361,13 @@@ qgis (0.11.0test1) experimental; urgenc
-- Jürgen E. Fischer <jef at norbit.de> Thu, 29 May 2008 00:23:14 +0200
qgis (0.10.0-2) gutsy; urgency=low
-
+
* fix libgdal1 grass dependency for ubuntu gutsy/hardy (1.4.0 | 1.5.0)
-- Jürgen E. Fischer <jef at norbit.de> Wed, 30 Apr 2008 22:35:42 +0200
qgis (0.10.0-1) gutsy; urgency=low
-
+
* updated Maintainer field
* updated version for sip build dependency and removed old libgdal<1.5
dependencies.
@@@ -334,7 -326,7 +385,7 @@@ qgis (0.10.0) gutsy; urgency=lo
qgis (0.9.2test1) gutsy; urgency=low
- * Testing package to see if icons deploy
+ * Testing package to see if icons deploy
-- Tim Sutton <tim at linfiniti.com> Tue, 12 Feb 2008 21:18:35 -0200
@@@ -352,7 -344,7 +403,7 @@@ qgis (0.9.1) gutsy; urgency=lo
qgis (0.9.0) gutsy; urgency=low
- * Quantum GIS 0.9.0 'Ganymede' release
+ * Quantum GIS 0.9.0 'Ganymede' release
-- Tim Sutton <tim at linfiniti.com> Tue, 28 Aug 2007 22:43:41 -0300
@@@ -383,7 -375,7 +434,7 @@@ qgis (0.8.1-1) UNRELEASED; urgency=lo
qgis (0.8.0-5) unstable; urgency=low
- * Added python-dev build-dep.
+ * Added python-dev build-dep.
Patch added: ax_python.dpatch, fixes python environment detection.
(closes: #429234)
* Added build-dep for autoconf/automake due to acinclude.m4 changes.
@@@ -519,7 -511,7 +570,7 @@@ qgis (0.6.0-1) unstable; urgency=lo
qgis (0.5.0-2) unstable; urgency=low
- * Fix typos in .install files that left out the delimitedtext plugin
+ * Fix typos in .install files that left out the delimitedtext plugin
(Closes: #282084)
-- Steve Halasz <debian at adkgis.org> Fri, 19 Nov 2004 10:51:07 -0500
@@@ -565,7 -557,7 +616,7 @@@ qgis (0.2.0-1) unstable; urgency=lo
qgis (0.1-2) unstable; urgency=low
- * Build with the Shapefile to PostGIS Import Tool (SPIT) and
+ * Build with the Shapefile to PostGIS Import Tool (SPIT) and
PostgreSQL support (Closes: #233191)
-- Steve Halasz <debian at adkgis.org> Wed, 7 Apr 2004 09:18:34 -0400
@@@ -573,7 -565,7 +624,7 @@@
qgis (0.1-1) unstable; urgency=low
* New upstream release
- * changed install location of html documentation to /usr/share/doc/qgis
+ * changed install location of html documentation to /usr/share/doc/qgis
* updated man page to describe new command-line options and include pointers
to HTML and PDF documentation (Closes: #234600)
* debian/control:
diff --combined debian/control
index 34572e7,c0fd299..4b2f281
--- a/debian/control
+++ b/debian/control
@@@ -1,11 -1,12 +1,12 @@@
Source: qgis
Section: science
Priority: extra
- Maintainer: QGIS developers <qgis-developer at lists.osgeo.org>
+ Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
+ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
Build-Depends:
bison,
- cmake (>= 2.6),
+ cmake (>= 2.8),
- debhelper (>= 5.0.51~),
+ debhelper (>= 9),
flex,
grass-dev,
libexpat1-dev,
@@@ -14,55 -15,63 +15,68 @@@
libgeos-dev (>= 3.0.0),
libgsl0-dev,
libpq-dev,
- libqt4-dev (>=4.4.0),
+ libproj-dev,
- libqt4-dev (>=4.4.0),
++ libqt4-dev (>=4.6.0),
++ libqt4-opengl-dev,
+ libqtwebkit-dev,
- libqwt5-qt4-dev,
+ libqwt5-qt4-dev | libqwt-dev,
+ libspatialite-dev,
libsqlite3-dev,
- proj (<< 4.7.0) | libproj-dev (>= 4.7.0),
++ libspatialindex-dev,
+ pkg-config,
pyqt4-dev-tools,
python,
- python-central (>=0.5),
- python-dev,
+ python-dev (>= 2.6.6-3~),
+ python-qt4 (>=4.1.0),
python-qt4-dev (>=4.1.0),
- python-sip-dev (>= 4.5.0) | python-sip4-dev (>= 4.5.0) | sip4 (>= 4.5),
- git-core | git,
- txt2tags,
+ python-sip (>= 4.5.0),
+ python-sip-dev (>= 4.5.0),
- subversion,
- doxygen,
++ libosgearth-dev,
++ libopenscenegraph-dev,
++ git,
+ doxygen
+ graphviz,
- txt2tags
++ txt2tags,
++ xvfb, xauth,
++ xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable
Build-Conflicts: libqgis-dev, qgis-dev
- Standards-Version: 3.8.4
- XS-Python-Version: current
+ Standards-Version: 3.9.3
+ X-Python-Version: current
Homepage: http://qgis.org/
+ Vcs-Git: git://git.debian.org/git/pkg-grass/qgis.git
+ Vcs-Browser: https://alioth.debian.org/
Package: qgis
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
Recommends: qgis-plugin-grass, python-qgis
Suggests: gpsbabel
- Conflicts: uim-qt3
+ Conflicts: uim-qt3, qgis (<= 1.6.0~)
Description: Geographic Information System (GIS)
A Geographic Information System (GIS) manages, analyzes, and displays
- databases of geographic information. Quantum GIS (QGIS) supports shape file
- viewing and editing, spatial data storage with PostgreSQL/PostGIS, projection
- on-the-fly, map composition, and a number of other features via a plugin
- interface. QGIS also supports display of various georeferenced raster and
- Digital Elevation Model (DEM) formats including GeoTIFF, Arc/Info ASCII Grid,
- and USGS ASCII DEM.
+ databases of geographic information. QGIS supports shape file viewing and
+ editing, spatial data storage with PostgreSQL/PostGIS, projection on-the-fly,
+ map composition, and a number of other features via a plugin interface. QGIS
+ also supports display of various georeferenced raster and Digital Elevation
+ Model (DEM) formats including GeoTIFF, Arc/Info ASCII Grid, and USGS ASCII
+ DEM.
Package: qgis-common
Architecture: all
-Depends: ${misc:Depends}
-Description: Quantum GIS - architecture-independent data
- Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
- and display databases of geographic information.
+Description: QGIS - architecture-independent data
+ QGIS is a Geographic Information System (GIS) which manages, analyzes and
+ display databases of geographic information.
.
This package contains architecture-independent supporting data files for use
- with Quantum GIS.
+ with QGIS.
-Package: libqgis1.7.5
+Package: libqgis1.8.0
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: qgis (<=0.9.2rc1), libqgis-core1, libqgis-gui1, libqgis0, libqgis1
-Description: Quantum GIS - shared libraries
- Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
- and display databases of geographic information.
+Description: QGIS - shared libraries
+ QGIS is a Geographic Information System (GIS) which manages, analyzes and
+ display databases of geographic information.
.
This package contains the shared core and gui library that provide an
interface for plugins and stand-alone applications.
@@@ -78,51 -87,56 +92,56 @@@ Depends
libgsl0-dev,
libpq-dev,
libproj-dev,
- libqgis1.7.5 (= ${binary:Version}),
+ libqgis1.8.0 (= ${binary:Version}),
libqt4-dev (>=4.4.0),
libsqlite3-dev,
python-qt4 (>=4.1.0),
python-qt4-dev (>=4.1.0),
- qt4-designer (>=4.4.0)
+ qt4-designer (>=4.4.0), ${misc:Depends}
Provides: qgis-dev
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
-Description: Quantum GIS - development files
- Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
- and display databases of geographic information.
+Description: QGIS - development files
+ QGIS is a Geographic Information System (GIS) which manages, analyzes and
+ display databases of geographic information.
.
This package contains the headers and libraries needed to develop plugins for
- Quantum GIS.
+ QGIS.
Package: qgis-plugin-grass
Architecture: any
- Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, grass
-Depends:
- qgis (= ${binary:Version}),
- qgis-plugin-grass-common (= ${source:Version}),
- ${shlibs:Depends}, ${misc:Depends},
- grass642
-Description: GRASS plugin for Quantum GIS
- Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
- and display databases of geographic information.
++Depends:
++ qgis (= ${binary:Version}),
++ qgis-plugin-grass-common (= ${source:Version}),
++ ${shlibs:Depends},
++ ${misc:Depends},
++ grass
+Description: GRASS plugin for QGIS
+ QGIS is a Geographic Information System (GIS) which manages, analyzes and
+ display databases of geographic information.
.
- This plugin enables GRASS data access in the Quantum GIS geographic data
- viewer.
+ This plugin enables GRASS data access in the QGIS geographic data viewer.
Package: qgis-plugin-grass-common
Architecture: all
- Depends: python
+ Depends: python, ${misc:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
-Description: GRASS plugin for Quantum GIS - architecture-independent data
- Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
- and display databases of geographic information.
+Description: GRASS plugin for QGIS - architecture-independent data
+ QGIS is a Geographic Information System (GIS) which manages, analyzes and
+ display databases of geographic information.
.
This package contains architecture-independent supporting data files for use
- with the Quantum GIS GRASS plugin.
+ with the QGIS GRASS plugin.
Package: python-qgis
Section: python
Architecture: any
- Depends: python-qt4 (>=4.1.0), python-sip4 (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+ Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}),
+ ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
Provides: ${python:Provides}
- XB-Python-Version: ${python:Versions}
-Description: Python bindings to Quantum GIS
- Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
- and display databases of geographic information.
+Description: Python bindings to QGIS
+ QGIS is a Geographic Information System (GIS) which manages, analyzes and
+ display databases of geographic information.
.
This package contains the files for the Python support.
@@@ -130,42 -144,63 +149,67 @@@ Package: python-qgis-commo
Section: python
Architecture: all
Provides: ${python:Provides}
- Depends: gdal-bin, python-gdal, python-matplotlib
- XB-Python-Version: ${python:Versions}
-Depends: gdal-bin, python-gdal, ${misc:Depends}
-Description: Python bindings to Quantum GIS - architecture-independent files
- Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
- and display databases of geographic information.
++Depends: gdal-bin,
++ python-gdal,
++ python-matplotlib,
++ ${python:Depends},
++ ${misc:Depends},
++ ${sip:Depends}
+Description: Python bindings to QGIS - architecture-independent files
+ QGIS is a Geographic Information System (GIS) which manages, analyzes and
+ display databases of geographic information.
.
- This package contains architecture-independent files for the Quantum GIS
- Python bindings.
+ This package contains architecture-independent files for the QGIS Python
+ bindings.
Package: qgis-providers
Architecture: any
- Depends: qgis-providers-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Depends: qgis-providers-common (= ${source:Version}), ${shlibs:Depends},
++Depends: qgis-providers-common (= ${source:Version}),
++ ${shlibs:Depends},
+ ${misc:Depends}
Replaces: qgis (<= 1.6)
Breaks: qgis (<= 1.6)
-Description: collection of data providers to Quantum GIS
- Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
- and display databases of geographic information.
+Description: collection of data providers to QGIS
+ QGIS is a Geographic Information System (GIS) which manages, analyzes and
+ display databases of geographic information.
.
- This package contains the provider plugins for Quantum GIS.
+ This package contains the provider plugins for QGIS.
Package: qgis-providers-common
Architecture: all
Replaces: qgis-common (<= 1.6)
Breaks: qgis-common (<= 1.6)
+ Depends: ${misc:Depends}
-Description: collection of data providers to Quantum GIS - architecture-independent files
- Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
- and display databases of geographic information.
+Description: collection of data providers to QGIS - architecture-independent files
+ QGIS is a Geographic Information System (GIS) which manages, analyzes and
+ display databases of geographic information.
.
- This package contains architecture-independent files for the Quantum GIS
- providers.
+ This package contains architecture-independent files for the QGIS providers.
Package: qgis-mapserver
Architecture: any
-Depends: qgis-providers (= ${binary:Version}), ${shlibs:Depends},
- ${misc:Depends}
-Description: Quantum GIS mapserver
- Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
+Depends: qgis-providers (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: QGIS mapserver
+ QGIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
.
- This package contains the Quantum GIS mapserver.
+ This package contains the QGIS mapserver.
+ Package: qgis-sqlanywhere1.7.5
+ Architecture: any
+ Depends: ${shlibs:Depends}, ${misc:Depends}
+ Description: Quantum GIS sql anywhere plugin and provider
+ Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
+ and display databases of geographic information.
+ .
+ This package contains the Quantum GIS sqlanywhere plugin and provider.
+
+ Package: qgis-api-doc
+ Architecture: all
+ Depends: ${misc:Depends}
+ Description: Quantum GIS API documentation
+ Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
+ and display databases of geographic information.
+ .
+ This package contains the Quantum GIS API documentation.
+
diff --combined debian/copyright
index 6525c06,926ef97..792379c
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,7 -1,7 +1,7 @@@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Quantum GIS
+Upstream-Name: QGIS
Upstream-Contact: qgis-developer at lists.osgeo.org
--Source: git://github.com/qgis/Quantum-GIS.git
++Source: git://github.com/qgis/QGIS.git
Files: *
Comment: The upstream contributors are listed in the PROVENANCE file
@@@ -38,44 -38,44 +38,17 @@@ Copyright: Gary E.Sherman <sherman at mrc
Werner Macho <werner.macho at gmail.com>
Giuseppe Sucameli <brush.tyler at gmail.com>
Alessandro Furieri <a.furieri at lqt.it>
- 2008 Paolo L. Scala, Barbara Rita Barricelli, Marco Padula
+ 2008 Paolo L. Scala, Barbara Rita Barricelli, Marco Padula
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
-- published by the Free Software Foundation; either version 2 of
-- the License, or (at your option) any later version.
-
- 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 complete text of the GNU General Public
- License can be found in the /usr/share/common-licenses/GPL-2 file.
- .
- 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 complete text of the GNU General Public
- License can be found in the /usr/share/common-licenses/GPL-2 file.
Files: python/pyspatialite/*
Copyright: 2004-2007 Gerhard Häring <gh at ghaering.de>
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.
-- .
-- 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.
Files: src/plugins/dxf2shp_converter/builder.cpp
Copyright: 1999, Frank Warmerdam <warmerda at pobox.com>
Comment: The code is heavily based on Christopher Michaelis' DXF to
- Shapefile Converter (http://www.wanderingidea.com/content/view/12/25/),
+ Shapefile Converter (http://www.wanderingidea.com/content/view/12/25/),
released under GPL License
.
This code is based on two other products:
@@@ -84,26 -84,26 +57,6 @@@
SHAPELIB (http://shapelib.maptools.org/)
Used for the Shapefile functionality.
License: Expat
-- Permission is hereby granted, free of charge, to any person obtaining a copy
-- of this software and associated
-- documentation files (the "Software"), to deal in the Software without
-- restriction, including without limitation
-- the rights to use, copy, modify, merge, publish, distribute, sublicense,
-- and/or sell copies of the Software,
-- and to permit persons to whom the Software is furnished to do so, subject to
-- the following conditions:
-- .
-- The above copyright notice and this permission notice shall be included in
-- all copies or substantial portions of the Softwa
-- .
-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTY
-- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-- NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDER
-- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-- CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-- IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-- SOFTWARE.
Files: src/core/gps/config.h
src/core/gps/context.c
@@@ -125,12 -125,12 +78,166 @@@
Copyright: Tim <xtimor at gmail.com>
License: LGPL-2+
--Files: src/plugins/dxf2shp_converter/shapelib-1.2.10/*
++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
++License: LGPL-2+
++
++Files: src/plugins/dxf2shp_converter/shapelib-1.2.10/shpopen.c
++Copyright: 1999, 2001, Frank Warmerdam
++License: LGPL-2+
++
++Files: src/plugins/dxf2shp_converter/shapelib-1.2.10/shprewind.c
++Copyright: 2002, Frank Warmerdam
License: LGPL-2+
Files: src/providers/sqlanywhere/sqlanyconnection/sacapi/*
Copyright: 2008-2010 iAnywhere Solutions, Inc.
--License: Apache
++License: Apache-2.0
++
++Files: cmake/PythonCompile.py
++Copyright: Simon Edwards <simon at simonzone.com>
++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/FindLibPython.py
++ cmake/FindPyQt.py
++ cmake/FindSIP.py
++Copyright: 2007, Simon Edwards <simon at simonzone.com>
++License: BSD-3-Clause
++
++Files: cmake/FindQsci.py
++Copyright: 2012, Larry Shaffer <larry at dakotacarto.com>
++ 2012, The QGIS Project'
++License: BSD-3-Clause
++
++Files: cmake/Bison.cmake
++ cmake/FindExpat.cmake
++ cmake/FindGRASS.cmake
++ cmake/FindPostgres.cmake
++ cmake/FindProj.cmake
++ cmake/FindSqlite3.cmake
++ cmake/Flex.cmake
++Copyright: 2007, Martin Dobias <wonder.sk at gmail.com>
++License: BSD-3-Clause
++
++Files: cmake/FindGDAL.cmake
++Copyright: 2007, Magnus Homann <magnus at homann dot se>
++License: BSD-3-Clause
++
++Files: cmake/FindGEOS.cmake
++Copyright: 2008, Mateusz Loskot <mateusz at loskot.net>
++Comment: based on FindGDAL.cmake by Magnus Homann
++License: BSD-3-Clause
++
++Files: cmake/FindGSL.cmake
++Copyright: 2004, Felix Woelk
++ Jan Woetzel
++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/FindPyQt4.cmake
++Copyright: 2007-2008, Simon Edwards <simon at simonzone.com>
++License: BSD-3-Clause
++
++Files: cmake/FindPythonLibrary.cmake
++ cmake/FindSIP.cmake
++ cmake/PythonMacros.cmake
++ cmake/SIPMacros.cmake
++Copyright: 2007, Simon Edwards <simon at simonzone.com>
++License: BSD-3-Clause
++
++Files: cmake/FindQextserialport.cmake
++ cmake/FindQwtPolar.cmake
++ cmake/Txt2Tags.cmake
++Copyright: 2011, Jürgen E. Fischer <jef at norbit.de>
++License: BSD-3-Clause
++
++Files: cmake/FindQGIS.cmake
++Copyright: Tim Sutton
++License: BSD-3-Clause
++
++Files: cmake/FindQwt.cmake
++Copyright: 2010, Tim Sutton <tim at linfiniti.com>
++License: BSD-3-Clause
++
++Files: cmake/FindQsci.cmake
++ cmake/QsciAPI.cmake
++Copyright: 2012, Larry Shaffer <larrys at dakotacarto.com>
++License: BSD-3-Clause
++
++Files: cmake/FindQScintilla.cmake
++Copyright: 2007 Thomas Moenicke thomas.moenicke at kdemail.net
++License: BSD-3-Clause
++
++Files: cmake/FindSPATIALITE.cmake
++Copyright: 2009, Sandro Furieri <a.furieri at lqt.it>
++License: BSD-3-Clause
++
++Files: cmake/UsePythonTest.cmake
++Copyright: 2006-2010 Mathieu Malaterre <mathieu.malaterre at gmail.com>
++License: BSD-3-Clause
++
++Files: cmake/FindFcgi.cmake
++Copyright: 2010, Marco Hugentobler
++License: BSD-3-Clause
++
++Files: cmake/FindOSGEARTH.cmake
++Copyright: 2011-2013, Pirmin Kalberer
++ 2011, Jürgen E. Fischer <jef at norbit.de>
++ 2013, William Kyngesburye
++License: BSD-3-Clause
++
++Files: cmake/MacBundleMacros.cmake
++Copyright: 2010-2013, William Kyngesburye
++ 2012, Larry Shaffer
++License: BSD-3-Clause
++
++Files: cmake/MacPlistMacros.cmake
++Copyright: 2011, William Kyngesburye
++License: BSD-3-Clause
++
++Files: resources/cpt-city-qgis-min/cb/*
++Copyright: 2002, Cynthia Brewer, Pennsylvania State University
++ 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
++
++Files: resources/cpt-city-qgis-min/grass/*
++Copyright: GRASS Development Team
++License: GPL-2+
++
++Files: images/themes/gis/*
++Copyright: 2011, Robert Szczepanek
++ Anita Graser
++License: CC-BY-SA-3.0
++
++Files: python/plugins/GdalTools
++Copyright: 2009 Faunalia
++License: Expat
++
++Files: python/plugins/fTools
++Copyright: 2009 Carson J.Q. Farmer
++License: Expat
++
++Files: python/plugins/plugin_installer
++Copyright: 2007 Matthew T. Perry
++ 2008-2009 Borys Jurgiel
++License: Expat
++
++Files: src/app/gps/qwtpolar/*
++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.
You may obtain a copy of the License at
@@@ -147,13 -147,13 +254,52 @@@
While not a requirement of the license, if you do modify this file, we
would appreciate hearing about it. Please email
sqlany_interfaces at sybase.com
++ .
++ On Debian systems, the complete text of the Apache License version 2
++ an be found in the `/usr/share/common-licenses/Apache-2.0' file.
--Files: cmake/PythonCompile.py
--Copyright: Simon Edwards <simon at simonzone.com>
--License: public-domain
++License: Apache-Style-Software-License-Version-1.1
++ Apache-Style Software License for ColorBrewer software and ColorBrewer
++ Color Schemes
++ .
++ Version 1.1
++ .
++ Copyright (c) 2002 Cynthia Brewer, Mark Harrower, and The Pennsylvania
++ State University. All rights reserved.
++ .
++ Redistribution and use in source and binary forms, with or without
++ modification, are permitted provided that the following conditions are met:
++ .
++ 1. Redistributions as source code must retain the above copyright notice,
++ this list of conditions and the following disclaimer.
++ .
++ 2. The end-user documentation included with the redistribution, if any,
++ must include the following acknowledgment:
++ .
++ "This product includes color specifications and designs developed by
++ Cynthia Brewer (http://colorbrewer.org/)."
++ .
++ Alternately, this acknowledgment may appear in the software
++ itself, if and wherever such third-party acknowledgments normally appear.
++ .
++ 4. The name "ColorBrewer" must not be used to endorse or promote products derived
++ from this software without prior written permission. For written permission, please
++ contact Cynthia Brewer at cbrewer at psu.edu.
++ .
++ 5. Products derived from this software may not be called "ColorBrewer", nor may "ColorBrewer"
++ appear in their name, without prior written permission of Cynthia Brewer.
++ .
++ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED 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 CYNTHIA BREWER, MARK HARROWER, OR THE
++ PENNSYLVANIA STATE UNIVERSITY 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.
--Files: cmake/*.cmake
--License: BSD
++License: BSD-3-Clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
@@@ -177,12 -177,137 +323,120 @@@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- Files: resources/cpt-city-qgis-min/cb/*
- Copyright: 2002 Cynthia Brewer, Mark Harrower, and The Pennsylvania State University
- License: Apache-Style Software License Version 1.1
- This product includes color specifications and designs developed by
- Cynthia Brewer (http://colorbrewer.org/).
-Files: src/core/spatialindex/include/LineSegment.h
- src/core/spatialindex/include/Point.h
- src/core/spatialindex/include/PointerPool.h
- src/core/spatialindex/include/PoolPointer.h
- src/core/spatialindex/include/RTree.h
- src/core/spatialindex/include/Region.h
- src/core/spatialindex/include/SmartPointer.h
- src/core/spatialindex/include/SpatialIndex.h
- src/core/spatialindex/include/TemporaryFile.h
- src/core/spatialindex/include/Tools.h
-Copyright: 2004, Navel Ltd.
-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 complete text of the GNU Lesser General Public
- License can be found in the /usr/share/common-licenses/LGPL-2.1 file.
-
-Files: images/themes/gis/*
-Copyright: 2011, Robert Szczepanek
- Anita Graser
+ License: CC-BY-SA-3.0
+ 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.
+
-Files: python/plugins/GdalTools
-Copyright: 2009 Faunalia
-License: Expat
- Permission is hereby granted, free of charge, to any person obtaining a copy of
- this software and associated documentation files (the "Software"), to deal in
- the Software without restriction, including without limitation the rights to
- use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- of the Software, and to permit persons to whom the Software is furnished to do
- so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in all
- copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.
-
-Files: python/plugins/fTools
-Copyright: 2009 Carson J.Q. Farmer
+ License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy of
+ this software and associated documentation files (the "Software"), to deal in
+ the Software without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ of the Software, and to permit persons to whom the Software is furnished to do
+ so, subject to the following conditions:
-
++ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
-
++ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+
-Files: python/plugins/plugin_installer
-Copyright: 2007 Matthew T. Perry
- 2008-2009 Borys Jurgiel
-License: Expat
- Permission is hereby granted, free of charge, to any person obtaining a copy of
- this software and associated documentation files (the "Software"), to deal in
- the Software without restriction, including without limitation the rights to
- use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- of the Software, and to permit persons to whom the Software is furnished to do
- so, subject to the following conditions:
++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
++ published by the Free Software Foundation; either version 2 of
++ the License, or (at your option) any later version.
++ .
++ 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 complete text of the GNU General Public
++ License can be found in the `/usr/share/common-licenses/GPL-2' file.
+
- The above copyright notice and this permission notice shall be included in all
- copies or substantial portions of the Software.
++License: LGPL-2+
++ This library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Library General Public
++ License as published by the Free Software Foundation; either
++ version 2 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
++ Library General Public License for more details.
++ .
++ 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.
+
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.
++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 complete text of the GNU Lesser General Public
++ License can be found in the `/usr/share/common-licenses/LGPL-2.1' file.
+
-Files: src/app/gps/qwtpolar/*
-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
+ The Qwt library and included programs are provided under the terms
+ of the GNU LESSER GENERAL PUBLIC LICENSE (LGPL) with the following
+ exceptions:
+ .
+ 1. Widgets that are subclassed from Qwt widgets do not
+ constitute a derivative work.
+ .
+ 2. Static linking of applications and widgets to the
+ Qwt library does not constitute a derivative work
+ and does not require the author to provide source
+ code for the application or widget, use the shared
+ Qwt libraries, or link their applications or
+ widgets against a user-supplied version of Qwt.
+ .
+ If you link the application or widget to a modified
+ version of Qwt, then the changes to Qwt must be
+ provided under the terms of the LGPL in sections
+ 1, 2, and 4.
+ .
+ 3. You do not have to provide a copy of the Qwt license
+ with programs that are linked to the Qwt library, nor
+ do you have to identify the Qwt license in your
+ program or documentation as required by section 6
+ of the LGPL.
+ .
+ However, programs must still identify their use of Qwt.
+ The following example statement can be included in user
+ documentation to satisfy this requirement:
+ .
+ [program/widget] is based in part on the work of
+ 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.
++ .
++ 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.
+
- Files: resources/cpt-city-qgis-min/grass/*
- Copyright: GRASS Development Team
- License: GPL-2
diff --combined debian/rules
index 185608a,8d06757..6fb559d
--- a/debian/rules
+++ b/debian/rules
@@@ -8,31 -8,16 +8,35 @@@
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-DISTRIBUTION := $(shell dpkg-parsechangelog --format rfc822 | sed -ne "s/^Distribution: //p")
-ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"lenny squeeze hardy intrepid jaunty karmic lucid maverick natty"))
+DEB_TEST_TARGET ?= Experimental
+
+ifeq (,$(DISTRIBUTION))
+ DISTRIBUTION := $(shell dpkg-parsechangelog --format rfc822 | sed -ne "s/^Distribution: //p")
+endif
+
+ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"squeeze wheezy lucid maverick natty oneiric precise quantal raring sid-oracle"))
- DISTRIBUTION := sid
+ ifneq (0,$(shell cat debian/control.debiangis 2>/dev/null|wc -l))
+ DISTRIBUTION := debiangis
+ else
+ DISTRIBUTION := sid
+ endif
endif
+DEB_BUILD_NAME ?= $(DISTRIBUTION)-$(DEB_BUILD_ARCH)
+
+ifeq (,$(DISPLAY))
+TESTMAKE=xvfb-run -a -n 1 -s "-screen 0 1280x1024x24 -dpi 96" $(MAKE)
+else
+TESTMAKE=$(MAKE)
+endif
+ifneq (,$(findstring $(DISTRIBUTION),"lucid"))
+# excludes tests requiring unittest2 not available on lucid
+TESTMAKE += ARGS="-E PyQgsRectangle"
+endif
+
+
QGIS_MAJOR=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_MAJOR "\([0-9]*\)")/\1/p' CMakeLists.txt)
QGIS_MINOR=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_MINOR "\([0-9]*\)")/\1/p' CMakeLists.txt)
QGIS_PATCH=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_PATCH "\([0-9]*\)")/\1/p' CMakeLists.txt)
@@@ -41,82 -26,42 +45,82 @@@ GRASS_ABI=$(subst .,,$(shell pkg-confi
GRASS=grass$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2))
CMAKE_OPTS := \
- -D GRASS_PREFIX=/usr/lib/$(GRASS) \
+ -D BUILDNAME=$(DEB_BUILD_NAME) \
+ -D GRASS_PREFIX=/usr/lib/grass64 \
-D CMAKE_INSTALL_PREFIX=/usr \
- -D CMAKE_SKIP_RPATH=TRUE \
-D BINDINGS_GLOBAL_INSTALL=TRUE \
-D PEDANTIC=TRUE \
- -D WITH_SPATIALITE=TRUE \
+ -D WITH_QSPATIALITE=TRUE \
-D WITH_MAPSERVER=TRUE \
+ -D MAPSERVER_SKIP_ECW=TRUE \
-D QGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
-D WITH_APIDOC=TRUE
-ifneq (,$(findstring $(DISTRIBUTION),"natty"))
- CMAKE_OPTS += -D QT_QTWEBKIT_INCLUDE_DIR=/usr/include/QtWebKit
+MAKEFLAGS += VERBOSE=YES
+
+ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid"))
+ CMAKE_OPTS += -D WITH_STAGED_PLUGINS=FALSE
+endif
+
+ifeq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric"))
+ DEB_BUILD_MULTIARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
+ QT_PLUGIN_DIR = usr/lib/$(DEB_BUILD_MULTIARCH)/qt4/plugins
+else
+ QT_PLUGIN_DIR = usr/lib/qt4/plugins
+endif
+
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ MAKEFLAGS += -j$(NUMJOBS)
+endif
+
+ifneq (,$(findstring $(DISTRIBUTION),"squeeze wheezy sid lucid maverick natty oneiric precise raring"))
+ CMAKE_OPTS += -D WITH_PYSPATIALITE=TRUE
endif
-#ifeq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty sid"))
+ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric"))
CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=TRUE
-#else
-# CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=FALSE
-#endif
+endif
+
+ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric sid"))
+ CMAKE_OPTS += -D WITH_GLOBE=FALSE
+else
+ CMAKE_OPTS += -D WITH_GLOBE=TRUE
+endif
+
+ifneq (,$(findstring $(DISTRIBUTION),"raring sid sid-oracle"))
+ CMAKE_OPTS += -D PYTHON_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpython2.7.so
+endif
+
+ifneq (,$(findstring -oracle,$(DISTRIBUTION)))
+ CMAKE_OPTS += -D WITH_ORACLE=TRUE
+endif
-ifneq (,$(findstring $(DISTRIBUTION),"hardy intrepid"))
-LDFLAGS += -Wl,--as-needed -Wl,--no-undefined
+ifneq (,$(findstring $(DISTRIBUTION),"wheezy sid"))
+CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
+CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
+LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
endif
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
+ CXXFLAGS += -O0
else
CFLAGS += -O2
+ CXXFLAGS += -O2
endif
+
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CMAKE_OPTS += -D CMAKE_BUILD_TYPE=Debug -D ENABLE_TESTS=TRUE
- MAKEFLAGS += VERBOSE=YES
+ CMAKE_OPTS += -D CMAKE_BUILD_TYPE=Debug
+endif
+
+ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ CMAKE_OPTS += -D ENABLE_TESTS=FALSE
endif
ifneq (,$(findstring profile,$(DEB_BUILD_OPTIONS)))
@@@ -128,51 -73,35 +132,51 @@@ endi
define gentemplate
$(2): $(1)
sed \
+ -e "s/{DEB_BUILD_GNU_TYPE}/$(DEB_BUILD_GNU_TYPE)/g" \
+ -e "s#{QT_PLUGIN_DIR}#$(QT_PLUGIN_DIR)#g" \
-e "s/{QGIS_ABI}/$(QGIS_ABI)/g" \
-e "s/{GRASS}/$(GRASS)/g" \
-e "s/{GRASS_ABI}/$(GRASS_ABI)/g" $$^ >$$@
+templates:: $(2)
+
templateclean::
rm -f $(2)
endef
$(foreach t,$(wildcard debian/*.in debian/*.$(DISTRIBUTION)),$(eval $(call gentemplate,$(t),$(basename $(t)))))
$(foreach t,$(wildcard debian/*{QGIS_ABI}*),$(eval $(call gentemplate,$(t),$(subst {QGIS_ABI},$(QGIS_ABI),$(t)))))
-debian/build/CMakeCache.txt: $(TEMPLATES) CMakeLists.txt
+debian/build/CMakeCache.txt: templates CMakeLists.txt
dh_testdir
# Add here commands to configure the package.
[ -d debian/build ] || mkdir debian/build
[ ! -e CMakeCache.txt ] || rm CMakeCache.txt
- cd debian/build; cmake $(CMAKE_OPTS) ../..
+ cd debian/build; CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" cmake $(CMAKE_OPTS) ../..
build: build-stamp
build-stamp: debian/build/CMakeCache.txt
dh_testdir
+ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid"))
+ perl -0777 -i.bak -pe 's/^%Module\(name=(.*),\s*version=(\d+),\s*keyword_arguments="Optional"\s*\)/%Module $$1 $$2/m;' python/core/core.sip python/gui/gui.sip python/analysis/analysis.sip python/analysis/network/networkanalysis.sip
+endif
+
# Add here commands to compile the package.
$(MAKE) -C debian/build
+ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid"))
+ for i in python/core/core.sip python/gui/gui.sip python/analysis/analysis.sip python/analysis/network/networkanalysis.sip; do mv $$i.bak $$i; done
+endif
+
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ # Code to run the package test suite - and ignore the outcome for now
+ -LD_LIBRARY_PATH=$(PWD)/debian/build/output/lib:$(LD_LIBRARY_PATH) $(TESTMAKE) -C debian/build $(DEB_TEST_TARGET)
+else
+ @echo Skipping tests.
+endif
+
touch $@
cleantemplates:
@@@ -194,16 -123,16 +198,16 @@@ clean: cleantemplate
install: build
dh_testdir
dh_testroot
-ifneq (,$(findstring $(DISTRIBUTION),"lenny hardy"))
- dh_clean -k
-else
dh_prep
-endif
dh_installdirs
# Add here commands to install the package into debian/tmp.
$(MAKE) -C debian/build install DESTDIR=$(CURDIR)/debian/tmp
+ # remove unwanted files
+ ! [ -f debian/tmp/usr/share/qgis/doc/api/installdox ] || rm debian/tmp/usr/share/qgis/doc/api/installdox
+ ! [ -f debian/tmp/usr/share/qgis/doc/api/jquery.js ] || ln -sf /usr/share/javascript/jquery/jquery.js debian/tmp/usr/share/qgis/doc/api/jquery.js
+
# Install menu pixmap
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps
@@@ -218,32 -147,29 +222,35 @@@ binary-indep: build instal
binary-arch: build install
dh_testdir
dh_testroot
- dh_installchangelogs CHANGELOG
+ dh_installchangelogs ChangeLog
dh_installdocs
dh_installexamples
dh_install --sourcedir=debian/tmp
install -o root -g root -m 755 -d $(CURDIR)/debian/qgis/usr/bin
install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qgis $(CURDIR)/debian/qgis/usr/bin
+ install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qbrowser $(CURDIR)/debian/qgis/usr/bin
install -o root -g root -m 755 -d $(CURDIR)/debian/qgis-plugin-grass/usr/bin
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qgis
+ install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qbrowser
- dh_python2
+ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"natty oneiric"))
+ dh_sip
+endif
+ifneq (,$(findstring $(DISTRIBUTION),"wheezy sid quantal raring"))
+ dh_python2 --no-guessing-versions
+else
+ dh_pycentral
+endif
dh_installmenu
dh_icons
-ifneq (,$(findstring $(DISTRIBUTION),"lenny hardy"))
- dh_desktop
-endif
- dh_installman -pqgis qgis.1
+ dh_installman -pqgis qgis.1 qbrowser.1
dh_installmime -pqgis
dh_link
+ # create lintian overrides file
+ echo "libqgis$(QGIS_ABI): embedded-library usr/lib/libqgis_core.so.$(QGIS_ABI): sqlite" \
+ >$(CURDIR)/debian/libqgis$(QGIS_ABI).lintian-overrides
if which dh_lintian >/dev/null; then dh_lintian; fi
dh_strip
dh_compress --exclude=pdf
--
The Quantum GIS in Debian project
More information about the Pkg-grass-devel
mailing list