Skip to content

Commit

Permalink
Revert accidental changes to debian/control
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk@14959 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
pcav committed Dec 21, 2010
1 parent bdc21de commit 88adba0
Showing 1 changed file with 7 additions and 11 deletions.
18 changes: 7 additions & 11 deletions debian/control
Expand Up @@ -5,7 +5,7 @@ Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
Build-Depends:
bison,
cmake (>= 2.6),
debhelper (>= 7),
debhelper (>= 5.0.51~),
flex,
grass-dev,
libexpat1-dev,
Expand All @@ -14,20 +14,16 @@ Build-Depends:
libgeos-dev (>= 3.0.0),
libgsl0-dev,
libpq-dev,
libproj-dev,
libqt4-dev (>=4.4.0),
libqwt5-qt4-dev,
libspatialite-dev,
libsqlite3-dev,
pkg-config,
proj (<< 4.7.0) | libproj-dev (>= 4.7.0),
pyqt4-dev-tools,
python,
python-central (>=0.5),
python-dev,
python-qt4 (>=4.1.0),
python-qt4-dev (>=4.1.0),
python-sip (>= 4.5.0),
python-sip-dev (>= 4.5.0),
python-sip4-dev (>= 4.5.0) | sip4 (>= 4.5),
subversion
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.4
Expand Down Expand Up @@ -58,7 +54,7 @@ Description: Quantum GIS - architecture-independent data
This package contains architecture-independent supporting data files for use
with Quantum GIS.

Package: libqgis1.7.0
Package: libqgis1.6.0
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: qgis (<=0.9.2rc1), libqgis-core1, libqgis-gui1, libqgis0, libqgis1
Expand All @@ -80,7 +76,7 @@ Depends:
libgsl0-dev,
libpq-dev,
libproj-dev,
libqgis1.7.0 (= ${binary:Version}),
libqgis1.6.0 (= ${binary:Version}),
libqt4-dev (>=4.4.0),
libsqlite3-dev,
python-qt4 (>=4.1.0),
Expand All @@ -97,7 +93,7 @@ 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}, grass640+42329
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, grass
Description: GRASS plugin for Quantum GIS
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
Expand All @@ -120,7 +116,7 @@ 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}
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
Expand Down

0 comments on commit 88adba0

Please sign in to comment.