Skip to content

Commit ab27304

Browse files
author
jef
committed
backport debian fixes including ubuntu natty support
git-svn-id: http://svn.osgeo.org/qgis/branches/Release-1_6_0@15265 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 7e8f9c1 commit ab27304

13 files changed

+196
-12
lines changed

‎debian/changelog

+5-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@ qgis (1.6.0) UNRELEASED; urgency=low
77
* add subversion as build dependency for trunk
88
* add qgis-mapserver package
99
* trim dependencies
10-
11-
-- Jürgen E. Fischer <jef@norbit.de> Sun, 17 Oct 2010 12:09:23 +0200
10+
* Missing ${python:Depends} added to python-qgis dependencies
11+
(closes: #611492)
12+
* add natty support
13+
14+
-- Jürgen E. Fischer <jef@norbit.de> Sat, 26 Feb 2011 21:37:16 +0100
1215

1316
qgis (1.5.0) UNRELEASED; urgency=low
1417

‎debian/compat.natty

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
7

‎debian/control.hardy

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data
9292
Package: python-qgis
9393
Section: python
9494
Architecture: any
95-
Depends: python-qt4 (>=4.1.0), python-sip4 (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
95+
Depends: python-qt4 (>=4.1.0), python-sip4 (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends, ${python:Depends}
9696
Provides: ${python:Provides}
9797
XB-Python-Version: ${python:Versions}
9898
Description: Python bindings to Quantum GIS

‎debian/control.intrepid

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data
9393
Package: python-qgis
9494
Section: python
9595
Architecture: any
96-
Depends: python-qt4 (>=4.1.0), python-sip4 (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
96+
Depends: python-qt4 (>=4.1.0), python-sip4 (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
9797
Provides: ${python:Provides}
9898
XB-Python-Version: ${python:Versions}
9999
Description: Python bindings to Quantum GIS

‎debian/control.jaunty

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data
9393
Package: python-qgis
9494
Section: python
9595
Architecture: any
96-
Depends: python-qt4 (>=4.1.0), python-sip4 (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
96+
Depends: python-qt4 (>=4.1.0), python-sip4 (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
9797
Provides: ${python:Provides}
9898
XB-Python-Version: ${python:Versions}
9999
Description: Python bindings to Quantum GIS

‎debian/control.karmic

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data
9393
Package: python-qgis
9494
Section: python
9595
Architecture: any
96-
Depends: python-qt4 (>=4.1.0), python-sip4 (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
96+
Depends: python-qt4 (>=4.1.0), python-sip4 (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
9797
Provides: ${python:Provides}
9898
XB-Python-Version: ${python:Versions}
9999
Description: Python bindings to Quantum GIS

‎debian/control.lenny

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data
119119
Package: python-qgis
120120
Section: python
121121
Architecture: any
122-
Depends: python-qt4 (>=4.1.0), python-sip4 (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
122+
Depends: python-qt4 (>=4.1.0), python-sip4 (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
123123
Provides: ${python:Provides}
124124
XB-Python-Version: ${python:Versions}
125125
Description: Python bindings to Quantum GIS

‎debian/control.lucid

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data
120120
Package: python-qgis
121121
Section: python
122122
Architecture: any
123-
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
123+
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
124124
Provides: ${python:Provides}
125125
XB-Python-Version: ${python:Versions}
126126
Description: Python bindings to Quantum GIS

‎debian/control.maverick

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data
121121
Package: python-qgis
122122
Section: python
123123
Architecture: any
124-
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
124+
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
125125
Provides: ${python:Provides}
126126
XB-Python-Version: ${python:Versions}
127127
Description: Python bindings to Quantum GIS

‎debian/control.natty

+176
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,176 @@
1+
Source: qgis
2+
Section: science
3+
Priority: extra
4+
Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
5+
Build-Depends:
6+
bison,
7+
cmake (>= 2.6),
8+
debhelper (>= 7),
9+
flex,
10+
grass-dev,
11+
libexpat1-dev,
12+
libfcgi-dev,
13+
libgdal1-dev,
14+
libgeos-dev (>= 3.0.0),
15+
libgsl0-dev,
16+
libpq-dev,
17+
libproj-dev,
18+
libqt4-dev (>=4.4.0),
19+
libqtwebkit-dev,
20+
libqwt5-qt4-dev,
21+
libspatialite-dev,
22+
libsqlite3-dev,
23+
pkg-config,
24+
pyqt4-dev-tools,
25+
python,
26+
python-central (>=0.5),
27+
python-dev,
28+
python-qt4 (>=4.1.0),
29+
python-qt4-dev (>=4.1.0),
30+
python-sip (>= 4.5.0),
31+
python-sip-dev (>= 4.5.0),
32+
subversion
33+
Build-Conflicts: libqgis-dev, qgis-dev
34+
Standards-Version: 3.8.4
35+
XS-Python-Version: current
36+
Homepage: http://qgis.org/
37+
38+
Package: qgis
39+
Architecture: any
40+
Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
41+
Recommends: qgis-plugin-grass, python-qgis
42+
Suggests: gpsbabel
43+
Conflicts: uim-qt3
44+
Description: Geographic Information System (GIS)
45+
A Geographic Information System (GIS) manages, analyzes, and displays
46+
databases of geographic information. Quantum GIS (QGIS) supports shape file
47+
viewing and editing, spatial data storage with PostgreSQL/PostGIS, projection
48+
on-the-fly, map composition, and a number of other features via a plugin
49+
interface. QGIS also supports display of various georeferenced raster and
50+
Digital Elevation Model (DEM) formats including GeoTIFF, Arc/Info ASCII Grid,
51+
and USGS ASCII DEM.
52+
53+
Package: qgis-common
54+
Architecture: all
55+
Description: Quantum GIS - architecture-independent data
56+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
57+
and display databases of geographic information.
58+
.
59+
This package contains architecture-independent supporting data files for use
60+
with Quantum GIS.
61+
62+
Package: libqgis{QGIS_ABI}
63+
Architecture: any
64+
Depends: ${shlibs:Depends}, ${misc:Depends}
65+
Replaces: qgis (<=0.9.2rc1), libqgis-core1, libqgis-gui1, libqgis0, libqgis1
66+
Description: Quantum GIS - shared libraries
67+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
68+
and display databases of geographic information.
69+
.
70+
This package contains the shared core and gui library that provide an
71+
interface for plugins and stand-alone applications.
72+
73+
Package: libqgis-dev
74+
Architecture: any
75+
Section: libdevel
76+
Depends:
77+
grass-dev,
78+
libexpat1-dev,
79+
libgdal1-dev,
80+
libgeos-dev (>= 3.0.0),
81+
libgsl0-dev,
82+
libpq-dev,
83+
libproj-dev,
84+
libqgis{QGIS_ABI} (= ${binary:Version}),
85+
libqt4-dev (>=4.4.0),
86+
libsqlite3-dev,
87+
python-qt4 (>=4.1.0),
88+
python-qt4-dev (>=4.1.0),
89+
qt4-designer (>=4.4.0)
90+
Provides: qgis-dev
91+
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
92+
Description: Quantum GIS - development files
93+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
94+
and display databases of geographic information.
95+
.
96+
This package contains the headers and libraries needed to develop plugins for
97+
Quantum GIS.
98+
99+
Package: qgis-plugin-grass
100+
Architecture: any
101+
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, grass{GRASS_ABI}
102+
Description: GRASS plugin for Quantum GIS
103+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
104+
and display databases of geographic information.
105+
.
106+
This plugin enables GRASS data access in the Quantum GIS geographic data
107+
viewer.
108+
109+
Package: qgis-plugin-grass-common
110+
Architecture: all
111+
Depends: python
112+
Replaces: qgis-common (<< 1.5)
113+
Breaks: qgis-common (<< 1.5)
114+
Description: GRASS plugin for Quantum GIS - architecture-independent data
115+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
116+
and display databases of geographic information.
117+
.
118+
This package contains architecture-independent supporting data files for use
119+
with the Quantum GIS GRASS plugin.
120+
121+
Package: python-qgis
122+
Section: python
123+
Architecture: any
124+
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
125+
Provides: ${python:Provides}
126+
XB-Python-Version: ${python:Versions}
127+
Description: Python bindings to Quantum GIS
128+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
129+
and display databases of geographic information.
130+
.
131+
This package contains the files for the Python support.
132+
133+
Package: python-qgis-common
134+
Section: python
135+
Architecture: all
136+
Provides: ${python:Provides}
137+
Depends: gdal-bin, python-gdal
138+
XB-Python-Version: ${python:Versions}
139+
Description: Python bindings to Quantum GIS - architecture-independent files
140+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
141+
and display databases of geographic information.
142+
.
143+
This package contains architecture-independent files for the Quantum GIS
144+
Python bindings.
145+
146+
Package: qgis-providers
147+
Architecture: any
148+
Depends: qgis-providers-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
149+
Replaces: qgis (<= 1.6)
150+
Breaks: qgis (<= 1.6)
151+
Description: collection of data providers to Quantum GIS
152+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
153+
and display databases of geographic information.
154+
.
155+
This package contains the provider plugins for Quantum GIS.
156+
157+
Package: qgis-providers-common
158+
Architecture: any
159+
Replaces: qgis-common (<= 1.6)
160+
Breaks: qgis-common (<= 1.6)
161+
Description: collection of data providers to Quantum GIS - architecture-independent files
162+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
163+
and display databases of geographic information.
164+
.
165+
This package contains architecture-independent files for the Quantum GIS
166+
providers.
167+
168+
Package: qgis-mapserver
169+
Architecture: any
170+
Depends: qgis-providers (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
171+
Description: Quantum GIS mapserver
172+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
173+
and display databases of geographic information.
174+
.
175+
This package contains the Quantum GIS mapserver.
176+

‎debian/control.sid

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data
120120
Package: python-qgis
121121
Section: python
122122
Architecture: any
123-
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
123+
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
124124
Provides: ${python:Provides}
125125
XB-Python-Version: ${python:Versions}
126126
Description: Python bindings to Quantum GIS

‎debian/control.squeeze

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data
120120
Package: python-qgis
121121
Section: python
122122
Architecture: any
123-
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
123+
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
124124
Provides: ${python:Provides}
125125
XB-Python-Version: ${python:Versions}
126126
Description: Python bindings to Quantum GIS

‎debian/rules

+5-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
1010
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
1111

1212
DISTRIBUTION := $(shell dpkg-parsechangelog --format rfc822 | sed -ne "s/^Distribution: //p")
13-
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"lenny squeeze hardy intrepid jaunty karmic lucid maverick"))
13+
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"lenny squeeze hardy intrepid jaunty karmic lucid maverick natty"))
1414
DISTRIBUTION := sid
1515
endif
1616

@@ -37,6 +37,10 @@ else
3737
CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=FALSE
3838
endif
3939

40+
ifneq (,$(findstring $(DISTRIBUTION),"natty"))
41+
CMAKE_OPTS += -D QT_QTWEBKIT_INCLUDE_DIR=/usr/include/QtWebKit
42+
endif
43+
4044
ifneq (,$(findstring $(DISTRIBUTION),"hardy intrepid"))
4145
LDFLAGS += -Wl,--as-needed -Wl,--no-undefined
4246
endif

0 commit comments

Comments
 (0)