Updated debian packaging stuff so it works with plain ole debian

git-svn-id: http://svn.osgeo.org/qgis/trunk@7175 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Aug 31, 2007 · e499398 · e499398
1 parent 8c6c2d0
commit e499398
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/debian/control b/debian/control
@@ -3,11 +3,11 @@ Section: science
 Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie@debian.org>
-Build-Depends: debhelper (>= 5.0.0), libgdal1-dev, libpq-dev, 
+Build-Depends: debhelper (>= 5.0.0), libgdal1-dev | libgdal1-1.3.2-dev , libpq-dev, 
  libgeos-dev (>= 2.0.1-1), dpatch, grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, 
  flex, bison, python-dev, cmake (>=2.4.3) , python-sip4-dev, python-qt4-dev,
- sharutils, sip4 (>= 4.7), 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)
+ sharutils, sip4 (>= 4.4), 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)
 Standards-Version: 3.7.2
 
 Package: qgis
@@ -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.2.0), python-qt4-dev (>=4.2.0), qt4-designer (>=4.2.0)
 Provides: libqgis-dev
 Conflicts: libqgis-dev, qgis-dev
 Replaces: qgis-dev
@@ -60,7 +60,7 @@ Description: QGIS Geographic Information System - development files
 
 Package: qgis-plugin-grass
 Architecture: any
-Depends: qgis (= ${Source-Version}), libgdal1-1.4.0-grass
+Depends: qgis (= ${Source-Version}), libgdal1-1.4.0-grass | libgdal1-1.3.2-grass
 Description: Plugin for accessing GRASS data from QGIS
  This plugin enables a GRASS data access toolbox in the QGIS
  geographic data viewer.

diff --git a/debian/libqgis1.substvars b/debian/libqgis1.substvars
@@ -1 +1 @@
-shlibs:Depends=libc6 (>= 2.6-1), libgcc1 (>= 1:4.2.1), libgdal1-1.4.0, libgeos2c2a (>= 2.2.3), libqt4-core (>= 4.3.1), libqt4-gui (>= 4.3.1), libqt4-qt3support (>= 4.3.1), libqt4-sql (>= 4.3.1), libsqlite3-0 (>= 3.4.2), libstdc++6 (>= 4.2.1), proj
+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)
diff --git a/debian/qgis-plugin-grass.substvars b/debian/qgis-plugin-grass.substvars
@@ -1 +1 @@
-shlibs:Depends=libc6 (>= 2.6-1), libfontconfig1 (>= 2.4.0), libfreetype6 (>= 2.3.5), libgcc1 (>= 1:4.2.1), libgdal1-1.4.0, libgeos2c2a (>= 2.2.3), libice6 (>= 1:1.0.0), libpng12-0 (>= 1.2.13-4), libqt4-core (>= 4.3.1), libqt4-gui (>= 4.3.1), libqt4-qt3support (>= 4.3.1), libqt4-sql (>= 4.3.1), libsm6, libsqlite3-0 (>= 3.4.2), libstdc++6 (>= 4.2.1), libx11-6, libxcursor1 (>> 1.1.2), libxext6, libxi6, libxinerama1, libxrandr2 (>= 2:1.2.0), libxrender1, proj, zlib1g (>= 1:1.2.3.3.dfsg-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)
diff --git a/debian/qgis.substvars b/debian/qgis.substvars
@@ -1 +1 @@
-shlibs:Depends=libc6 (>= 2.6-1), libexpat1 (>= 1.95.8), libfontconfig1 (>= 2.4.0), libfreetype6 (>= 2.3.5), libgcc1 (>= 1:4.2.1), libgdal1-1.4.0, libgeos2c2a (>= 2.2.3), libgsl0 (>= 1.4), libice6 (>= 1:1.0.0), libpng12-0 (>= 1.2.13-4), libpq5, libqt4-core (>= 4.3.1), libqt4-gui (>= 4.3.1), libqt4-qt3support (>= 4.3.1), libqt4-sql (>= 4.3.1), libsm6, libsqlite3-0 (>= 3.4.2), libstdc++6 (>= 4.2.1), libx11-6, libxcursor1 (>> 1.1.2), libxext6, libxi6, libxinerama1, libxrandr2 (>= 2:1.2.0), libxrender1, proj, python2.5 (>= 2.5), zlib1g (>= 1:1.2.3.3.dfsg-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)