diff --git a/debian/changelog b/debian/changelog index 67ca8e4b62a..0dcec26caae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,16 +3,15 @@ qgis (1.1.0) UNRELEASED; urgency=low * gridmaker plugin removed from package * updated mime support * sync with debian-gis debian/ tree - - introduce arch-independant qgis-comman and + - introduce arch-independant qgis-common and qgis-plugin-grass-common - policy updated to 3.8.0 - join libqgis1-core and libqgis1-gui to libqgis1 - add debian/watch - dh_lintian overrides - - compat 5=>6 - fix qgis.desktop - fix license reference in copyright - * introduce arch-independant python-qgis-comman + * introduce arch-independant python-qgis-common * added sharedmimeinfo * remove dpatch diff --git a/debian/compat b/debian/compat index 1e8b3149621..7ed6ff82de6 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -6 +5 diff --git a/debian/control b/debian/control index 6bf92688158..6eadfa7d95b 100644 --- a/debian/control +++ b/debian/control @@ -31,7 +31,7 @@ Description: Geographic Information System (GIS) Package: qgis-common Architecture: all -Depends: qgis (= ${binary:Version}) +Depends: qgis (>= ${source:Version}) Description: Quantum GIS - architecture-independent data Quantum GIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. @@ -80,7 +80,7 @@ Description: GRASS plugin for Quantum GIS Package: qgis-plugin-grass-common Architecture: all -Depends: qgis-plugin-grass (= ${binary:Version}) +Depends: qgis-plugin-grass (>= ${source:Version}) 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. @@ -91,7 +91,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data Package: python-qgis Section: python Architecture: any -Depends: python-qt4 (>=4.1.0), ${shlibs:Depends}, ${misc:Depends} +Depends: python-qt4 (>=4.1.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} Provides: ${python:Provides} XB-Python-Version: ${python:Versions} Description: Python bindings to Quantum GIS @@ -103,7 +103,7 @@ Description: Python bindings to Quantum GIS Package: python-qgis-common Section: python Architecture: all -Depends: python-qgis (= ${binary:Version}) +Depends: python-qgis (>= ${source:Version}) Provides: ${python:Provides} XB-Python-Version: ${python:Versions} Description: Python bindings to Quantum GIS - architecture-independent files diff --git a/debian/rules b/debian/rules index d7ad0f14db5..ba79a5b81c2 100755 --- a/debian/rules +++ b/debian/rules @@ -54,7 +54,7 @@ build-stamp: debian/build/CMakeCache.txt # Add here commands to compile the package. $(MAKE) -C debian/build - touch build-stamp + touch $@ clean: dh_testdir @@ -110,7 +110,7 @@ binary-arch: build install dh_installman -pqgis qgis_help.man dh_installmime -pqgis dh_link - dh_lintian + if which dh_lintian >/dev/null; then dh_lintian; fi dh_strip dh_compress --exclude=pdf dh_fixperms