Skip to content

Commit 5377ad3

Browse files
jef-njef-n
committed
debian packaging update
1 parent a9d8bd1 commit 5377ad3

File tree

13 files changed

+1986
-219
lines changed

13 files changed

+1986
-219
lines changed

‎debian/changelog‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ qgis (2.1.0) UNRELEASED; urgency=low
44
* drop qgis_icon.xpm and use "upstream" version
55
* Update Qt dependency to 4.7
66
* drop support for Debian squeeze and Ubuntu lucid, maverick, natty and oneiric
7-
* disable globe support for jessie (because of #728318)
87

9-
-- Jürgen E. Fischer <jef@norbit.de> Sat, 18 Jan 2014 03:33:14 +0100
8+
-- Jürgen E. Fischer <jef@norbit.de> Sat, 18 Jan 2014 23:05:48 +0100
109

1110
qgis (1.9.0) UNRELEASED; urgency=low
1211

‎debian/control.jessie‎

Lines changed: 54 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Source: qgis
22
Section: science
3-
Priority: extra
3+
Priority: optional
44
Maintainer: QGIS developers <qgis-developer@lists.osgeo.org>
55
Build-Depends:
66
bison,
@@ -30,8 +30,8 @@ Build-Depends:
3030
python-qt4-dev (>=4.1.0),
3131
python-sip (>= 4.5.0),
3232
python-sip-dev (>= 4.5.0),
33-
# libosgearth-dev,
34-
# libopenscenegraph-dev,
33+
libosgearth-dev,
34+
libopenscenegraph-dev,
3535
git,
3636
doxygen,
3737
graphviz,
@@ -40,14 +40,12 @@ Build-Depends:
4040
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable
4141
Build-Conflicts: libqgis-dev, qgis-dev
4242
Standards-Version: 3.9.3
43-
XS-Python-Version: current
4443
Homepage: http://qgis.org/
4544

4645
Package: qgis
4746
Architecture: any
4847
Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
49-
Recommends: qgis-plugin-grass, python-qgis
50-
#, qgis-plugin-globe
48+
Recommends: qgis-plugin-grass, python-qgis, qgis-plugin-globe
5149
Suggests: gpsbabel
5250
Conflicts: uim-qt3
5351
Description: Geographic Information System (GIS)
@@ -71,8 +69,10 @@ Description: QGIS - architecture-independent data
7169

7270
Package: libqgis{QGIS_ABI}
7371
Architecture: any
72+
Section: libs
7473
Depends: ${shlibs:Depends}, ${misc:Depends}
7574
Replaces: qgis (<=0.9.2rc1), libqgis-core1, libqgis-gui1, libqgis0, libqgis1
75+
Conflicts: libqgis-core{QGIS_ABI}, libqgis-gui{QGIS_ABI}
7676
Description: QGIS - shared libraries
7777
QGIS is a Geographic Information System (GIS) which manages, analyzes and
7878
display databases of geographic information.
@@ -118,7 +118,7 @@ Description: GRASS plugin for QGIS
118118

119119
Package: qgis-plugin-grass-common
120120
Architecture: all
121-
Depends: python, ${python:Depends}, ${misc:Depends}
121+
Depends: python2.7, ${python:Depends}, ${misc:Depends}
122122
Replaces: qgis-common (<< 1.5)
123123
Breaks: qgis-common (<< 1.5)
124124
Description: GRASS plugin for QGIS - architecture-independent data
@@ -131,10 +131,17 @@ Description: GRASS plugin for QGIS - architecture-independent data
131131
Package: python-qgis
132132
Section: python
133133
Architecture: any
134-
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}),
135-
python-psycopg2, python-qscintilla2,
136-
python-pyspatialite,
137-
${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, ${sip:Depends}
134+
Depends:
135+
python-qt4,
136+
python-sip,
137+
python-qgis-common (= ${source:Version}),
138+
python-psycopg2,
139+
python-qscintilla2,
140+
python-pyspatialite,
141+
${shlibs:Depends},
142+
${python:Depends},
143+
${misc:Depends},
144+
${sip:Depends}
138145
Provides: ${python:Provides}
139146
XB-Python-Version: ${python:Versions}
140147
Description: Python bindings to QGIS
@@ -147,8 +154,13 @@ Package: python-qgis-common
147154
Section: python
148155
Architecture: all
149156
Provides: ${python:Provides}
150-
Depends: gdal-bin, python-gdal, python-matplotlib, ${python:Depends}, ${misc:Depends}, ${sip:Depends}
151-
XB-Python-Version: ${python:Versions}
157+
Depends:
158+
gdal-bin,
159+
python-gdal,
160+
python-matplotlib,
161+
${python:Depends},
162+
${misc:Depends},
163+
${sip:Depends}
152164
Description: Python bindings to QGIS - architecture-independent files
153165
QGIS is a Geographic Information System (GIS) which manages, analyzes and
154166
display databases of geographic information.
@@ -158,7 +170,10 @@ Description: Python bindings to QGIS - architecture-independent files
158170

159171
Package: qgis-providers
160172
Architecture: any
161-
Depends: qgis-providers-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
173+
Depends:
174+
qgis-providers-common (= ${source:Version}),
175+
${shlibs:Depends},
176+
${misc:Depends}
162177
Replaces: qgis (<= 1.6)
163178
Breaks: qgis (<= 1.6)
164179
Description: collection of data providers to QGIS
@@ -180,7 +195,10 @@ Description: collection of data providers to QGIS - architecture-independent fil
180195

181196
Package: qgis-mapserver
182197
Architecture: any
183-
Depends: qgis-providers (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
198+
Depends:
199+
qgis-providers (= ${binary:Version}),
200+
${shlibs:Depends},
201+
${misc:Depends}
184202
Description: QGIS mapserver
185203
QGIS is a Geographic Information System (GIS) which manages, analyzes and
186204
display databases of geographic information.
@@ -207,21 +225,25 @@ Description: QGIS API documentation
207225
.
208226
This package contains the QGIS API documentation.
209227

210-
#Package: qgis-plugin-globe
211-
#Architecture: any
212-
#Depends: qgis (= ${binary:Version}), qgis-plugin-globe-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
213-
#Description: OSG globe plugin for QGIS
214-
# QGIS is a Geographic Information System (GIS) which manages, analyzes and
215-
# display databases of geographic information.
216-
# .
217-
# This plugin enables 3D viewing using OSG globe in the QGIS.
218-
219-
#Package: qgis-plugin-globe-common
220-
#Architecture: all
221-
#Description: OSG GLOBE plugin for QGIS - architecture-independent data
222-
# QGIS is a Geographic Information System (GIS) which manages, analyzes and
223-
# display databases of geographic information.
224-
# .
225-
# This package contains architecture-independent supporting data files for use
226-
# with the QGIS GLOBE plugin.
228+
Package: qgis-plugin-globe
229+
Architecture: any
230+
Depends:
231+
qgis (= ${binary:Version}),
232+
qgis-plugin-globe-common (= ${source:Version}),
233+
${shlibs:Depends},
234+
${misc:Depends}
235+
Description: OSG globe plugin for QGIS
236+
QGIS is a Geographic Information System (GIS) which manages, analyzes and
237+
display databases of geographic information.
238+
.
239+
This plugin enables 3D viewing using OSG globe in the QGIS.
240+
241+
Package: qgis-plugin-globe-common
242+
Architecture: all
243+
Description: OSG GLOBE plugin for QGIS - architecture-independent data
244+
QGIS is a Geographic Information System (GIS) which manages, analyzes and
245+
display databases of geographic information.
246+
.
247+
This package contains architecture-independent supporting data files for use
248+
with the QGIS GLOBE plugin.
227249

‎debian/control.quantal‎

Lines changed: 37 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Source: qgis
22
Section: science
3-
Priority: extra
3+
Priority: optional
44
Maintainer: QGIS developers <qgis-developer@lists.osgeo.org>
55
Build-Depends:
66
bison,
@@ -10,7 +10,7 @@ Build-Depends:
1010
grass-dev,
1111
libexpat1-dev,
1212
libfcgi-dev,
13-
libgdal1-dev,
13+
libgdal-dev (>= 1.9.0),
1414
libgeos-dev (>= 3.0.0),
1515
libgsl0-dev,
1616
libpq-dev,
@@ -70,8 +70,10 @@ Description: QGIS - architecture-independent data
7070

7171
Package: libqgis{QGIS_ABI}
7272
Architecture: any
73+
Section: libs
7374
Depends: ${shlibs:Depends}, ${misc:Depends}
7475
Replaces: qgis (<=0.9.2rc1), libqgis-core1, libqgis-gui1, libqgis0, libqgis1
76+
Conflicts: libqgis-core{QGIS_ABI}, libqgis-gui{QGIS_ABI}
7577
Description: QGIS - shared libraries
7678
QGIS is a Geographic Information System (GIS) which manages, analyzes and
7779
display databases of geographic information.
@@ -85,7 +87,7 @@ Section: libdevel
8587
Depends:
8688
grass-dev,
8789
libexpat1-dev,
88-
libgdal1-dev,
90+
libgdal-dev (>= 1.9.0),
8991
libgeos-dev (>= 3.0.0),
9092
libgsl0-dev,
9193
libpq-dev,
@@ -117,7 +119,7 @@ Description: GRASS plugin for QGIS
117119

118120
Package: qgis-plugin-grass-common
119121
Architecture: all
120-
Depends: python, ${python:Depends}, ${misc:Depends}
122+
Depends: python2.7, ${python:Depends}, ${misc:Depends}
121123
Replaces: qgis-common (<< 1.5)
122124
Breaks: qgis-common (<< 1.5)
123125
Description: GRASS plugin for QGIS - architecture-independent data
@@ -130,10 +132,17 @@ Description: GRASS plugin for QGIS - architecture-independent data
130132
Package: python-qgis
131133
Section: python
132134
Architecture: any
133-
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}),
134-
python-psycopg2, python-qscintilla2,
135-
python-pyspatialite,
136-
${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, ${sip:Depends}
135+
Depends:
136+
python-qt4 (>= 4.1.0),
137+
python-sip (>= 4.5.0),
138+
python-qgis-common (= ${source:Version}),
139+
python-psycopg2,
140+
python-qscintilla2,
141+
python-pyspatialite,
142+
${shlibs:Depends},
143+
${python:Depends},
144+
${misc:Depends},
145+
${sip:Depends}
137146
Provides: ${python:Provides}
138147
XB-Python-Version: ${python:Versions}
139148
Description: Python bindings to QGIS
@@ -146,7 +155,13 @@ Package: python-qgis-common
146155
Section: python
147156
Architecture: all
148157
Provides: ${python:Provides}
149-
Depends: gdal-bin, python-gdal, python-matplotlib, ${python:Depends}, ${misc:Depends}, ${sip:Depends}
158+
Depends:
159+
gdal-bin,
160+
python-gdal,
161+
python-matplotlib,
162+
${python:Depends},
163+
${misc:Depends},
164+
${sip:Depends}
150165
XB-Python-Version: ${python:Versions}
151166
Description: Python bindings to QGIS - architecture-independent files
152167
QGIS is a Geographic Information System (GIS) which manages, analyzes and
@@ -157,7 +172,10 @@ Description: Python bindings to QGIS - architecture-independent files
157172

158173
Package: qgis-providers
159174
Architecture: any
160-
Depends: qgis-providers-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
175+
Depends:
176+
qgis-providers-common (= ${source:Version}),
177+
${shlibs:Depends},
178+
${misc:Depends}
161179
Replaces: qgis (<= 1.6)
162180
Breaks: qgis (<= 1.6)
163181
Description: collection of data providers to QGIS
@@ -179,7 +197,10 @@ Description: collection of data providers to QGIS - architecture-independent fil
179197

180198
Package: qgis-mapserver
181199
Architecture: any
182-
Depends: qgis-providers (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
200+
Depends:
201+
qgis-providers (= ${binary:Version}),
202+
${shlibs:Depends},
203+
${misc:Depends}
183204
Description: QGIS mapserver
184205
QGIS is a Geographic Information System (GIS) which manages, analyzes and
185206
display databases of geographic information.
@@ -208,7 +229,11 @@ Description: QGIS API documentation
208229

209230
Package: qgis-plugin-globe
210231
Architecture: any
211-
Depends: qgis (= ${binary:Version}), qgis-plugin-globe-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
232+
Depends:
233+
qgis (= ${binary:Version}),
234+
qgis-plugin-globe-common (= ${source:Version}),
235+
${shlibs:Depends},
236+
${misc:Depends}
212237
Description: OSG globe plugin for QGIS
213238
QGIS is a Geographic Information System (GIS) which manages, analyzes and
214239
display databases of geographic information.

0 commit comments

Comments
 (0)