From fa0444fbcd60e3a899d8fda6e993324fb9ccc121 Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Fri, 31 May 2013 01:08:49 +0200 Subject: [PATCH] debian packaging update --- debian/changelog | 29 +++++++++++++++-------------- debian/control.lucid | 28 +++++++++++++++++----------- debian/control.maverick | 17 ++++++++++++----- debian/control.natty | 16 +++++++++++----- debian/control.oneiric | 16 +++++++++++----- debian/control.precise | 15 ++++++++++----- debian/control.quantal | 16 +++++++++++----- debian/control.raring | 17 +++++++++++------ debian/control.sid | 28 +++++++++++++++++----------- debian/control.sid-oracle | 16 +++++++++++----- debian/control.squeeze | 17 +++++++++++------ debian/control.wheezy | 17 +++++++++++------ debian/rules | 3 +++ 13 files changed, 151 insertions(+), 84 deletions(-) diff --git a/debian/changelog b/debian/changelog index ee3b1094a53..e0560e28441 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,8 +16,9 @@ qgis (1.9.0) UNRELEASED; urgency=low * include topology plugin * drop delimited text plugin (now in core) * drop context_help, function_help and qgis_help.db files + * use dh_sip - -- Jürgen E. Fischer Sat, 18 May 2013 10:19:16 +0200 + -- Jürgen E. Fischer Sun, 02 Jun 2013 11:52:24 +0200 qgis (1.8.0) UNRELEASED; urgency=low @@ -72,7 +73,7 @@ qgis (1.6.0) UNRELEASED; urgency=low * add subversion as build dependency for trunk * add qgis-mapserver package * trim dependencies - + -- Jürgen E. Fischer Sun, 17 Oct 2010 12:09:23 +0200 qgis (1.5.0) UNRELEASED; urgency=low @@ -141,7 +142,7 @@ qgis (1.1.0-4) UNRELEASED; urgency=low qgis (1.1.0-3) UNRELEASED; urgency=low - * include diagram overlays + * include diagram overlays -- Jürgen E. Fischer Wed, 08 Apr 2009 16:30:57 +0200 @@ -177,10 +178,10 @@ qgis (1.1.0) UNRELEASED; urgency=low -- Jürgen E. Fischer 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 @@ -281,7 +282,7 @@ qgis (0.11.0test3) experimental; urgency=low 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 @@ -301,13 +302,13 @@ qgis (0.11.0test1) experimental; urgency=low -- Jürgen E. Fischer 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 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. @@ -325,7 +326,7 @@ qgis (0.10.0) gutsy; urgency=low qgis (0.9.2test1) gutsy; urgency=low - * Testing package to see if icons deploy + * Testing package to see if icons deploy -- Tim Sutton Tue, 12 Feb 2008 21:18:35 -0200 @@ -343,7 +344,7 @@ qgis (0.9.1) gutsy; urgency=low qgis (0.9.0) gutsy; urgency=low - * Quantum GIS 0.9.0 'Ganymede' release + * Quantum GIS 0.9.0 'Ganymede' release -- Tim Sutton Tue, 28 Aug 2007 22:43:41 -0300 @@ -374,7 +375,7 @@ qgis (0.8.1-1) UNRELEASED; urgency=low 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. @@ -510,7 +511,7 @@ qgis (0.6.0-1) unstable; urgency=low 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 Fri, 19 Nov 2004 10:51:07 -0500 @@ -556,7 +557,7 @@ qgis (0.2.0-1) unstable; urgency=low 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 Wed, 7 Apr 2004 09:18:34 -0400 @@ -564,7 +565,7 @@ qgis (0.1-2) unstable; urgency=low 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 --git a/debian/control.lucid b/debian/control.lucid index 8025a013b8f..501269ecf50 100644 --- a/debian/control.lucid +++ b/debian/control.lucid @@ -18,8 +18,8 @@ Build-Depends: libqt4-dev (>=4.4.0), libqwt5-qt4-dev, libspatialite-dev, - libspatialindex-dev, libsqlite3-dev, + libspatialindex-dev, pkg-config, pyqt4-dev-tools, python, @@ -47,15 +47,16 @@ Suggests: gpsbabel Conflicts: uim-qt3 Description: Geographic Information System (GIS) A Geographic Information System (GIS) manages, analyzes, and displays - databases of geographic information. QGIS (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: QGIS - architecture-independent data QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. @@ -90,7 +91,8 @@ Depends: 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: QGIS - development files @@ -111,7 +113,7 @@ Description: GRASS plugin for QGIS Package: qgis-plugin-grass-common Architecture: all -Depends: ${python:Depends} +Depends: python, ${python:Depends}, ${misc:Depends} Replaces: qgis-common (<< 1.5) Breaks: qgis-common (<< 1.5) Description: GRASS plugin for QGIS - architecture-independent data @@ -124,7 +126,9 @@ Description: GRASS plugin for QGIS - architecture-independent data Package: python-qgis Section: python Architecture: any -Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-qscintilla2, python-psycopg2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), + python-psycopg2, python-qscintilla2, + ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, ${sip:Depends} Provides: ${python:Provides} XB-Python-Version: ${python:Versions} Description: Python bindings to QGIS @@ -137,7 +141,7 @@ Package: python-qgis-common Section: python Architecture: all Provides: ${python:Provides} -Depends: gdal-bin, python-gdal, python-matplotlib, libjs-jquery, ${python:Depends} +Depends: gdal-bin, python-gdal, python-matplotlib, ${python:Depends}, ${misc:Depends}, ${sip:Depends} XB-Python-Version: ${python:Versions} Description: Python bindings to QGIS - architecture-independent files QGIS is a Geographic Information System (GIS) which manages, analyzes and @@ -161,6 +165,7 @@ 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 QGIS - architecture-independent files QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. @@ -195,3 +200,4 @@ Description: QGIS API documentation display databases of geographic information. . This package contains the QGIS API documentation. + diff --git a/debian/control.maverick b/debian/control.maverick index 96723f58622..d734c716034 100644 --- a/debian/control.maverick +++ b/debian/control.maverick @@ -19,8 +19,8 @@ Build-Depends: libqtwebkit-dev, libqwt5-qt4-dev, libspatialite-dev, - libspatialindex-dev, libsqlite3-dev, + libspatialindex-dev, pkg-config, pyqt4-dev-tools, python, @@ -58,6 +58,7 @@ Description: Geographic Information System (GIS) Package: qgis-common Architecture: all +Depends: ${misc:Depends} Description: QGIS - architecture-independent data QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. @@ -92,7 +93,8 @@ Depends: 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: QGIS - development files @@ -113,7 +115,7 @@ Description: GRASS plugin for QGIS Package: qgis-plugin-grass-common Architecture: all -Depends: ${python:Depends} +Depends: python, ${python:Depends}, ${misc:Depends} Replaces: qgis-common (<< 1.5) Breaks: qgis-common (<< 1.5) Description: GRASS plugin for QGIS - architecture-independent data @@ -126,7 +128,9 @@ Description: GRASS plugin for QGIS - architecture-independent data Package: python-qgis Section: python Architecture: any -Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-psycopg2, python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), + python-psycopg2, python-qscintilla2, + ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, ${sip:Depends} Provides: ${python:Provides} XB-Python-Version: ${python:Versions} Description: Python bindings to QGIS @@ -139,7 +143,7 @@ Package: python-qgis-common Section: python Architecture: all Provides: ${python:Provides} -Depends: gdal-bin, python-gdal, python-matplotlib, ${python:Depends} +Depends: gdal-bin, python-gdal, python-matplotlib, ${python:Depends}, ${misc:Depends}, ${sip:Depends} XB-Python-Version: ${python:Versions} Description: Python bindings to QGIS - architecture-independent files QGIS is a Geographic Information System (GIS) which manages, analyzes and @@ -163,6 +167,7 @@ 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 QGIS - architecture-independent files QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. @@ -191,8 +196,10 @@ Description: QGIS sql anywhere plugin and provider Package: qgis-api-doc Architecture: all Section: doc +Depends: libjs-jquery Description: QGIS API documentation QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. . This package contains the QGIS API documentation. + diff --git a/debian/control.natty b/debian/control.natty index d0a3dafa458..f4469598872 100644 --- a/debian/control.natty +++ b/debian/control.natty @@ -19,8 +19,8 @@ Build-Depends: libqtwebkit-dev, libqwt5-qt4-dev, libspatialite-dev, - libspatialindex-dev, libsqlite3-dev, + libspatialindex-dev, pkg-config, pyqt4-dev-tools, python, @@ -57,6 +57,7 @@ Description: Geographic Information System (GIS) Package: qgis-common Architecture: all +Depends: ${misc:Depends} Description: QGIS - architecture-independent data QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. @@ -91,7 +92,8 @@ Depends: 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: QGIS - development files @@ -112,7 +114,7 @@ Description: GRASS plugin for QGIS Package: qgis-plugin-grass-common Architecture: all -Depends: ${python:Depends} +Depends: python, ${python:Depends}, ${misc:Depends} Replaces: qgis-common (<< 1.5) Breaks: qgis-common (<< 1.5) Description: GRASS plugin for QGIS - architecture-independent data @@ -125,7 +127,9 @@ Description: GRASS plugin for QGIS - architecture-independent data Package: python-qgis Section: python Architecture: any -Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-psycopg2, python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), + python-psycopg2, python-qscintilla2, + ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, ${sip:Depends} Provides: ${python:Provides} XB-Python-Version: ${python:Versions} Description: Python bindings to QGIS @@ -138,7 +142,7 @@ Package: python-qgis-common Section: python Architecture: all Provides: ${python:Provides} -Depends: gdal-bin, python-gdal, python-matplotlib, ${python:Depends} +Depends: gdal-bin, python-gdal, python-matplotlib, ${python:Depends}, ${misc:Depends}, ${sip:Depends} XB-Python-Version: ${python:Versions} Description: Python bindings to QGIS - architecture-independent files QGIS is a Geographic Information System (GIS) which manages, analyzes and @@ -162,6 +166,7 @@ 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 QGIS - architecture-independent files QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. @@ -190,6 +195,7 @@ Description: QGIS sql anywhere plugin and provider Package: qgis-api-doc Architecture: all Section: doc +Depends: libjs-jquery Description: QGIS API documentation QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. diff --git a/debian/control.oneiric b/debian/control.oneiric index 9f915eea86f..facd4657313 100644 --- a/debian/control.oneiric +++ b/debian/control.oneiric @@ -19,8 +19,8 @@ Build-Depends: libqtwebkit-dev, libqwt5-qt4-dev, libspatialite-dev, - libspatialindex-dev, libsqlite3-dev, + libspatialindex-dev, pkg-config, pyqt4-dev-tools, python, @@ -57,6 +57,7 @@ Description: Geographic Information System (GIS) Package: qgis-common Architecture: all +Depends: ${misc:Depends} Description: QGIS - architecture-independent data QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. @@ -91,7 +92,8 @@ Depends: 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: QGIS - development files @@ -112,7 +114,7 @@ Description: GRASS plugin for QGIS Package: qgis-plugin-grass-common Architecture: all -Depends: ${python:Depends} +Depends: python, ${python:Depends}, ${misc:Depends} Replaces: qgis-common (<< 1.5) Breaks: qgis-common (<< 1.5) Description: GRASS plugin for QGIS - architecture-independent data @@ -125,7 +127,9 @@ Description: GRASS plugin for QGIS - architecture-independent data Package: python-qgis Section: python Architecture: any -Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-psycopg2, python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), + python-psycopg2, python-qscintilla2, + ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, ${sip:Depends} Provides: ${python:Provides} XB-Python-Version: ${python:Versions} Description: Python bindings to QGIS @@ -138,7 +142,7 @@ Package: python-qgis-common Section: python Architecture: all Provides: ${python:Provides} -Depends: gdal-bin, python-gdal, python-matplotlib, ${python:Depends} +Depends: gdal-bin, python-gdal, python-matplotlib, ${python:Depends}, ${misc:Depends}, ${sip:Depends} XB-Python-Version: ${python:Versions} Description: Python bindings to QGIS - architecture-independent files QGIS is a Geographic Information System (GIS) which manages, analyzes and @@ -162,6 +166,7 @@ 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 QGIS - architecture-independent files QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. @@ -190,6 +195,7 @@ Description: QGIS sql anywhere plugin and provider Package: qgis-api-doc Architecture: all Section: doc +Depends: libjs-jquery Description: QGIS API documentation QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. diff --git a/debian/control.precise b/debian/control.precise index dc68b5fc1d8..6b4a0d7b034 100644 --- a/debian/control.precise +++ b/debian/control.precise @@ -46,7 +46,7 @@ Homepage: http://qgis.org/ Package: qgis Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version}) -Recommends: qgis-plugin-globe, qgis-plugin-grass, python-qgis +Recommends: qgis-plugin-grass, python-qgis, qgis-plugin-globe Suggests: gpsbabel Conflicts: uim-qt3 Description: Geographic Information System (GIS) @@ -60,6 +60,7 @@ Description: Geographic Information System (GIS) Package: qgis-common Architecture: all +Depends: ${misc:Depends} Description: QGIS - architecture-independent data QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. @@ -94,7 +95,8 @@ Depends: 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: QGIS - development files @@ -115,7 +117,7 @@ Description: GRASS plugin for QGIS Package: qgis-plugin-grass-common Architecture: all -Depends: ${python:Depends} +Depends: python, ${python:Depends}, ${misc:Depends} Replaces: qgis-common (<< 1.5) Breaks: qgis-common (<< 1.5) Description: GRASS plugin for QGIS - architecture-independent data @@ -128,7 +130,9 @@ Description: GRASS plugin for QGIS - architecture-independent data Package: python-qgis Section: python Architecture: any -Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-psycopg2, python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), + python-psycopg2, python-qscintilla2, + ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, ${sip:Depends} Provides: ${python:Provides} XB-Python-Version: ${python:Versions} Description: Python bindings to QGIS @@ -141,7 +145,7 @@ Package: python-qgis-common Section: python Architecture: all Provides: ${python:Provides} -Depends: gdal-bin, python-gdal, python-matplotlib, libjs-jquery, libjs-underscore, ${python:Depends} +Depends: gdal-bin, python-gdal, python-matplotlib, ${python:Depends}, ${misc:Depends}, ${sip:Depends} XB-Python-Version: ${python:Versions} Description: Python bindings to QGIS - architecture-independent files QGIS is a Geographic Information System (GIS) which manages, analyzes and @@ -165,6 +169,7 @@ 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 QGIS - architecture-independent files QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. diff --git a/debian/control.quantal b/debian/control.quantal index 6ff47a38cfe..8b97c133b31 100644 --- a/debian/control.quantal +++ b/debian/control.quantal @@ -39,13 +39,13 @@ Build-Depends: xvfb, xauth, xfonts-base Build-Conflicts: libqgis-dev, qgis-dev Standards-Version: 3.9.3 -X-Python-Version: current +XS-Python-Version: current Homepage: http://qgis.org/ Package: qgis Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version}) -Recommends: qgis-plugin-globe, qgis-plugin-grass, python-qgis +Recommends: qgis-plugin-grass, python-qgis, qgis-plugin-globe Suggests: gpsbabel Conflicts: uim-qt3 Description: Geographic Information System (GIS) @@ -116,7 +116,7 @@ Description: GRASS plugin for QGIS Package: qgis-plugin-grass-common Architecture: all -Depends: python, ${misc:Depends} +Depends: python, ${python:Depends}, ${misc:Depends} Replaces: qgis-common (<< 1.5) Breaks: qgis-common (<< 1.5) Description: GRASS plugin for QGIS - architecture-independent data @@ -129,7 +129,12 @@ Description: GRASS plugin for QGIS - architecture-independent data Package: python-qgis Section: python Architecture: any -Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-pyspatialite, python-psycopg2, python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), + python-psycopg2, python-qscintilla2, + python-pyspatialite, + ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, ${sip:Depends} +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} Description: Python bindings to QGIS QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. @@ -140,7 +145,8 @@ Package: python-qgis-common Section: python Architecture: all Provides: ${python:Provides} -Depends: gdal-bin, python-gdal, python-matplotlib, libjs-jquery, libjs-underscore, ${misc:Depends} +Depends: gdal-bin, python-gdal, python-matplotlib, ${python:Depends}, ${misc:Depends}, ${sip:Depends} +XB-Python-Version: ${python:Versions} Description: Python bindings to QGIS - architecture-independent files QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. diff --git a/debian/control.raring b/debian/control.raring index 454cf65e255..f61f04706ed 100644 --- a/debian/control.raring +++ b/debian/control.raring @@ -27,11 +27,11 @@ Build-Depends: python, python-central (>=0.5), python-dev, + libpython2.7-dev, python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0), python-sip (>= 4.5.0), python-sip-dev (>= 4.5.0), - libpython2.7-dev, libosgearth-dev, libopenscenegraph-dev, git, @@ -47,7 +47,7 @@ Homepage: http://qgis.org/ Package: qgis Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version}) -Recommends: qgis-plugin-globe, qgis-plugin-grass, python-qgis +Recommends: qgis-plugin-grass, python-qgis, qgis-plugin-globe Suggests: gpsbabel Conflicts: uim-qt3 Description: Geographic Information System (GIS) @@ -61,6 +61,7 @@ Description: Geographic Information System (GIS) Package: qgis-common Architecture: all +Depends: ${misc:Depends} Description: QGIS - architecture-independent data QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. @@ -95,7 +96,8 @@ Depends: 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: QGIS - development files @@ -116,7 +118,7 @@ Description: GRASS plugin for QGIS Package: qgis-plugin-grass-common Architecture: all -Depends: ${python:Depends} +Depends: ${python:Depends}, ${misc:Depends} Replaces: qgis-common (<< 1.5) Breaks: qgis-common (<< 1.5) Description: GRASS plugin for QGIS - architecture-independent data @@ -129,7 +131,9 @@ Description: GRASS plugin for QGIS - architecture-independent data Package: python-qgis Section: python Architecture: any -Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-psycopg2, python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), + python-psycopg2, python-qscintilla2, + ${python:Depends}, ${misc:Depends}, ${sip:Depends} Provides: ${python:Provides} XB-Python-Version: ${python:Versions} Description: Python bindings to QGIS @@ -142,7 +146,7 @@ Package: python-qgis-common Section: python Architecture: all Provides: ${python:Provides} -Depends: gdal-bin, python-gdal, python-matplotlib, libjs-jquery, libjs-underscore, ${python:Depends} +Depends: gdal-bin, python-gdal, python-matplotlib, ${python:Depends}, ${misc:Depends}, ${sip:Depends} XB-Python-Version: ${python:Versions} Description: Python bindings to QGIS - architecture-independent files QGIS is a Geographic Information System (GIS) which manages, analyzes and @@ -166,6 +170,7 @@ 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 QGIS - architecture-independent files QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. diff --git a/debian/control.sid b/debian/control.sid index 265b038665b..8b97c133b31 100644 --- a/debian/control.sid +++ b/debian/control.sid @@ -39,23 +39,23 @@ Build-Depends: xvfb, xauth, xfonts-base Build-Conflicts: libqgis-dev, qgis-dev Standards-Version: 3.9.3 -X-Python-Version: current +XS-Python-Version: current Homepage: http://qgis.org/ Package: qgis Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version}) -Recommends: qgis-plugin-globe, qgis-plugin-grass, python-qgis +Recommends: qgis-plugin-grass, python-qgis, qgis-plugin-globe Suggests: gpsbabel Conflicts: uim-qt3 Description: Geographic Information System (GIS) A Geographic Information System (GIS) manages, analyzes, and displays - 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. + 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 @@ -116,7 +116,7 @@ Description: GRASS plugin for QGIS Package: qgis-plugin-grass-common Architecture: all -Depends: python, ${misc:Depends} +Depends: python, ${python:Depends}, ${misc:Depends} Replaces: qgis-common (<< 1.5) Breaks: qgis-common (<< 1.5) Description: GRASS plugin for QGIS - architecture-independent data @@ -129,7 +129,12 @@ Description: GRASS plugin for QGIS - architecture-independent data Package: python-qgis Section: python Architecture: any -Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-pyspatialite, python-psycopg2, python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), + python-psycopg2, python-qscintilla2, + python-pyspatialite, + ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, ${sip:Depends} +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} Description: Python bindings to QGIS QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. @@ -140,7 +145,8 @@ Package: python-qgis-common Section: python Architecture: all Provides: ${python:Provides} -Depends: gdal-bin, python-gdal, python-matplotlib, libjs-jquery, libjs-underscore, ${misc:Depends} +Depends: gdal-bin, python-gdal, python-matplotlib, ${python:Depends}, ${misc:Depends}, ${sip:Depends} +XB-Python-Version: ${python:Versions} Description: Python bindings to QGIS - architecture-independent files QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. diff --git a/debian/control.sid-oracle b/debian/control.sid-oracle index 90e176458d2..6d28152fbb4 100644 --- a/debian/control.sid-oracle +++ b/debian/control.sid-oracle @@ -40,13 +40,13 @@ Build-Depends: oracle-instantclient11.2-devel Build-Conflicts: libqgis-dev, qgis-dev Standards-Version: 3.9.3 -X-Python-Version: current +XS-Python-Version: current Homepage: http://qgis.org/ Package: qgis Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version}) -Recommends: qgis-plugin-globe, qgis-plugin-grass, python-qgis +Recommends: qgis-plugin-grass, python-qgis, qgis-plugin-globe Suggests: gpsbabel Conflicts: uim-qt3 Description: Geographic Information System (GIS) @@ -117,7 +117,7 @@ Description: GRASS plugin for QGIS Package: qgis-plugin-grass-common Architecture: all -Depends: python, ${misc:Depends} +Depends: python, ${python:Depends}, ${misc:Depends} Replaces: qgis-common (<< 1.5) Breaks: qgis-common (<< 1.5) Description: GRASS plugin for QGIS - architecture-independent data @@ -130,7 +130,12 @@ Description: GRASS plugin for QGIS - architecture-independent data Package: python-qgis Section: python Architecture: any -Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-pyspatialite, python-psycopg2, python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), + python-psycopg2, python-qscintilla2, + python-pyspatialite, + ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, ${sip:Depends} +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} Description: Python bindings to QGIS QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. @@ -141,7 +146,8 @@ Package: python-qgis-common Section: python Architecture: all Provides: ${python:Provides} -Depends: gdal-bin, python-gdal, python-matplotlib, libjs-jquery, libjs-underscore, ${misc:Depends} +Depends: gdal-bin, python-gdal, python-matplotlib, ${python:Depends}, ${misc:Depends}, ${sip:Depends} +XB-Python-Version: ${python:Versions} Description: Python bindings to QGIS - architecture-independent files QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. diff --git a/debian/control.squeeze b/debian/control.squeeze index 95fd18caecd..2ce83320727 100644 --- a/debian/control.squeeze +++ b/debian/control.squeeze @@ -57,6 +57,7 @@ Description: Geographic Information System (GIS) Package: qgis-common Architecture: all +Depends: ${misc:Depends} Description: QGIS - architecture-independent data QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. @@ -91,7 +92,8 @@ Depends: 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: QGIS - development files @@ -112,7 +114,7 @@ Description: GRASS plugin for QGIS Package: qgis-plugin-grass-common Architecture: all -Depends: ${python:Depends} +Depends: python, ${python:Depends}, ${misc:Depends} Replaces: qgis-common (<< 1.5) Breaks: qgis-common (<< 1.5) Description: GRASS plugin for QGIS - architecture-independent data @@ -125,12 +127,14 @@ Description: GRASS plugin for QGIS - architecture-independent data Package: python-qgis Section: python Architecture: any -Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-psycopg2, python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), + python-psycopg2, python-qscintilla2, + ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, ${sip:Depends} Provides: ${python:Provides} XB-Python-Version: ${python:Versions} Description: Python bindings to QGIS - QGIS is a Geographic Information System (GIS) which manages, analyzes - and display databases of geographic information. + 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. @@ -138,7 +142,7 @@ Package: python-qgis-common Section: python Architecture: all Provides: ${python:Provides} -Depends: gdal-bin, python-gdal, python-matplotlib, libjs-jquery, ${python:Depends} +Depends: gdal-bin, python-gdal, python-matplotlib, ${python:Depends}, ${misc:Depends}, ${sip:Depends} XB-Python-Version: ${python:Versions} Description: Python bindings to QGIS - architecture-independent files QGIS is a Geographic Information System (GIS) which manages, analyzes and @@ -162,6 +166,7 @@ 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 QGIS - architecture-independent files QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. diff --git a/debian/control.wheezy b/debian/control.wheezy index 836dca975c3..aed173683f2 100644 --- a/debian/control.wheezy +++ b/debian/control.wheezy @@ -39,13 +39,13 @@ Build-Depends: xvfb, xauth, xfonts-base Build-Conflicts: libqgis-dev, qgis-dev Standards-Version: 3.9.3 -X-Python-Version: current +XS-Python-Version: current Homepage: http://qgis.org/ Package: qgis Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version}) -Recommends: qgis-plugin-globe, qgis-plugin-grass, python-qgis +Recommends: qgis-plugin-grass, python-qgis, qgis-plugin-globe Suggests: gpsbabel Conflicts: uim-qt3 Description: Geographic Information System (GIS) @@ -116,7 +116,7 @@ Description: GRASS plugin for QGIS Package: qgis-plugin-grass-common Architecture: all -Depends: python, ${misc:Depends} +Depends: python, ${python:Depends}, ${misc:Depends} Replaces: qgis-common (<< 1.5) Breaks: qgis-common (<< 1.5) Description: GRASS plugin for QGIS - architecture-independent data @@ -129,8 +129,11 @@ Description: GRASS plugin for QGIS - architecture-independent data Package: python-qgis Section: python Architecture: any -Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-psycopg2, python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), + python-psycopg2, python-qscintilla2, + ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, ${sip:Depends} Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} Description: Python bindings to QGIS QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. @@ -141,7 +144,8 @@ Package: python-qgis-common Section: python Architecture: all Provides: ${python:Provides} -Depends: gdal-bin, python-gdal, python-matplotlib, libjs-jquery, libjs-underscore, ${misc:Depends} +Depends: gdal-bin, python-gdal, python-matplotlib, ${python:Depends}, ${misc:Depends}, ${sip:Depends} +XB-Python-Version: ${python:Versions} Description: Python bindings to QGIS - architecture-independent files QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. @@ -205,7 +209,8 @@ Architecture: any Depends: qgis (= ${binary:Version}), qgis-plugin-globe-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} Description: OSG globe plugin for QGIS QGIS is a Geographic Information System (GIS) which manages, analyzes and - display databases of geographic information. . + display databases of geographic information. + . This plugin enables 3D viewing using OSG globe in the QGIS. Package: qgis-plugin-globe-common diff --git a/debian/rules b/debian/rules index a798f94ab5d..be3914d852f 100755 --- a/debian/rules +++ b/debian/rules @@ -228,6 +228,9 @@ binary-arch: build install 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 +ifneq (,$(findstring $(DISTRIBUTION),"squeeze wheezy lucid maverick precise quantal raring sid sid-oracle")) + dh_sip +endif ifneq (,$(findstring $(DISTRIBUTION),"wheezy sid quantal raring")) dh_python2 --no-guessing-versions else