Skip to content

Commit fa0444f

Browse files
committed
debian packaging update
1 parent d5b227d commit fa0444f

13 files changed

+151
-84
lines changed

debian/changelog

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ qgis (1.9.0) UNRELEASED; urgency=low
1616
* include topology plugin
1717
* drop delimited text plugin (now in core)
1818
* drop context_help, function_help and qgis_help.db files
19+
* use dh_sip
1920

20-
-- Jürgen E. Fischer <jef@norbit.de> Sat, 18 May 2013 10:19:16 +0200
21+
-- Jürgen E. Fischer <jef@norbit.de> Sun, 02 Jun 2013 11:52:24 +0200
2122

2223
qgis (1.8.0) UNRELEASED; urgency=low
2324

@@ -72,7 +73,7 @@ qgis (1.6.0) UNRELEASED; urgency=low
7273
* add subversion as build dependency for trunk
7374
* add qgis-mapserver package
7475
* trim dependencies
75-
76+
7677
-- Jürgen E. Fischer <jef@norbit.de> Sun, 17 Oct 2010 12:09:23 +0200
7778

7879
qgis (1.5.0) UNRELEASED; urgency=low
@@ -141,7 +142,7 @@ qgis (1.1.0-4) UNRELEASED; urgency=low
141142

142143
qgis (1.1.0-3) UNRELEASED; urgency=low
143144

144-
* include diagram overlays
145+
* include diagram overlays
145146

146147
-- Jürgen E. Fischer <jef@norbit.de> Wed, 08 Apr 2009 16:30:57 +0200
147148

@@ -177,10 +178,10 @@ qgis (1.1.0) UNRELEASED; urgency=low
177178
-- Jürgen E. Fischer <jef@norbit.de> Fri, 13 Feb 2009 22:03:25 +0100
178179

179180
qgis (1.0.0) experimental; urgency=low
180-
181+
181182
* new upstream release
182183
* update qgis.mime
183-
* add qgis.desktop and qgis.xml
184+
* add qgis.desktop and qgis.xml
184185
* add mime types for KDE
185186
* don't ignore errors in preinst and postrm
186187
* run ldconfig in postrm
@@ -281,7 +282,7 @@ qgis (0.11.0test3) experimental; urgency=low
281282

282283
qgis (0.11.0test2) experimental; urgency=low
283284

284-
* removed 'upstream' changes from changelog
285+
* removed 'upstream' changes from changelog
285286
* policy update 3.7.2 to 3.7.3
286287
* python support: renamed qgis-python-plugin to python-qgis, moved to python
287288
section, added Python:Provides
@@ -301,13 +302,13 @@ qgis (0.11.0test1) experimental; urgency=low
301302
-- Jürgen E. Fischer <jef@norbit.de> Thu, 29 May 2008 00:23:14 +0200
302303

303304
qgis (0.10.0-2) gutsy; urgency=low
304-
305+
305306
* fix libgdal1 grass dependency for ubuntu gutsy/hardy (1.4.0 | 1.5.0)
306307

307308
-- Jürgen E. Fischer <jef@norbit.de> Wed, 30 Apr 2008 22:35:42 +0200
308309

309310
qgis (0.10.0-1) gutsy; urgency=low
310-
311+
311312
* updated Maintainer field
312313
* updated version for sip build dependency and removed old libgdal<1.5
313314
dependencies.
@@ -325,7 +326,7 @@ qgis (0.10.0) gutsy; urgency=low
325326

326327
qgis (0.9.2test1) gutsy; urgency=low
327328

328-
* Testing package to see if icons deploy
329+
* Testing package to see if icons deploy
329330

330331
-- Tim Sutton <tim@linfiniti.com> Tue, 12 Feb 2008 21:18:35 -0200
331332

@@ -343,7 +344,7 @@ qgis (0.9.1) gutsy; urgency=low
343344

344345
qgis (0.9.0) gutsy; urgency=low
345346

346-
* Quantum GIS 0.9.0 'Ganymede' release
347+
* Quantum GIS 0.9.0 'Ganymede' release
347348

348349
-- Tim Sutton <tim@linfiniti.com> Tue, 28 Aug 2007 22:43:41 -0300
349350

@@ -374,7 +375,7 @@ qgis (0.8.1-1) UNRELEASED; urgency=low
374375

375376
qgis (0.8.0-5) unstable; urgency=low
376377

377-
* Added python-dev build-dep.
378+
* Added python-dev build-dep.
378379
Patch added: ax_python.dpatch, fixes python environment detection.
379380
(closes: #429234)
380381
* Added build-dep for autoconf/automake due to acinclude.m4 changes.
@@ -510,7 +511,7 @@ qgis (0.6.0-1) unstable; urgency=low
510511

511512
qgis (0.5.0-2) unstable; urgency=low
512513

513-
* Fix typos in .install files that left out the delimitedtext plugin
514+
* Fix typos in .install files that left out the delimitedtext plugin
514515
(Closes: #282084)
515516

516517
-- Steve Halasz <debian@adkgis.org> Fri, 19 Nov 2004 10:51:07 -0500
@@ -556,15 +557,15 @@ qgis (0.2.0-1) unstable; urgency=low
556557

557558
qgis (0.1-2) unstable; urgency=low
558559

559-
* Build with the Shapefile to PostGIS Import Tool (SPIT) and
560+
* Build with the Shapefile to PostGIS Import Tool (SPIT) and
560561
PostgreSQL support (Closes: #233191)
561562

562563
-- Steve Halasz <debian@adkgis.org> Wed, 7 Apr 2004 09:18:34 -0400
563564

564565
qgis (0.1-1) unstable; urgency=low
565566

566567
* New upstream release
567-
* changed install location of html documentation to /usr/share/doc/qgis
568+
* changed install location of html documentation to /usr/share/doc/qgis
568569
* updated man page to describe new command-line options and include pointers
569570
to HTML and PDF documentation (Closes: #234600)
570571
* debian/control:

debian/control.lucid

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ Build-Depends:
1818
libqt4-dev (>=4.4.0),
1919
libqwt5-qt4-dev,
2020
libspatialite-dev,
21-
libspatialindex-dev,
2221
libsqlite3-dev,
22+
libspatialindex-dev,
2323
pkg-config,
2424
pyqt4-dev-tools,
2525
python,
@@ -47,15 +47,16 @@ Suggests: gpsbabel
4747
Conflicts: uim-qt3
4848
Description: Geographic Information System (GIS)
4949
A Geographic Information System (GIS) manages, analyzes, and displays
50-
databases of geographic information. QGIS (QGIS) supports shape file viewing
51-
and editing, spatial data storage with PostgreSQL/PostGIS, projection
52-
on-the-fly, map composition, and a number of other features via a plugin
53-
interface. QGIS also supports display of various georeferenced raster and
54-
Digital Elevation Model (DEM) formats including GeoTIFF, Arc/Info ASCII Grid,
55-
and USGS ASCII DEM.
50+
databases of geographic information. QGIS supports shape file viewing and
51+
editing, spatial data storage with PostgreSQL/PostGIS, projection on-the-fly,
52+
map composition, and a number of other features via a plugin interface. QGIS
53+
also supports display of various georeferenced raster and Digital Elevation
54+
Model (DEM) formats including GeoTIFF, Arc/Info ASCII Grid, and USGS ASCII
55+
DEM.
5656

5757
Package: qgis-common
5858
Architecture: all
59+
Depends: ${misc:Depends}
5960
Description: QGIS - architecture-independent data
6061
QGIS is a Geographic Information System (GIS) which manages, analyzes and
6162
display databases of geographic information.
@@ -90,7 +91,8 @@ Depends:
9091
libsqlite3-dev,
9192
python-qt4 (>=4.1.0),
9293
python-qt4-dev (>=4.1.0),
93-
qt4-designer (>=4.4.0)
94+
qt4-designer (>=4.4.0),
95+
${misc:Depends}
9496
Provides: qgis-dev
9597
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
9698
Description: QGIS - development files
@@ -111,7 +113,7 @@ Description: GRASS plugin for QGIS
111113

112114
Package: qgis-plugin-grass-common
113115
Architecture: all
114-
Depends: ${python:Depends}
116+
Depends: python, ${python:Depends}, ${misc:Depends}
115117
Replaces: qgis-common (<< 1.5)
116118
Breaks: qgis-common (<< 1.5)
117119
Description: GRASS plugin for QGIS - architecture-independent data
@@ -124,7 +126,9 @@ Description: GRASS plugin for QGIS - architecture-independent data
124126
Package: python-qgis
125127
Section: python
126128
Architecture: any
127-
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-qscintilla2, python-psycopg2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
129+
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}),
130+
python-psycopg2, python-qscintilla2,
131+
${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, ${sip:Depends}
128132
Provides: ${python:Provides}
129133
XB-Python-Version: ${python:Versions}
130134
Description: Python bindings to QGIS
@@ -137,7 +141,7 @@ Package: python-qgis-common
137141
Section: python
138142
Architecture: all
139143
Provides: ${python:Provides}
140-
Depends: gdal-bin, python-gdal, python-matplotlib, libjs-jquery, ${python:Depends}
144+
Depends: gdal-bin, python-gdal, python-matplotlib, ${python:Depends}, ${misc:Depends}, ${sip:Depends}
141145
XB-Python-Version: ${python:Versions}
142146
Description: Python bindings to QGIS - architecture-independent files
143147
QGIS is a Geographic Information System (GIS) which manages, analyzes and
@@ -161,6 +165,7 @@ Package: qgis-providers-common
161165
Architecture: all
162166
Replaces: qgis-common (<= 1.6)
163167
Breaks: qgis-common (<= 1.6)
168+
Depends: ${misc:Depends}
164169
Description: collection of data providers to QGIS - architecture-independent files
165170
QGIS is a Geographic Information System (GIS) which manages, analyzes and
166171
display databases of geographic information.
@@ -195,3 +200,4 @@ Description: QGIS API documentation
195200
display databases of geographic information.
196201
.
197202
This package contains the QGIS API documentation.
203+

debian/control.maverick

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ Build-Depends:
1919
libqtwebkit-dev,
2020
libqwt5-qt4-dev,
2121
libspatialite-dev,
22-
libspatialindex-dev,
2322
libsqlite3-dev,
23+
libspatialindex-dev,
2424
pkg-config,
2525
pyqt4-dev-tools,
2626
python,
@@ -58,6 +58,7 @@ Description: Geographic Information System (GIS)
5858

5959
Package: qgis-common
6060
Architecture: all
61+
Depends: ${misc:Depends}
6162
Description: QGIS - architecture-independent data
6263
QGIS is a Geographic Information System (GIS) which manages, analyzes and
6364
display databases of geographic information.
@@ -92,7 +93,8 @@ Depends:
9293
libsqlite3-dev,
9394
python-qt4 (>=4.1.0),
9495
python-qt4-dev (>=4.1.0),
95-
qt4-designer (>=4.4.0)
96+
qt4-designer (>=4.4.0),
97+
${misc:Depends}
9698
Provides: qgis-dev
9799
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
98100
Description: QGIS - development files
@@ -113,7 +115,7 @@ Description: GRASS plugin for QGIS
113115

114116
Package: qgis-plugin-grass-common
115117
Architecture: all
116-
Depends: ${python:Depends}
118+
Depends: python, ${python:Depends}, ${misc:Depends}
117119
Replaces: qgis-common (<< 1.5)
118120
Breaks: qgis-common (<< 1.5)
119121
Description: GRASS plugin for QGIS - architecture-independent data
@@ -126,7 +128,9 @@ Description: GRASS plugin for QGIS - architecture-independent data
126128
Package: python-qgis
127129
Section: python
128130
Architecture: any
129-
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-psycopg2, python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
131+
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}),
132+
python-psycopg2, python-qscintilla2,
133+
${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, ${sip:Depends}
130134
Provides: ${python:Provides}
131135
XB-Python-Version: ${python:Versions}
132136
Description: Python bindings to QGIS
@@ -139,7 +143,7 @@ Package: python-qgis-common
139143
Section: python
140144
Architecture: all
141145
Provides: ${python:Provides}
142-
Depends: gdal-bin, python-gdal, python-matplotlib, ${python:Depends}
146+
Depends: gdal-bin, python-gdal, python-matplotlib, ${python:Depends}, ${misc:Depends}, ${sip:Depends}
143147
XB-Python-Version: ${python:Versions}
144148
Description: Python bindings to QGIS - architecture-independent files
145149
QGIS is a Geographic Information System (GIS) which manages, analyzes and
@@ -163,6 +167,7 @@ Package: qgis-providers-common
163167
Architecture: all
164168
Replaces: qgis-common (<= 1.6)
165169
Breaks: qgis-common (<= 1.6)
170+
Depends: ${misc:Depends}
166171
Description: collection of data providers to QGIS - architecture-independent files
167172
QGIS is a Geographic Information System (GIS) which manages, analyzes and
168173
display databases of geographic information.
@@ -191,8 +196,10 @@ Description: QGIS sql anywhere plugin and provider
191196
Package: qgis-api-doc
192197
Architecture: all
193198
Section: doc
199+
Depends: libjs-jquery
194200
Description: QGIS API documentation
195201
QGIS is a Geographic Information System (GIS) which manages, analyzes and
196202
display databases of geographic information.
197203
.
198204
This package contains the QGIS API documentation.
205+

debian/control.natty

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ Build-Depends:
1919
libqtwebkit-dev,
2020
libqwt5-qt4-dev,
2121
libspatialite-dev,
22-
libspatialindex-dev,
2322
libsqlite3-dev,
23+
libspatialindex-dev,
2424
pkg-config,
2525
pyqt4-dev-tools,
2626
python,
@@ -57,6 +57,7 @@ Description: Geographic Information System (GIS)
5757

5858
Package: qgis-common
5959
Architecture: all
60+
Depends: ${misc:Depends}
6061
Description: QGIS - architecture-independent data
6162
QGIS is a Geographic Information System (GIS) which manages, analyzes and
6263
display databases of geographic information.
@@ -91,7 +92,8 @@ Depends:
9192
libsqlite3-dev,
9293
python-qt4 (>=4.1.0),
9394
python-qt4-dev (>=4.1.0),
94-
qt4-designer (>=4.4.0)
95+
qt4-designer (>=4.4.0),
96+
${misc:Depends}
9597
Provides: qgis-dev
9698
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
9799
Description: QGIS - development files
@@ -112,7 +114,7 @@ Description: GRASS plugin for QGIS
112114

113115
Package: qgis-plugin-grass-common
114116
Architecture: all
115-
Depends: ${python:Depends}
117+
Depends: python, ${python:Depends}, ${misc:Depends}
116118
Replaces: qgis-common (<< 1.5)
117119
Breaks: qgis-common (<< 1.5)
118120
Description: GRASS plugin for QGIS - architecture-independent data
@@ -125,7 +127,9 @@ Description: GRASS plugin for QGIS - architecture-independent data
125127
Package: python-qgis
126128
Section: python
127129
Architecture: any
128-
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-psycopg2, python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
130+
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}),
131+
python-psycopg2, python-qscintilla2,
132+
${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, ${sip:Depends}
129133
Provides: ${python:Provides}
130134
XB-Python-Version: ${python:Versions}
131135
Description: Python bindings to QGIS
@@ -138,7 +142,7 @@ Package: python-qgis-common
138142
Section: python
139143
Architecture: all
140144
Provides: ${python:Provides}
141-
Depends: gdal-bin, python-gdal, python-matplotlib, ${python:Depends}
145+
Depends: gdal-bin, python-gdal, python-matplotlib, ${python:Depends}, ${misc:Depends}, ${sip:Depends}
142146
XB-Python-Version: ${python:Versions}
143147
Description: Python bindings to QGIS - architecture-independent files
144148
QGIS is a Geographic Information System (GIS) which manages, analyzes and
@@ -162,6 +166,7 @@ Package: qgis-providers-common
162166
Architecture: all
163167
Replaces: qgis-common (<= 1.6)
164168
Breaks: qgis-common (<= 1.6)
169+
Depends: ${misc:Depends}
165170
Description: collection of data providers to QGIS - architecture-independent files
166171
QGIS is a Geographic Information System (GIS) which manages, analyzes and
167172
display databases of geographic information.
@@ -190,6 +195,7 @@ Description: QGIS sql anywhere plugin and provider
190195
Package: qgis-api-doc
191196
Architecture: all
192197
Section: doc
198+
Depends: libjs-jquery
193199
Description: QGIS API documentation
194200
QGIS is a Geographic Information System (GIS) which manages, analyzes and
195201
display databases of geographic information.

0 commit comments

Comments
 (0)