[QGIS Commit] r14001 - trunk/qgis/debian

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-08-03 07:07:27 +0000 (Tue, 03 Aug 2010)
New Revision: 14001

Modified:
   trunk/qgis/debian/changelog
   trunk/qgis/debian/control.hardy
   trunk/qgis/debian/control.intrepid
   trunk/qgis/debian/control.jaunty
   trunk/qgis/debian/control.karmic
   trunk/qgis/debian/control.lenny
   trunk/qgis/debian/control.lucid
   trunk/qgis/debian/control.maverick
   trunk/qgis/debian/control.sid
Log:
debian packaging update (fixes #2926)

Modified: trunk/qgis/debian/changelog
===================================================================
--- trunk/qgis/debian/changelog	2010-08-03 01:47:01 UTC (rev 14000)
+++ trunk/qgis/debian/changelog	2010-08-03 07:07:27 UTC (rev 14001)
@@ -1,6 +1,8 @@
 qgis (1.6.0) UNRELEASED; urgency=low
 
   * new development version after 1.6 branch
+  * qgis-plugin-grass-common breaks earlier versions of qgis-common: add
+    control fields.
  
  -- Jürgen E. Fischer <jef at norbit.de>  Wed, 21 Jul 2010 10:12:48 +0200
 

Modified: trunk/qgis/debian/control.hardy
===================================================================
--- trunk/qgis/debian/control.hardy	2010-08-03 01:47:01 UTC (rev 14000)
+++ trunk/qgis/debian/control.hardy	2010-08-03 07:07:27 UTC (rev 14001)
@@ -79,7 +79,9 @@
 
 Package: qgis-plugin-grass-common
 Architecture: all
-Depends: qgis-plugin-grass (>= ${source:Version}), python
+Depends: python
+Replaces: qgis-common (<< 1.5)
+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
  and display databases of geographic information.

Modified: trunk/qgis/debian/control.intrepid
===================================================================
--- trunk/qgis/debian/control.intrepid	2010-08-03 01:47:01 UTC (rev 14000)
+++ trunk/qgis/debian/control.intrepid	2010-08-03 07:07:27 UTC (rev 14001)
@@ -79,7 +79,9 @@
 
 Package: qgis-plugin-grass-common
 Architecture: all
-Depends: qgis-plugin-grass (>= ${source:Version}), python
+Depends: python
+Replaces: qgis-common (<< 1.5)
+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
  and display databases of geographic information.

Modified: trunk/qgis/debian/control.jaunty
===================================================================
--- trunk/qgis/debian/control.jaunty	2010-08-03 01:47:01 UTC (rev 14000)
+++ trunk/qgis/debian/control.jaunty	2010-08-03 07:07:27 UTC (rev 14001)
@@ -79,7 +79,9 @@
 
 Package: qgis-plugin-grass-common
 Architecture: all
-Depends: qgis-plugin-grass (>= ${source:Version}), python
+Depends: python
+Replaces: qgis-common (<< 1.5)
+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
  and display databases of geographic information.

Modified: trunk/qgis/debian/control.karmic
===================================================================
--- trunk/qgis/debian/control.karmic	2010-08-03 01:47:01 UTC (rev 14000)
+++ trunk/qgis/debian/control.karmic	2010-08-03 07:07:27 UTC (rev 14001)
@@ -79,7 +79,9 @@
 
 Package: qgis-plugin-grass-common
 Architecture: all
-Depends: qgis-plugin-grass (>= ${source:Version}), python
+Depends: python
+Replaces: qgis-common (<< 1.5)
+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
  and display databases of geographic information.

Modified: trunk/qgis/debian/control.lenny
===================================================================
--- trunk/qgis/debian/control.lenny	2010-08-03 01:47:01 UTC (rev 14000)
+++ trunk/qgis/debian/control.lenny	2010-08-03 07:07:27 UTC (rev 14001)
@@ -79,7 +79,9 @@
 
 Package: qgis-plugin-grass-common
 Architecture: all
-Depends: qgis-plugin-grass (>= ${source:Version}), python
+Depends: python
+Replaces: qgis-common (<< 1.5)
+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
  and display databases of geographic information.

Modified: trunk/qgis/debian/control.lucid
===================================================================
--- trunk/qgis/debian/control.lucid	2010-08-03 01:47:01 UTC (rev 14000)
+++ trunk/qgis/debian/control.lucid	2010-08-03 07:07:27 UTC (rev 14001)
@@ -79,6 +79,8 @@
 Package: qgis-plugin-grass-common
 Architecture: all
 Depends: python
+Replaces: qgis-common (<< 1.5)
+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
  and display databases of geographic information.

Modified: trunk/qgis/debian/control.maverick
===================================================================
--- trunk/qgis/debian/control.maverick	2010-08-03 01:47:01 UTC (rev 14000)
+++ trunk/qgis/debian/control.maverick	2010-08-03 07:07:27 UTC (rev 14001)
@@ -80,6 +80,8 @@
 Package: qgis-plugin-grass-common
 Architecture: all
 Depends: python
+Replaces: qgis-common (<< 1.5)
+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
  and display databases of geographic information.

Modified: trunk/qgis/debian/control.sid
===================================================================
--- trunk/qgis/debian/control.sid	2010-08-03 01:47:01 UTC (rev 14000)
+++ trunk/qgis/debian/control.sid	2010-08-03 07:07:27 UTC (rev 14001)
@@ -79,6 +79,8 @@
 Package: qgis-plugin-grass-common
 Architecture: all
 Depends: python
+Replaces: qgis-common (<< 1.5)
+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
  and display databases of geographic information.