Skip to content

Commit 2670283

Browse files
blazekblazek
committed
Merge branch 'master' of github.com:qgis/Quantum-GIS
2 parents 4070354 + 21fa438 commit 2670283

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+229
-197
lines changed

‎debian/control.hardy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Description: GRASS plugin for Quantum GIS
7979

8080
Package: qgis-plugin-grass-common
8181
Architecture: all
82-
Depends: python
82+
Depends: ${python:Depends}
8383
Replaces: qgis-common (<< 1.5)
8484
Breaks: qgis-common (<< 1.5)
8585
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -104,7 +104,7 @@ Description: Python bindings to Quantum GIS
104104
Package: python-qgis-common
105105
Section: python
106106
Architecture: all
107-
Depends: gdal-bin, python-gdal
107+
Depends: gdal-bin, python-gdal, ${python:Depends}
108108
Provides: ${python:Provides}
109109
XB-Python-Version: ${python:Versions}
110110
Description: Python bindings to Quantum GIS - architecture-independent files

‎debian/control.intrepid‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Description: GRASS plugin for Quantum GIS
8080

8181
Package: qgis-plugin-grass-common
8282
Architecture: all
83-
Depends: python
83+
Depends: ${python:Depends}
8484
Replaces: qgis-common (<< 1.5)
8585
Breaks: qgis-common (<< 1.5)
8686
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -105,7 +105,7 @@ Description: Python bindings to Quantum GIS
105105
Package: python-qgis-common
106106
Section: python
107107
Architecture: all
108-
Depends: gdal-bin, python-gdal
108+
Depends: gdal-bin, python-gdal, ${python:Depends}
109109
Provides: ${python:Provides}
110110
XB-Python-Version: ${python:Versions}
111111
Description: Python bindings to Quantum GIS - architecture-independent files

‎debian/control.jaunty‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Description: GRASS plugin for Quantum GIS
8080

8181
Package: qgis-plugin-grass-common
8282
Architecture: all
83-
Depends: python
83+
Depends: ${python:Depends}
8484
Replaces: qgis-common (<< 1.5)
8585
Breaks: qgis-common (<< 1.5)
8686
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -105,7 +105,7 @@ Description: Python bindings to Quantum GIS
105105
Package: python-qgis-common
106106
Section: python
107107
Architecture: all
108-
Depends: gdal-bin, python-gdal
108+
Depends: gdal-bin, python-gdal, ${python:Depends}
109109
Provides: ${python:Provides}
110110
XB-Python-Version: ${python:Versions}
111111
Description: Python bindings to Quantum GIS - architecture-independent files

‎debian/control.karmic‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Description: GRASS plugin for Quantum GIS
8080

8181
Package: qgis-plugin-grass-common
8282
Architecture: all
83-
Depends: python
83+
Depends: ${python:Depends}
8484
Replaces: qgis-common (<< 1.5)
8585
Breaks: qgis-common (<< 1.5)
8686
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -105,7 +105,7 @@ Description: Python bindings to Quantum GIS
105105
Package: python-qgis-common
106106
Section: python
107107
Architecture: all
108-
Depends: gdal-bin, python-gdal
108+
Depends: gdal-bin, python-gdal, ${python:Depends}
109109
Provides: ${python:Provides}
110110
XB-Python-Version: ${python:Versions}
111111
Description: Python bindings to Quantum GIS - architecture-independent files

‎debian/control.lenny‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ Description: GRASS plugin for Quantum GIS
109109

110110
Package: qgis-plugin-grass-common
111111
Architecture: all
112-
Depends: python
112+
Depends: ${python:Depends}
113113
Replaces: qgis-common (<< 1.5)
114114
Breaks: qgis-common (<< 1.5)
115115
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -135,7 +135,7 @@ Package: python-qgis-common
135135
Section: python
136136
Architecture: all
137137
Provides: ${python:Provides}
138-
Depends: gdal-bin, python-gdal
138+
Depends: gdal-bin, python-gdal, ${python:Depends}
139139
XB-Python-Version: ${python:Versions}
140140
Description: Python bindings to Quantum GIS - architecture-independent files
141141
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes

‎debian/control.lucid‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Description: GRASS plugin for Quantum GIS
110110

111111
Package: qgis-plugin-grass-common
112112
Architecture: all
113-
Depends: python
113+
Depends: ${python:Depends}
114114
Replaces: qgis-common (<< 1.5)
115115
Breaks: qgis-common (<< 1.5)
116116
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -136,7 +136,7 @@ Package: python-qgis-common
136136
Section: python
137137
Architecture: all
138138
Provides: ${python:Provides}
139-
Depends: gdal-bin, python-gdal
139+
Depends: gdal-bin, python-gdal, ${python:Depends}
140140
XB-Python-Version: ${python:Versions}
141141
Description: Python bindings to Quantum GIS - architecture-independent files
142142
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes

‎debian/control.maverick‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ Description: GRASS plugin for Quantum GIS
111111

112112
Package: qgis-plugin-grass-common
113113
Architecture: all
114-
Depends: python
114+
Depends: ${python:Depends}
115115
Replaces: qgis-common (<< 1.5)
116116
Breaks: qgis-common (<< 1.5)
117117
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -137,7 +137,7 @@ Package: python-qgis-common
137137
Section: python
138138
Architecture: all
139139
Provides: ${python:Provides}
140-
Depends: gdal-bin, python-gdal
140+
Depends: gdal-bin, python-gdal, ${python:Depends}
141141
XB-Python-Version: ${python:Versions}
142142
Description: Python bindings to Quantum GIS - architecture-independent files
143143
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes

‎debian/control.natty‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ Description: GRASS plugin for Quantum GIS
111111

112112
Package: qgis-plugin-grass-common
113113
Architecture: all
114-
Depends: python
114+
Depends: ${python:Depends}
115115
Replaces: qgis-common (<< 1.5)
116116
Breaks: qgis-common (<< 1.5)
117117
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -137,7 +137,7 @@ Package: python-qgis-common
137137
Section: python
138138
Architecture: all
139139
Provides: ${python:Provides}
140-
Depends: gdal-bin, python-gdal
140+
Depends: gdal-bin, python-gdal, ${python:Depends}
141141
XB-Python-Version: ${python:Versions}
142142
Description: Python bindings to Quantum GIS - architecture-independent files
143143
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes

‎debian/control.sid‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ Description: GRASS plugin for Quantum GIS
111111

112112
Package: qgis-plugin-grass-common
113113
Architecture: all
114-
Depends: python
114+
Depends: ${python:Depends}
115115
Replaces: qgis-common (<< 1.5)
116116
Breaks: qgis-common (<< 1.5)
117117
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -137,7 +137,7 @@ Package: python-qgis-common
137137
Section: python
138138
Architecture: all
139139
Provides: ${python:Provides}
140-
Depends: gdal-bin, python-gdal
140+
Depends: gdal-bin, python-gdal, ${python:Depends}
141141
XB-Python-Version: ${python:Versions}
142142
Description: Python bindings to Quantum GIS - architecture-independent files
143143
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes

‎debian/control.squeeze‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Description: GRASS plugin for Quantum GIS
110110

111111
Package: qgis-plugin-grass-common
112112
Architecture: all
113-
Depends: python
113+
Depends: ${python:Depends}
114114
Replaces: qgis-common (<< 1.5)
115115
Breaks: qgis-common (<< 1.5)
116116
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -136,7 +136,7 @@ Package: python-qgis-common
136136
Section: python
137137
Architecture: all
138138
Provides: ${python:Provides}
139-
Depends: gdal-bin, python-gdal
139+
Depends: gdal-bin, python-gdal, ${python:Depends}
140140
XB-Python-Version: ${python:Versions}
141141
Description: Python bindings to Quantum GIS - architecture-independent files
142142
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes

0 commit comments

Comments
 (0)