diff --git a/debian/control b/debian/control index e58689a806c..0d1090bb4a5 100644 --- a/debian/control +++ b/debian/control @@ -43,7 +43,7 @@ Description: QGIS Geographic Information System - shared library Package: libqgis1-dev Architecture: any -Depends: qgis (= ${Source-Version}), libgdal1-dev , libpq-dev | postgresql-dev, libgeos-dev (>= 2.0.1-1), grass-dev, 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.2.0), python-qt4-dev (>=4.2.0), qt4-designer (>=4.2.0) +Depends: qgis (= ${Source-Version}), libgdal1-dev , libpq-dev | postgresql-dev, libgeos-dev (>= 2.0.1-1), grass-dev, 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.0.0), python-qt4-dev (>=4.0.0), qt4-designer (>=4.2.0) Provides: libqgis-dev Conflicts: libqgis-dev, qgis-dev Replaces: qgis-dev diff --git a/debian/libqgis1.substvars b/debian/libqgis1.substvars index 2fe7cbabbd1..c934dbb6d02 100644 --- a/debian/libqgis1.substvars +++ b/debian/libqgis1.substvars @@ -1 +1 @@ -shlibs:Depends=libc6 (>= 2.3.6-6), libgcc1 (>= 1:4.1.1-12), libgdal1-1.3.2, libgeos2c2a (>= 2.2.3), libqt4-core (>= 4.2.1), libqt4-gui (>= 4.2.1), libqt4-qt3support (>= 4.2.1), libsqlite3-0 (>= 3.3.8), libstdc++6 (>= 4.1.1-12), proj (>= 4.4.1-1) +shlibs:Depends=libc6 (>= 2.5-0ubuntu1), libgcc1 (>= 1:4.1.2), libgdal1-1.3.2, libgeos2c2a (>= 2.2.3), libqt4-core (>= 4.3.0), libqt4-gui (>= 4.3.0), libqt4-qt3support (>= 4.3.0), libsqlite3-0 (>= 3.3.13), libstdc++6 (>= 4.1.2), proj (>= 4.4.1-1) diff --git a/debian/qgis-plugin-grass.substvars b/debian/qgis-plugin-grass.substvars index 636fcc8dec9..bc1d09a781d 100644 --- a/debian/qgis-plugin-grass.substvars +++ b/debian/qgis-plugin-grass.substvars @@ -1 +1 @@ -shlibs:Depends=libc6 (>= 2.3.6-6), libfontconfig1 (>= 2.4.0), libfreetype6 (>= 2.2), libgcc1 (>= 1:4.1.1-12), libgdal1-1.3.2, libgeos2c2a (>= 2.2.3), libice6 (>= 1:1.0.0), libpng12-0 (>= 1.2.13-4), libqt4-core (>= 4.2.1), libqt4-gui (>= 4.2.1), libqt4-qt3support (>= 4.2.1), libsm6, libsqlite3-0 (>= 3.3.8), libstdc++6 (>= 4.1.1-12), libx11-6, libxcursor1 (>> 1.1.2), libxext6, libxinerama1, libxrandr2, libxrender1, proj (>= 4.4.1-1), zlib1g (>= 1:1.2.1) +shlibs:Depends=libc6 (>= 2.5-0ubuntu1), libfontconfig1 (>= 2.4.0), libfreetype6 (>= 2.2), libgcc1 (>= 1:4.1.2), libgdal1-1.3.2, libgeos2c2a (>= 2.2.3), libice6 (>= 1:1.0.0), libpng12-0 (>= 1.2.13-4), libqt4-core (>= 4.3.0), libqt4-gui (>= 4.3.0), libqt4-qt3support (>= 4.3.0), libsm6, libsqlite3-0 (>= 3.3.13), libstdc++6 (>= 4.1.2), libx11-6, libxcursor1 (>> 1.1.2), libxext6, libxi6, libxinerama1, libxrandr2 (>= 2:1.2.0), libxrender1, proj (>= 4.4.1-1), zlib1g (>= 1:1.2.1) diff --git a/debian/qgis.substvars b/debian/qgis.substvars index 8ceecc7c075..1375ef61536 100644 --- a/debian/qgis.substvars +++ b/debian/qgis.substvars @@ -1 +1 @@ -shlibs:Depends=libc6 (>= 2.3.6-6), libexpat1 (>= 1.95.8), libfontconfig1 (>= 2.4.0), libfreetype6 (>= 2.2), libgcc1 (>= 1:4.1.1-12), libgdal1-1.3.2, libgeos2c2a (>= 2.2.3), libgsl0 (>= 1.4), libice6 (>= 1:1.0.0), libpng12-0 (>= 1.2.13-4), libpq4 (>= 8.1.4), libqt4-core (>= 4.2.1), libqt4-gui (>= 4.2.1), libqt4-qt3support (>= 4.2.1), libsm6, libsqlite3-0 (>= 3.3.8), libstdc++6 (>= 4.1.1-12), libx11-6, libxcursor1 (>> 1.1.2), libxext6, libxinerama1, libxrandr2, libxrender1, proj (>= 4.4.1-1), python2.4 (>= 2.3.90), zlib1g (>= 1:1.2.1) +shlibs:Depends=libc6 (>= 2.5-0ubuntu1), libexpat1 (>= 1.95.8), libfontconfig1 (>= 2.4.0), libfreetype6 (>= 2.2), libgcc1 (>= 1:4.1.2), libgdal1-1.3.2, libgeos2c2a (>= 2.2.3), libgsl0 (>= 1.4), libice6 (>= 1:1.0.0), libpng12-0 (>= 1.2.13-4), libpq5, libqt4-core (>= 4.3.0), libqt4-gui (>= 4.3.0), libqt4-qt3support (>= 4.3.0), libsm6, libsqlite3-0 (>= 3.3.13), libstdc++6 (>= 4.1.2), libx11-6, libxcursor1 (>> 1.1.2), libxext6, libxi6, libxinerama1, libxrandr2 (>= 2:1.2.0), libxrender1, proj (>= 4.4.1-1), python2.5 (>= 2.5), zlib1g (>= 1:1.2.1) diff --git a/debian/rules b/debian/rules index 18f63a3a765..6318478ff57 100755 --- a/debian/rules +++ b/debian/rules @@ -29,7 +29,10 @@ CMakeCache.txt: CMakeLists.txt dh_testdir # Add here commands to configure the package. uudecode -o $(CURDIR)/src/plugins/georeferencer/pencil.png $(CURDIR)/debian/pencil.uu - cmake -D CMAKE_INSTALL_PREFIX=/usr -D GDAL_INCLUDE_DIR=/usr/include/gdal . + cmake -D CMAKE_INSTALL_PREFIX=/usr \ + -D GDAL_INCLUDE_DIR=/usr/include/gdal \ + -D GDAL_LIBRARY=/usr/lib/libgdal1.3.2.so \ + . build: patch build-stamp