The following commit has been merged in the master branch:
commit 2141b7620cdef073ba79a72fdde5618ed25dd08b
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Fri Sep 27 02:17:10 2013 +0200

    Restructure control file with cme fix dpkg-control.

diff --git a/debian/control b/debian/control
index 9d5b21d..058cc6e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,56 +1,64 @@
 Source: qgis
-Section: science
-Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <fran...@debian.org>,
            Bas Couwenberg <sebas...@xs4all.nl>
-Build-Depends:
- bison,
- cmake (>= 2.8),
- debhelper (>= 9),
- flex,
- grass-dev,
- libexpat1-dev,
- libfcgi-dev,
- libgdal1-dev,
- libgeos-dev (>= 3.0.0),
- libgsl0-dev,
- libpq-dev,
- libproj-dev,
- libqt4-dev (>=4.6.0),
- libqt4-opengl-dev,
- libqtwebkit-dev,
- libqwt-dev,
- libspatialite-dev,
- libsqlite3-dev,
- libspatialindex-dev,
- pkg-config,
- pyqt4-dev-tools,
- python,
- python-dev (>= 2.6.6-3~),
- python-qt4 (>=4.1.0),
- python-qt4-dev (>=4.1.0),
- python-sip (>= 4.5.0),
- python-sip-dev (>= 4.5.0),
- libosgearth-dev,
- libopenscenegraph-dev,
- git,
- doxygen,
- graphviz,
- txt2tags,
- xvfb, xauth,
- xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable
-Build-Conflicts: libqgis-dev, qgis-dev
+Section: science
+Priority: extra
+Build-Depends: bison,
+               cmake (>= 2.8),
+               debhelper (>= 9),
+               flex,
+               grass-dev,
+               libexpat1-dev,
+               libfcgi-dev,
+               libgdal1-dev,
+               libgeos-dev (>= 3.0.0),
+               libgsl0-dev,
+               libpq-dev,
+               libproj-dev,
+               libqt4-dev (>=4.6.0),
+               libqt4-opengl-dev,
+               libqtwebkit-dev,
+               libqwt-dev,
+               libspatialite-dev,
+               libsqlite3-dev,
+               libspatialindex-dev,
+               pkg-config,
+               pyqt4-dev-tools,
+               python,
+               python-dev (>= 2.6.6-3~),
+               python-qt4 (>=4.1.0),
+               python-qt4-dev (>=4.1.0),
+               python-sip (>= 4.5.0),
+               python-sip-dev (>= 4.5.0),
+               libosgearth-dev,
+               libopenscenegraph-dev,
+               git,
+               doxygen,
+               graphviz,
+               txt2tags,
+               xvfb,
+               xauth,
+               xfonts-base,
+               xfonts-100dpi,
+               xfonts-75dpi,
+               xfonts-scalable
+Build-Conflicts: libqgis-dev,
+                 qgis-dev
 Standards-Version: 3.9.3
-X-Python-Version: current
-Homepage: http://qgis.org/
-Vcs-Git: git://git.debian.org/git/pkg-grass/qgis.git
 Vcs-Browser: https://alioth.debian.org/
+Vcs-Git: git://git.debian.org/git/pkg-grass/qgis.git
+Homepage: http://qgis.org/
+X-Python-Version: current
 
 Package: qgis
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= 
${binary:Version}), qgis-common (= ${source:Version})
-Recommends: qgis-plugin-grass, python-qgis
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         qgis-providers (= ${binary:Version}),
+         qgis-common (= ${source:Version})
+Recommends: qgis-plugin-grass,
+            python-qgis
 Suggests: gpsbabel
 Conflicts: uim-qt3
 Description: Geographic Information System (GIS)
@@ -74,8 +82,13 @@ Description: QGIS - architecture-independent data
 
 Package: libqgis1.8.0
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: qgis (<=0.9.2rc1), libqgis-core1, libqgis-gui1, libqgis0, libqgis1
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Replaces: qgis (<=0.9.2rc1),
+          libqgis-core1,
+          libqgis-gui1,
+          libqgis0,
+          libqgis1
 Description: QGIS - shared libraries
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.
@@ -86,23 +99,24 @@ Description: QGIS - shared libraries
 Package: libqgis-dev
 Architecture: any
 Section: libdevel
-Depends:
- grass-dev,
- libexpat1-dev,
- libgdal1-dev,
- libgeos-dev (>= 3.0.0),
- libgsl0-dev,
- libpq-dev,
- libproj-dev,
- libqgis1.8.0 (= ${binary:Version}),
- libqt4-dev (>=4.6.0),
- libsqlite3-dev,
- python-qt4 (>=4.1.0),
- python-qt4-dev (>=4.1.0),
- qt4-designer (>=4.4.0),
- ${misc:Depends}
+Depends: grass-dev,
+         libexpat1-dev,
+         libgdal1-dev,
+         libgeos-dev (>= 3.0.0),
+         libgsl0-dev,
+         libpq-dev,
+         libproj-dev,
+         libqgis1.8.0 (= ${binary:Version}),
+         libqt4-dev (>=4.6.0),
+         libsqlite3-dev,
+         python-qt4 (>=4.1.0),
+         python-qt4-dev (>=4.1.0),
+         qt4-designer (>=4.4.0),
+         ${misc:Depends}
 Provides: qgis-dev
-Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
+Replaces: qgis-dev,
+          libqgis1-dev,
+          libqgis1.4.0-dev
 Description: QGIS - development files
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.
@@ -112,12 +126,11 @@ Description: QGIS - development files
 
 Package: qgis-plugin-grass
 Architecture: any
-Depends:
- qgis (= ${binary:Version}),
- qgis-plugin-grass-common (= ${source:Version}),
- ${shlibs:Depends},
- ${misc:Depends},
- grass
+Depends: qgis (= ${binary:Version}),
+         qgis-plugin-grass-common (= ${source:Version}),
+         ${shlibs:Depends},
+         ${misc:Depends},
+         grass
 Description: GRASS plugin for QGIS
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.
@@ -126,9 +139,11 @@ Description: GRASS plugin for QGIS
 
 Package: qgis-plugin-grass-common
 Architecture: all
-Depends: python, ${python:Depends}, ${misc:Depends}
-Replaces: qgis-common (<< 1.5)
+Depends: python,
+         ${python:Depends},
+         ${misc:Depends}
 Breaks: qgis-common (<< 1.5)
+Replaces: qgis-common (<< 1.5)
 Description: GRASS plugin for QGIS - architecture-independent data
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.
@@ -137,18 +152,18 @@ Description: GRASS plugin for QGIS - 
architecture-independent data
  with the QGIS GRASS plugin.
 
 Package: python-qgis
-Section: python
 Architecture: any
-Depends: python-qt4 (>=4.1.0),
- python-sip (>= 4.5.0),
- python-qgis-common (= ${source:Version}),
- python-psycopg2,
- python-qscintilla2,
- python-pyspatialite,
- ${shlibs:Depends},
- ${python:Depends},
- ${misc:Depends},
- ${sip:Depends}
+Section: python
+Depends: python-qt4,
+         python-sip,
+         python-qgis-common (= ${source:Version}),
+         python-psycopg2,
+         python-qscintilla2,
+         python-pyspatialite,
+         ${shlibs:Depends},
+         ${python:Depends},
+         ${misc:Depends},
+         ${sip:Depends}
 Provides: ${python:Provides}
 Description: Python bindings to QGIS
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
@@ -157,15 +172,15 @@ Description: Python bindings to QGIS
  This package contains the files for the Python support.
 
 Package: python-qgis-common
-Section: python
 Architecture: all
-Provides: ${python:Provides}
+Section: python
 Depends: gdal-bin,
- python-gdal,
- python-matplotlib,
- ${python:Depends},
- ${misc:Depends},
- ${sip:Depends}
+         python-gdal,
+         python-matplotlib,
+         ${python:Depends},
+         ${misc:Depends},
+         ${sip:Depends}
+Provides: ${python:Provides}
 Description: Python bindings to QGIS - architecture-independent files
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.
@@ -176,10 +191,10 @@ Description: Python bindings to QGIS - 
architecture-independent files
 Package: qgis-providers
 Architecture: any
 Depends: qgis-providers-common (= ${source:Version}),
- ${shlibs:Depends},
- ${misc:Depends}
-Replaces: qgis (<= 1.6)
+         ${shlibs:Depends},
+         ${misc:Depends}
 Breaks: qgis (<= 1.6)
+Replaces: qgis (<= 1.6)
 Description: collection of data providers to QGIS
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.
@@ -188,9 +203,9 @@ Description: collection of data providers to QGIS
 
 Package: qgis-providers-common
 Architecture: all
-Replaces: qgis-common (<= 1.6)
-Breaks: qgis-common (<= 1.6)
 Depends: ${misc:Depends}
+Breaks: qgis-common (<= 1.6)
+Replaces: qgis-common (<= 1.6)
 Description: collection of data providers to QGIS - architecture-independent 
files
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.
@@ -199,7 +214,9 @@ Description: collection of data providers to QGIS - 
architecture-independent fil
 
 Package: qgis-mapserver
 Architecture: any
-Depends: qgis-providers (= ${binary:Version}), ${shlibs:Depends}, 
${misc:Depends}
+Depends: qgis-providers (= ${binary:Version}),
+         ${shlibs:Depends},
+         ${misc:Depends}
 Description: QGIS mapserver
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.
@@ -208,8 +225,11 @@ Description: QGIS mapserver
 
 Package: qgis-sqlanywhere
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: qgis-sqlanywhere1.7.0, qgis-sqlanywhere1.7.1, qgis-sqlanywhere1.8.0
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Conflicts: qgis-sqlanywhere1.7.0,
+           qgis-sqlanywhere1.7.1,
+           qgis-sqlanywhere1.8.0
 Description: QGIS sql anywhere plugin and provider
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.
@@ -219,7 +239,8 @@ Description: QGIS sql anywhere plugin and provider
 Package: qgis-api-doc
 Architecture: all
 Section: doc
-Depends: libjs-jquery, ${misc:Depends}
+Depends: libjs-jquery,
+         ${misc:Depends}
 Description: QGIS API documentation
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.

-- 
The Quantum GIS in Debian project

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to