Skip to content

Commit 28829dd

Browse files
volayavolaya
committed
Merge branch 'master' of https://github.com/qgis/Quantum-GIS 
2 parents dc340de + 1095f98 commit 28829dd

File tree

279 files changed

+18079
-10095
lines changed

Some content is hidden

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

279 files changed

+18079
-10095
lines changed

‎CMakeLists.txt

+25-1
Original file line numberDiff line numberDiff line change
@@ -304,13 +304,37 @@ IF (PEDANTIC)
304304
ADD_DEFINITIONS( /wd4610 ) # user defined constructor required (sqlite3_index_info)
305305
ADD_DEFINITIONS( /wd4706 ) # assignment within conditional expression (pal)
306306
ELSE (MSVC)
307-
ADD_DEFINITIONS( -Wall -Wextra -Wno-long-long -Wformat-security -Wno-strict-aliasing )
307+
IF (APPLE)
308+
# add warnings via flags instead of definitions on Mac (otherwise -Wall can not be overridden per language)
309+
SET(_warnings "-Wall -Wextra -Wno-long-long -Wformat-security -Wno-strict-aliasing")
310+
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_warnings}")
311+
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_warnings}")
312+
ELSE (APPLE)
313+
ADD_DEFINITIONS( -Wall -Wextra -Wno-long-long -Wformat-security -Wno-strict-aliasing )
314+
ENDIF (APPLE)
308315
# Qt produces lots of warnings with strict aliasing (as of Qt 4.4.0 & GCC 4.3)
309316
# There are redundant declarations in Qt and GDAL
310317
# ADD_DEFINITIONS( -fstrict-aliasing -Wstrict-aliasing=1 -Wredundant-decls )
318+
319+
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
320+
IF (APPLE)
321+
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type-c-linkage")
322+
ELSE (APPLE)
323+
ADD_DEFINITIONS(-Wno-return-type-c-linkage) # used in plugins and providers
324+
ENDIF (APPLE)
325+
ENDIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
311326
ENDIF (MSVC)
327+
312328
ENDIF (PEDANTIC)
313329

330+
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
331+
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Qunused-arguments")
332+
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments")
333+
SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Qunused-arguments")
334+
SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Qunused-arguments")
335+
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Qunused-arguments")
336+
ENDIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
337+
314338
IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
315339
# spatialite crashes on ppc - see bugs.debian.org/603986
316340
ADD_DEFINITIONS( -fno-strict-aliasing )

‎debian/changelog

+3-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ qgis (1.9.0) UNRELEASED; urgency=low
99
* add python-unittest2 build dependency for maverick and squeeze
1010
* disable PyQgsRectangle test on lucid (depends on unittest2)
1111
* add python-psycopg2 and python-qscintilla2 dependency to python-qgis
12-
* add support for ubuntu quantal
12+
* add support for ubuntu quantal and raring
1313
* remove js files and add libjs-jquery/libjs-underscore dependency
14+
* temporarily disable mssql provider until migrated to new vector api.
1415

15-
-- Jürgen E. Fischer <jef@norbit.de> Fri, 09 Nov 2012 10:53:48 +0100
16+
-- Jürgen E. Fischer <jef@norbit.de> Thu, 31 Jan 2013 13:34:24 +0100
1617

1718
qgis (1.8.0) UNRELEASED; urgency=low
1819

‎debian/compat.quantal

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7
1+
8

‎debian/compat.raring

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

‎debian/control.quantal

+15-16
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,27 @@ Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
55
Build-Depends:
66
bison,
77
cmake (>= 2.6),
8-
debhelper (>= 7),
8+
debhelper (>= 9),
99
flex,
1010
grass-dev,
1111
libexpat1-dev,
1212
libfcgi-dev,
13-
libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
13+
libgdal1-dev,
1414
libgeos-dev (>= 3.0.0),
1515
libgsl0-dev,
1616
libpq-dev,
1717
libproj-dev,
1818
libqt4-dev (>=4.4.0),
1919
libqt4-opengl-dev,
2020
libqtwebkit-dev,
21-
libqwt5-qt4-dev,
21+
libqwt-dev,
2222
libspatialite-dev,
2323
libsqlite3-dev,
2424
libspatialindex-dev,
2525
pkg-config,
2626
pyqt4-dev-tools,
2727
python,
28-
python-central (>=0.5),
29-
python-dev,
28+
python-dev (>= 2.6.6-3~),
3029
python-qt4 (>=4.1.0),
3130
python-qt4-dev (>=4.1.0),
3231
python-sip (>= 4.5.0),
@@ -39,8 +38,8 @@ Build-Depends:
3938
txt2tags,
4039
xvfb, xauth, xfonts-base
4140
Build-Conflicts: libqgis-dev, qgis-dev
42-
Standards-Version: 3.8.4
43-
XS-Python-Version: current
41+
Standards-Version: 3.9.3
42+
X-Python-Version: current
4443
Homepage: http://qgis.org/
4544

4645
Package: qgis
@@ -60,11 +59,12 @@ Description: Geographic Information System (GIS)
6059

6160
Package: qgis-common
6261
Architecture: all
62+
Depends: ${misc:Depends}
6363
Description: Quantum GIS - architecture-independent data
6464
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
6565
and display databases of geographic information.
6666
.
67-
This package contains architecture-independent supporting data files for use
67+
This package contains architecture-independent supporting data files for use
6868
with Quantum GIS.
6969

7070
Package: libqgis{QGIS_ABI}
@@ -84,7 +84,7 @@ Section: libdevel
8484
Depends:
8585
grass-dev,
8686
libexpat1-dev,
87-
libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
87+
libgdal1-dev,
8888
libgeos-dev (>= 3.0.0),
8989
libgsl0-dev,
9090
libpq-dev,
@@ -94,7 +94,8 @@ Depends:
9494
libsqlite3-dev,
9595
python-qt4 (>=4.1.0),
9696
python-qt4-dev (>=4.1.0),
97-
qt4-designer (>=4.4.0)
97+
qt4-designer (>=4.4.0),
98+
${misc:Depends}
9899
Provides: qgis-dev
99100
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
100101
Description: Quantum GIS - development files
@@ -116,7 +117,7 @@ Description: GRASS plugin for Quantum GIS
116117

117118
Package: qgis-plugin-grass-common
118119
Architecture: all
119-
Depends: ${python:Depends}
120+
Depends: python, ${misc:Depends}
120121
Replaces: qgis-common (<< 1.5)
121122
Breaks: qgis-common (<< 1.5)
122123
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -129,9 +130,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data
129130
Package: python-qgis
130131
Section: python
131132
Architecture: any
132-
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}
133-
Provides: ${python:Provides}
134-
XB-Python-Version: ${python:Versions}
133+
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-pyspatialite, python-psycopg2, python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
135134
Description: Python bindings to Quantum GIS
136135
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
137136
and display databases of geographic information.
@@ -142,8 +141,7 @@ Package: python-qgis-common
142141
Section: python
143142
Architecture: all
144143
Provides: ${python:Provides}
145-
Depends: gdal-bin, python-gdal, libjs-jquery, libjs-underscore, ${python:Depends}
146-
XB-Python-Version: ${python:Versions}
144+
Depends: gdal-bin, python-gdal, libjs-jquery, libjs-underscore, ${misc:Depends}
147145
Description: Python bindings to Quantum GIS - architecture-independent files
148146
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
149147
and display databases of geographic information.
@@ -166,6 +164,7 @@ Package: qgis-providers-common
166164
Architecture: all
167165
Replaces: qgis-common (<= 1.6)
168166
Breaks: qgis-common (<= 1.6)
167+
Depends: ${misc:Depends}
169168
Description: collection of data providers to Quantum GIS - architecture-independent files
170169
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
171170
and display databases of geographic information.

‎debian/control.raring

+223
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,223 @@
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+
libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
14+
libgeos-dev (>= 3.0.0),
15+
libgsl0-dev,
16+
libpq-dev,
17+
libproj-dev,
18+
libqt4-dev (>=4.4.0),
19+
libqt4-opengl-dev,
20+
libqtwebkit-dev,
21+
libqwt5-qt4-dev,
22+
libspatialite-dev,
23+
libsqlite3-dev,
24+
libspatialindex-dev,
25+
pkg-config,
26+
pyqt4-dev-tools,
27+
python,
28+
python-central (>=0.5),
29+
python-dev,
30+
python-qt4 (>=4.1.0),
31+
python-qt4-dev (>=4.1.0),
32+
python-sip (>= 4.5.0),
33+
python-sip-dev (>= 4.5.0),
34+
libpython2.7-dev,
35+
libosgearth-dev,
36+
libopenscenegraph-dev,
37+
git,
38+
doxygen,
39+
graphviz,
40+
txt2tags,
41+
xvfb, xauth, xfonts-base
42+
Build-Conflicts: libqgis-dev, qgis-dev
43+
Standards-Version: 3.8.4
44+
XS-Python-Version: current
45+
Homepage: http://qgis.org/
46+
47+
Package: qgis
48+
Architecture: any
49+
Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
50+
Recommends: qgis-plugin-globe, qgis-plugin-grass, python-qgis
51+
Suggests: gpsbabel
52+
Conflicts: uim-qt3
53+
Description: Geographic Information System (GIS)
54+
A Geographic Information System (GIS) manages, analyzes, and displays
55+
databases of geographic information. Quantum GIS (QGIS) supports shape file
56+
viewing and editing, spatial data storage with PostgreSQL/PostGIS, projection
57+
on-the-fly, map composition, and a number of other features via a plugin
58+
interface. QGIS also supports display of various georeferenced raster and
59+
Digital Elevation Model (DEM) formats including GeoTIFF, Arc/Info ASCII Grid,
60+
and USGS ASCII DEM.
61+
62+
Package: qgis-common
63+
Architecture: all
64+
Description: Quantum GIS - architecture-independent data
65+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
66+
and display databases of geographic information.
67+
.
68+
This package contains architecture-independent supporting data files for use
69+
with Quantum GIS.
70+
71+
Package: libqgis{QGIS_ABI}
72+
Architecture: any
73+
Depends: ${shlibs:Depends}, ${misc:Depends}
74+
Replaces: qgis (<=0.9.2rc1), libqgis-core1, libqgis-gui1, libqgis0, libqgis1
75+
Description: Quantum GIS - shared libraries
76+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
77+
and display databases of geographic information.
78+
.
79+
This package contains the shared core and gui library that provide an
80+
interface for plugins and stand-alone applications.
81+
82+
Package: libqgis-dev
83+
Architecture: any
84+
Section: libdevel
85+
Depends:
86+
grass-dev,
87+
libexpat1-dev,
88+
libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
89+
libgeos-dev (>= 3.0.0),
90+
libgsl0-dev,
91+
libpq-dev,
92+
libproj-dev,
93+
libqgis{QGIS_ABI} (= ${binary:Version}),
94+
libqt4-dev (>=4.4.0),
95+
libsqlite3-dev,
96+
python-qt4 (>=4.1.0),
97+
python-qt4-dev (>=4.1.0),
98+
qt4-designer (>=4.4.0)
99+
Provides: qgis-dev
100+
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
101+
Description: Quantum GIS - development files
102+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
103+
and display databases of geographic information.
104+
.
105+
This package contains the headers and libraries needed to develop plugins for
106+
Quantum GIS.
107+
108+
Package: qgis-plugin-grass
109+
Architecture: any
110+
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, grass{GRASS_ABI}
111+
Description: GRASS plugin for Quantum GIS
112+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
113+
and display databases of geographic information.
114+
.
115+
This plugin enables GRASS data access in the Quantum GIS geographic data
116+
viewer.
117+
118+
Package: qgis-plugin-grass-common
119+
Architecture: all
120+
Depends: ${python:Depends}
121+
Replaces: qgis-common (<< 1.5)
122+
Breaks: qgis-common (<< 1.5)
123+
Description: GRASS plugin for Quantum GIS - architecture-independent data
124+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
125+
and display databases of geographic information.
126+
.
127+
This package contains architecture-independent supporting data files for use
128+
with the Quantum GIS GRASS plugin.
129+
130+
Package: python-qgis
131+
Section: python
132+
Architecture: any
133+
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}
134+
Provides: ${python:Provides}
135+
XB-Python-Version: ${python:Versions}
136+
Description: Python bindings to Quantum GIS
137+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
138+
and display databases of geographic information.
139+
.
140+
This package contains the files for the Python support.
141+
142+
Package: python-qgis-common
143+
Section: python
144+
Architecture: all
145+
Provides: ${python:Provides}
146+
Depends: gdal-bin, python-gdal, libjs-jquery, libjs-underscore, ${python:Depends}
147+
XB-Python-Version: ${python:Versions}
148+
Description: Python bindings to Quantum GIS - architecture-independent files
149+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
150+
and display databases of geographic information.
151+
.
152+
This package contains architecture-independent files for the Quantum GIS
153+
Python bindings.
154+
155+
Package: qgis-providers
156+
Architecture: any
157+
Depends: qgis-providers-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
158+
Replaces: qgis (<= 1.6)
159+
Breaks: qgis (<= 1.6)
160+
Description: collection of data providers to Quantum GIS
161+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
162+
and display databases of geographic information.
163+
.
164+
This package contains the provider plugins for Quantum GIS.
165+
166+
Package: qgis-providers-common
167+
Architecture: all
168+
Replaces: qgis-common (<= 1.6)
169+
Breaks: qgis-common (<= 1.6)
170+
Description: collection of data providers to Quantum GIS - architecture-independent files
171+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
172+
and display databases of geographic information.
173+
.
174+
This package contains architecture-independent files for the Quantum GIS
175+
providers.
176+
177+
Package: qgis-mapserver
178+
Architecture: any
179+
Depends: qgis-providers (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
180+
Description: Quantum GIS mapserver
181+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
182+
and display databases of geographic information.
183+
.
184+
This package contains the Quantum GIS mapserver.
185+
186+
Package: qgis-sqlanywhere
187+
Architecture: any
188+
Depends: ${shlibs:Depends}, ${misc:Depends}
189+
Conflicts: qgis-sqlanywhere1.7.0, qgis-sqlanywhere1.7.1, qgis-sqlanywhere1.8.0
190+
Description: Quantum GIS sql anywhere plugin and provider
191+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
192+
and display databases of geographic information.
193+
.
194+
This package contains the Quantum GIS sqlanywhere plugin and provider.
195+
196+
Package: qgis-api-doc
197+
Architecture: all
198+
Section: doc
199+
Depends: libjs-jquery
200+
Description: Quantum GIS API documentation
201+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
202+
and display databases of geographic information.
203+
.
204+
This package contains the Quantum GIS API documentation.
205+
206+
Package: qgis-plugin-globe
207+
Architecture: any
208+
Depends: qgis (= ${binary:Version}), qgis-plugin-globe-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
209+
Description: OSG globe plugin for Quantum GIS
210+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
211+
and display databases of geographic information.
212+
.
213+
This plugin enables 3D viewing using OSG globe in the Quantum GIS.
214+
215+
Package: qgis-plugin-globe-common
216+
Architecture: all
217+
Description: OSG GLOBE plugin for Quantum GIS - architecture-independent data
218+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
219+
and display databases of geographic information.
220+
.
221+
This package contains architecture-independent supporting data files for use
222+
with the Quantum GIS GLOBE plugin.
223+

0 commit comments

Comments
 (0)