[SCM] qgis branch, master, updated. upstream/2.0.1-13436-g7969474

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 48e39940628d2c6e37c37a3edac5c6bb4e1bb6ee
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Sep 27 02:10:14 2013 +0200

    Merge changes from control.sid.

diff --git a/debian/changelog b/debian/changelog
index 0da9289..c4b33f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qgis (2.0.1-1) UNRELEASED; urgency=low
 
   [ Bas Couwenberg ]
   * Add myself to Uploaders.
+  * Merge changes from control.sid.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 27 Sep 2013 02:05:32 +0200
 
diff --git a/debian/control b/debian/control
index 6254ce3..9d5b21d 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends:
  libqt4-dev (>=4.6.0),
  libqt4-opengl-dev,
  libqtwebkit-dev,
- libqwt5-qt4-dev | libqwt-dev,
+ libqwt-dev,
  libspatialite-dev,
  libsqlite3-dev,
  libspatialindex-dev,
@@ -35,7 +35,7 @@ Build-Depends:
  libosgearth-dev,
  libopenscenegraph-dev,
  git,
- doxygen
+ doxygen,
  graphviz,
  txt2tags,
  xvfb, xauth,
@@ -52,7 +52,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
 Recommends: qgis-plugin-grass, python-qgis
 Suggests: gpsbabel
-Conflicts: uim-qt3, qgis (<= 1.6.0~)
+Conflicts: uim-qt3
 Description: Geographic Information System (GIS)
  A Geographic Information System (GIS) manages, analyzes, and displays
  databases of geographic information. QGIS supports shape file viewing and
@@ -64,11 +64,12 @@ Description: Geographic Information System (GIS)
 
 Package: qgis-common
 Architecture: all
+Depends: ${misc:Depends}
 Description: QGIS - architecture-independent data
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.
  .
- This package contains architecture-independent supporting data files for use 
+ This package contains architecture-independent supporting data files for use
  with QGIS.
 
 Package: libqgis1.8.0
@@ -94,11 +95,12 @@ Depends:
  libpq-dev,
  libproj-dev,
  libqgis1.8.0 (= ${binary:Version}),
- libqt4-dev (>=4.4.0),
+ 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}
+ qt4-designer (>=4.4.0),
+ ${misc:Depends}
 Provides: qgis-dev
 Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
 Description: QGIS - development files
@@ -124,7 +126,7 @@ Description: GRASS plugin for QGIS
 
 Package: qgis-plugin-grass-common
 Architecture: all
-Depends: python, ${misc:Depends}
+Depends: python, ${python:Depends}, ${misc:Depends}
 Replaces: qgis-common (<< 1.5)
 Breaks: qgis-common (<< 1.5)
 Description: GRASS plugin for QGIS - architecture-independent data
@@ -137,8 +139,16 @@ Description: GRASS plugin for QGIS - 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}, ${python:Depends}
+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}
 Provides: ${python:Provides}
 Description: Python bindings to QGIS
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
@@ -191,26 +201,28 @@ Package: qgis-mapserver
 Architecture: any
 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.
+ QGIS is a Geographic Information System (GIS) which manages, analyzes and
+ display databases of geographic information.
  .
  This package contains the QGIS mapserver.
 
-Package: qgis-sqlanywhere1.7.5
+Package: qgis-sqlanywhere
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Quantum GIS sql anywhere plugin and provider
- Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
- and display databases of geographic information.
+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.
  .
- This package contains the Quantum GIS sqlanywhere plugin and provider.
+ This package contains the QGIS sqlanywhere plugin and provider.
 
 Package: qgis-api-doc
 Architecture: all
-Depends: ${misc:Depends}
-Description: Quantum GIS API documentation
- Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
- and display databases of geographic information.
+Section: doc
+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.
  .
- This package contains the Quantum GIS API documentation.
+ This package contains the QGIS API documentation.
 

-- 
The Quantum GIS in Debian project