debian packaging update

qgis · Mar 29, 2012 · b8bd36c · b8bd36c
1 parent 2abd900
commit b8bd36c
Show file tree

Hide file tree

Showing 7 changed files with 228 additions and 76 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -10,8 +10,9 @@ qgis (1.9.90) UNRELEASED; urgency=low
   * build package with internal libspatialite where libspatialite not available
   * drop support for Ubuntu hardy, intrepid, jaunty and karmic
   * add mssqlprovider plugin
+  * copyright & policy update (synced from debiangis)
 
- -- Jürgen E. Fischer <jef@norbit.de>  Fri, 23 Mar 2012 20:47:06 +0100
+ -- Jürgen E. Fischer <jef@norbit.de>  Tue, 27 Mar 2012 22:59:36 +0200
 
 qgis (1.8.0) UNRELEASED; urgency=low
 

diff --git a/debian/compat.sid b/debian/compat.sid
@@ -1 +1 @@
-7
+9
diff --git a/debian/compat.wheezy b/debian/compat.wheezy
@@ -0,0 +1 @@
+9
diff --git a/debian/control.sid b/debian/control.sid
@@ -5,7 +5,7 @@ Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
 Build-Depends:
  bison,
  cmake (>= 2.6),
- debhelper (>= 7),
+ debhelper (>= 9),
  flex,
  grass-dev,
  libexpat1-dev,
@@ -37,8 +37,8 @@ Build-Depends:
  graphviz,
  txt2tags
 Build-Conflicts: libqgis-dev, qgis-dev
-Standards-Version: 3.8.4
-XS-Python-Version: current
+Standards-Version: 3.9.3
+X-Python-Version: current
 Homepage: http://qgis.org/
 
 Package: qgis
@@ -58,6 +58,7 @@ Description: Geographic Information System (GIS)
 
 Package: qgis-common
 Architecture: all
+Depends: ${misc:Depends}
 Description: Quantum GIS - architecture-independent data
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.
@@ -92,7 +93,8 @@ Depends:
  libsqlite3-dev,
  python-qt4 (>=4.1.0),
  python-qt4-dev (>=4.1.0),
- qt4-designer (>=4.4.0)
+ qt4-designer (>=4.4.0),
+ ${misc:Depends}
 Provides: qgis-dev
 Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
 Description: Quantum GIS - development files
@@ -114,8 +116,8 @@ Description: GRASS plugin for Quantum GIS
 
 Package: qgis-plugin-grass-common
 Architecture: all
+Depends: python, ${misc:Depends}
 Replaces: qgis-common (<< 1.5)
-Depends: python
 Breaks: qgis-common (<< 1.5)
 Description: GRASS plugin for Quantum GIS - architecture-independent data
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
@@ -127,8 +129,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}
-Provides: ${python:Provides}
+Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
 Description: Python bindings to Quantum GIS
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.
@@ -139,7 +140,7 @@ Package: python-qgis-common
 Section: python
 Architecture: all
 Provides: ${python:Provides}
-Depends: gdal-bin, python-gdal
+Depends: gdal-bin, python-gdal, ${misc:Depends}
 Description: Python bindings to Quantum GIS - architecture-independent files
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.
@@ -162,6 +163,7 @@ Package: qgis-providers-common
 Architecture: all
 Replaces: qgis-common (<= 1.6)
 Breaks: qgis-common (<= 1.6)
+Depends: ${misc:Depends}
 Description: collection of data providers to Quantum GIS - architecture-independent files
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

diff --git a/debian/control.squeeze b/debian/control.squeeze
@@ -32,7 +32,7 @@ Build-Depends:
  git,
  doxygen,
  graphviz,
- txt2tags 
+ txt2tags
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.4
 XS-Python-Version: current

diff --git a/debian/control.wheezy b/debian/control.wheezy
@@ -5,7 +5,7 @@ Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
 Build-Depends:
  bison,
  cmake (>= 2.6),
- debhelper (>= 7),
+ debhelper (>= 9),
  flex,
  grass-dev,
  libexpat1-dev,
@@ -37,8 +37,8 @@ Build-Depends:
  graphviz,
  txt2tags
 Build-Conflicts: libqgis-dev, qgis-dev
-Standards-Version: 3.8.4
-XS-Python-Version: current
+Standards-Version: 3.9.3
+X-Python-Version: current
 Homepage: http://qgis.org/
 
 Package: qgis
@@ -58,6 +58,7 @@ Description: Geographic Information System (GIS)
 
 Package: qgis-common
 Architecture: all
+Depends: ${misc:Depends}
 Description: Quantum GIS - architecture-independent data
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.
@@ -92,7 +93,8 @@ Depends:
  libsqlite3-dev,
  python-qt4 (>=4.1.0),
  python-qt4-dev (>=4.1.0),
- qt4-designer (>=4.4.0)
+ qt4-designer (>=4.4.0),
+ ${misc:Depends}
 Provides: qgis-dev
 Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
 Description: Quantum GIS - development files
@@ -114,8 +116,8 @@ Description: GRASS plugin for Quantum GIS
 
 Package: qgis-plugin-grass-common
 Architecture: all
+Depends: python, ${misc:Depends}
 Replaces: qgis-common (<< 1.5)
-Depends: python
 Breaks: qgis-common (<< 1.5)
 Description: GRASS plugin for Quantum GIS - architecture-independent data
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
@@ -127,7 +129,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-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
 Provides: ${python:Provides}
 Description: Python bindings to Quantum GIS
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
@@ -139,7 +141,7 @@ Package: python-qgis-common
 Section: python
 Architecture: all
 Provides: ${python:Provides}
-Depends: gdal-bin, python-gdal
+Depends: gdal-bin, python-gdal, ${misc:Depends}
 Description: Python bindings to Quantum GIS - architecture-independent files
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.
@@ -162,6 +164,7 @@ Package: qgis-providers-common
 Architecture: all
 Replaces: qgis-common (<= 1.6)
 Breaks: qgis-common (<= 1.6)
+Depends: ${misc:Depends}
 Description: collection of data providers to Quantum GIS - architecture-independent files
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.