Index: debian/control =================================================================== --- debian/control (revision 13867) +++ debian/control (working copy) @@ -3,13 +3,13 @@ Priority: extra Maintainer: Quantum GIS developers Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev, - libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj (<< 4.7.0) | libproj-dev (>= 4.7.0), libexpat1-dev, - flex, bison, python-dev, cmake (>= 2.6), python-sip4 (>= 4.5.0), python-central (>=0.5), python, - sip4 (>= 4.5), libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0), - libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0), + libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, + flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python, + sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), + libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0), python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev Build-Conflicts: libqgis-dev, qgis-dev -Standards-Version: 3.8.4 +Standards-Version: 3.8.0 XS-Python-Version: current Homepage: http://qgis.org/ @@ -30,7 +30,7 @@ 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. @@ -54,11 +54,12 @@ Section: libdevel Depends: libqgis1.5.0 (= ${binary:Version}), libgdal1-dev, libpq-dev, libgeos-dev (>= 3.0.0), grass-dev, - libsqlite3-dev, libgsl0-dev, libproj-dev, libexpat1-dev, libqt4-core (>=4.4.0), - libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0), libqt4-sql (>=4.4.0), - python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0), qt4-designer (>=4.4.0) + libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, libqt4-core (>=4.2.0), + libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0), + libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0), + qt4-designer (>=4.2.0) Provides: qgis-dev -Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev +Replaces: qgis-dev, libqgis1-dev Description: Quantum GIS - development files Quantum GIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. @@ -68,7 +69,7 @@ Package: qgis-plugin-grass Architecture: any -Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, grass640-5+41380 +Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} Description: GRASS plugin for Quantum GIS Quantum GIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. @@ -78,7 +79,7 @@ Package: qgis-plugin-grass-common Architecture: all -Depends: python +Depends: qgis-plugin-grass (>= ${source:Version}), python 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. @@ -89,7 +90,7 @@ Package: python-qgis Section: python Architecture: any -Depends: python-qt4 (>=4.1.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: python-qt4 (>=4.1.0), python-sip4 (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} Provides: ${python:Provides} XB-Python-Version: ${python:Versions} Description: Python bindings to Quantum GIS @@ -101,6 +102,7 @@ Package: python-qgis-common Section: python Architecture: all +Depends: gdal-bin, python-gdal Provides: ${python:Provides} XB-Python-Version: ${python:Versions} Description: Python bindings to Quantum GIS - architecture-independent files Index: debian/qgis-plugin-grass-common.install =================================================================== --- debian/qgis-plugin-grass-common.install (revision 13867) +++ debian/qgis-plugin-grass-common.install (working copy) @@ -4,5 +4,4 @@ usr/share/qgis/grass/modules/*.png usr/share/qgis/grass/modules/*.qgm usr/share/qgis/grass/modules/*.svg -usr/share/qgis/grass/scripts/*.py usr/share/qgis/themes/*/grass Index: debian/changelog =================================================================== --- debian/changelog (revision 13867) +++ debian/changelog (working copy) @@ -1,4 +1,4 @@ -qgis (1.5.0) UNRELEASED; urgency=low +qgis (1.5.0.lenny) lenny; urgency=low * new development version after 1.5 branch * adapted Francesco Paolo Lovergine's updates to Debian qgis 1.4 package Index: debian/rules =================================================================== --- debian/rules (revision 13867) +++ debian/rules (working copy) @@ -23,12 +23,13 @@ CMAKE_OPTS := \ -Wno-dev \ - -D GRASS_PREFIX=/usr/lib/grass64 \ + -D GRASS_PREFIX=/home/hamish/dev/grass/svn/grass65/dist.x86_64-unknown-linux-gnu \ + -D GRASS_INCLUDE_DIR=/home/hamish/dev/grass/svn/grass65/dist.x86_64-unknown-linux-gnu/include \ -D CMAKE_INSTALL_PREFIX=/usr \ -D CMAKE_SKIP_RPATH=TRUE \ -D BINDINGS_GLOBAL_INSTALL=TRUE \ -D PEDANTIC=TRUE \ - -D WITH_SPATIALITE=TRUE + -D WITH_SPATIALITE=FALSE ifeq (,$(findstring $(DISTRIBUTION),"squeeze lucid sid")) CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=TRUE @@ -160,12 +161,14 @@ dh_installmime -pqgis dh_link if which dh_lintian >/dev/null; then dh_lintian; fi - dh_strip + #dh_strip dh_compress --exclude=pdf dh_fixperms dh_makeshlibs dh_installdeb - dh_shlibdeps -l/usr/lib/$(GRASS)/lib + #dh_shlibdeps -l/usr/lib/$(GRASS)/lib + #LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):/home/hamish/dev/grass/svn/grass65/dist.x86_64-unknown-linux-gnu/lib dh_shlibdeps + dh_shlibdeps -l/home/hamish/dev/grass/svn/grass65/dist.x86_64-unknown-linux-gnu/lib dh_gencontrol dh_md5sums dh_builddeb Index: CMakeLists.txt =================================================================== --- CMakeLists.txt (revision 13867) +++ CMakeLists.txt (working copy) @@ -56,7 +56,7 @@ SET (WITH_QWT TRUE CACHE BOOL "Determines whether QWT support should be included (currently used for GPS widget)") -SET (WITH_SPATIALITE TRUE CACHE BOOL "Determines whether SPATIALITE support should be built") +SET (WITH_SPATIALITE FALSE CACHE BOOL "Determines whether SPATIALITE support should be built") IF (WITH_SPATIALITE) SET (WITH_INTERNAL_SPATIALITE TRUE CACHE BOOL "Determines whether SPATIALITE support should be built internally")