The following commit has been merged in the debian branch: commit 2a42395adb30b028a79d08a39a5cee058fb060c4 Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Tue Mar 20 14:14:09 2012 +0100
Fixed a blocking error in lintian for embedded sqlite. diff --git a/debian/changelog b/debian/changelog index 5a079e7..9528d3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,11 @@ qgis (1.7.4+1.7.5~20120320-1) unstable; urgency=low * 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. - -- Francesco Paolo Lovergine <fran...@debian.org> Wed, 07 Mar 2012 15:50:28 +0100 + -- Francesco Paolo Lovergine <fran...@debian.org> Tue, 20 Mar 2012 14:12:55 +0100 qgis (1.7.4-1) UNRELEASED; urgency=low diff --git a/debian/control b/debian/control index d9e8702..7eb7e50 100644 --- a/debian/control +++ b/debian/control @@ -57,6 +57,7 @@ Description: Geographic Information System (GIS) 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. @@ -91,7 +92,7 @@ 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: Quantum GIS - development files @@ -103,7 +104,11 @@ Description: Quantum GIS - development files Package: qgis-plugin-grass Architecture: any -Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, grass641 +Depends: + qgis (= ${binary:Version}), + qgis-plugin-grass-common (= ${source:Version}), + ${shlibs:Depends}, ${misc:Depends}, + grass641 Description: GRASS plugin for Quantum GIS Quantum GIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. @@ -113,7 +118,7 @@ Description: GRASS plugin for Quantum GIS 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 @@ -126,7 +131,8 @@ Description: GRASS plugin for Quantum GIS - 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}), ${shlibs:Depends}, ${misc:Depends}, ${python: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} Description: Python bindings to Quantum GIS Quantum GIS is a Geographic Information System (GIS) which manages, analyzes @@ -138,7 +144,7 @@ Package: python-qgis-common Section: python Architecture: all Provides: ${python:Provides} -Depends: gdal-bin, python-gdal +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. @@ -148,7 +154,8 @@ Description: Python bindings to Quantum GIS - architecture-independent files Package: qgis-providers Architecture: any -Depends: qgis-providers-common (= ${source:Version}), ${shlibs:Depends}, ${misc: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 @@ -161,6 +168,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 Quantum GIS - architecture-independent files Quantum GIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. @@ -170,7 +178,8 @@ Description: collection of data providers to Quantum GIS - architecture-independ Package: qgis-mapserver Architecture: any -Depends: qgis-providers (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: qgis-providers (= ${binary:Version}), ${shlibs:Depends}, + ${misc:Depends} Description: Quantum GIS mapserver Quantum GIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. @@ -188,6 +197,7 @@ Description: Quantum GIS sql anywhere 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. diff --git a/debian/control.debiangis b/debian/control.debiangis index 45e22cb..92af061 100644 --- a/debian/control.debiangis +++ b/debian/control.debiangis @@ -57,6 +57,7 @@ Description: Geographic Information System (GIS) 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. @@ -91,7 +92,7 @@ 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: Quantum GIS - development files @@ -103,7 +104,11 @@ Description: Quantum GIS - development files Package: qgis-plugin-grass Architecture: any -Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, grass{GRASS_ABI} +Depends: + qgis (= ${binary:Version}), + qgis-plugin-grass-common (= ${source:Version}), + ${shlibs:Depends}, ${misc:Depends}, + grass{GRASS_ABI} Description: GRASS plugin for Quantum GIS Quantum GIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. @@ -113,7 +118,7 @@ Description: GRASS plugin for Quantum GIS 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 @@ -126,7 +131,8 @@ Description: GRASS plugin for Quantum GIS - 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}), ${shlibs:Depends}, ${misc:Depends}, ${python: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} Description: Python bindings to Quantum GIS Quantum GIS is a Geographic Information System (GIS) which manages, analyzes @@ -138,7 +144,7 @@ Package: python-qgis-common Section: python Architecture: all Provides: ${python:Provides} -Depends: gdal-bin, python-gdal +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. @@ -148,7 +154,8 @@ Description: Python bindings to Quantum GIS - architecture-independent files Package: qgis-providers Architecture: any -Depends: qgis-providers-common (= ${source:Version}), ${shlibs:Depends}, ${misc: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 @@ -161,6 +168,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 Quantum GIS - architecture-independent files Quantum GIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. @@ -170,7 +178,8 @@ Description: collection of data providers to Quantum GIS - architecture-independ Package: qgis-mapserver Architecture: any -Depends: qgis-providers (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: qgis-providers (= ${binary:Version}), ${shlibs:Depends}, + ${misc:Depends} Description: Quantum GIS mapserver Quantum GIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. @@ -188,6 +197,7 @@ Description: Quantum GIS sql anywhere 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. diff --git a/debian/rules b/debian/rules index a843690..8d06757 100755 --- a/debian/rules +++ b/debian/rules @@ -167,6 +167,9 @@ endif dh_installman -pqgis qgis.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 _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel