Skip to content

Commit e6f9836

Browse files
committed
Merge master
2 parents 014d872 + 02c29c0 commit e6f9836

File tree

358 files changed

+53534
-34958
lines changed

Some content is hidden

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

358 files changed

+53534
-34958
lines changed

CODING

+1-1
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ development versions.
507507
2.4. QGIS documentation sources
508508
===============================
509509

510-
If you're interested in checking out Quantum GIS documentation sources:
510+
If you're interested in checking out QGIS documentation sources:
511511

512512
svn co https://svn.osgeo.org/qgis/docs/trunk qgis_docs
513513

README

+17-18
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
README for QGIS
1+
README for QGIS
22
----------------------------------------
3-
Quantum GIS (QGIS) is an Open Source Geographic Information System. The
4-
project was born in May of 2002 and was established as a project on
5-
SourceForge in June of the same year. We've worked hard to make GIS
6-
software (which is traditionally expensive commercial software) a viable
7-
prospect for anyone with basic access to a Personal Computer. QGIS
8-
currently runs on most Unix platforms, Windows, and OS X. QGIS is
9-
developed using the Qt toolkit (http://qt.digia.com) and C++. This
10-
means that QGIS feels snappy to use and has a pleasing, easy to use
11-
graphical user interface.
3+
QGIS is an Open Source Geographic Information System. The project was born in
4+
May of 2002 and was established as a project on SourceForge in June of the same
5+
year. We've worked hard to make GIS software (which is traditionally expensive
6+
commercial software) a viable prospect for anyone with basic access to a
7+
Personal Computer. QGIS currently runs on most Unix platforms, Windows, and OS
8+
X. QGIS is developed using the Qt toolkit (http://qt.digia.com) and C++. This
9+
means that QGIS feels snappy to use and has a pleasing, easy to use graphical
10+
user interface.
1211

1312
QGIS aims to be an easy to use GIS, providing common functions and
1413
features. The initial goal was to provide a GIS data viewer. QGIS has
@@ -40,24 +39,24 @@ Supported vector formats include:
4039
Spatialite
4140
Other OGR supported formats
4241

43-
NOTE -- Please follow the installation instructions carefully.
44-
After extracting the distribution, you can find the HTML version of the
45-
installation document in qgis/doc/index.html. The installation document is
42+
NOTE -- Please follow the installation instructions carefully.
43+
After extracting the distribution, you can find the HTML version of the
44+
installation document in qgis/doc/index.html. The installation document is
4645
also available as PDF in the same directory.
4746

4847
HELP US -- Please submit bug reports using the QGIS bug tracker at:
4948
http://hub.qgis.org/
5049
When reporting a bug, either login or, if you don't
51-
have a qgis trac, provide an email address where we can
50+
have a qgis trac, provide an email address where we can
5251
request additional information.
53-
52+
5453
SUPPORT - You can get support in the following ways:
5554
1. Using the QGIS community site at http://qgis.org
5655
2. Joining the qgis-users mailing list at:
5756
http://lists.osgeo.org/mailman/listinfo/qgis-user
58-
3. Using IRC by joining the #qgis channel on irc.freenode.net.
59-
Please wait around for a response to your question as many
60-
folks on the channel are doing other things and it may take a
57+
3. Using IRC by joining the #qgis channel on irc.freenode.net.
58+
Please wait around for a response to your question as many
59+
folks on the channel are doing other things and it may take a
6160
while for them to notice your question.
6261

6362
QGIS is on GitHub at http://github.com/qgis/Quantum-GIS. If you wish to contribute

cmake_templates/Doxyfile.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ DOXYFILE_ENCODING = UTF-8
2525
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
2626
# by quotes) that should identify the project.
2727

28-
PROJECT_NAME = "Quantum GIS API Documentation"
28+
PROJECT_NAME = "QGIS API Documentation"
2929

3030
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
3131
# This could be handy for archiving the generated documentation or

debian/changelog

+15-14
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

+45-47
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Source: qgis
22
Section: science
33
Priority: extra
4-
Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
4+
Maintainer: QGIS developers <qgis-developer@lists.osgeo.org>
55
Build-Depends:
66
bison,
77
cmake (>= 2.6),
@@ -40,29 +40,29 @@ Suggests: gpsbabel
4040
Conflicts: uim-qt3
4141
Description: Geographic Information System (GIS)
4242
A Geographic Information System (GIS) manages, analyzes, and displays
43-
databases of geographic information. Quantum GIS (QGIS) supports shape file
44-
viewing and editing, spatial data storage with PostgreSQL/PostGIS, projection
45-
on-the-fly, map composition, and a number of other features via a plugin
46-
interface. QGIS also supports display of various georeferenced raster and
47-
Digital Elevation Model (DEM) formats including GeoTIFF, Arc/Info ASCII Grid,
48-
and USGS ASCII DEM.
43+
databases of geographic information. QGIS supports shape file viewing and
44+
editing, spatial data storage with PostgreSQL/PostGIS, projection on-the-fly,
45+
map composition, and a number of other features via a plugin interface. QGIS
46+
also supports display of various georeferenced raster and Digital Elevation
47+
Model (DEM) formats including GeoTIFF, Arc/Info ASCII Grid, and USGS ASCII
48+
DEM.
4949

5050
Package: qgis-common
5151
Architecture: all
52-
Description: Quantum GIS - architecture-independent data
53-
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
54-
and display databases of geographic information.
52+
Description: QGIS - architecture-independent data
53+
QGIS is a Geographic Information System (GIS) which manages, analyzes and
54+
display databases of geographic information.
5555
.
5656
This package contains architecture-independent supporting data files for use
57-
with Quantum GIS.
57+
with QGIS.
5858

5959
Package: libqgis1.8.0
6060
Architecture: any
6161
Depends: ${shlibs:Depends}, ${misc:Depends}
6262
Replaces: qgis (<=0.9.2rc1), libqgis-core1, libqgis-gui1, libqgis0, libqgis1
63-
Description: Quantum GIS - shared libraries
64-
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
65-
and display databases of geographic information.
63+
Description: QGIS - shared libraries
64+
QGIS is a Geographic Information System (GIS) which manages, analyzes and
65+
display databases of geographic information.
6666
.
6767
This package contains the shared core and gui library that provide an
6868
interface for plugins and stand-alone applications.
@@ -86,44 +86,43 @@ Depends:
8686
qt4-designer (>=4.4.0)
8787
Provides: qgis-dev
8888
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
89-
Description: Quantum GIS - development files
90-
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
91-
and display databases of geographic information.
89+
Description: QGIS - development files
90+
QGIS is a Geographic Information System (GIS) which manages, analyzes and
91+
display databases of geographic information.
9292
.
9393
This package contains the headers and libraries needed to develop plugins for
94-
Quantum GIS.
94+
QGIS.
9595

9696
Package: qgis-plugin-grass
9797
Architecture: any
9898
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, grass
99-
Description: GRASS plugin for Quantum GIS
100-
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
101-
and display databases of geographic information.
99+
Description: GRASS plugin for QGIS
100+
QGIS is a Geographic Information System (GIS) which manages, analyzes and
101+
display databases of geographic information.
102102
.
103-
This plugin enables GRASS data access in the Quantum GIS geographic data
104-
viewer.
103+
This plugin enables GRASS data access in the QGIS geographic data viewer.
105104

106105
Package: qgis-plugin-grass-common
107106
Architecture: all
108107
Depends: python
109108
Replaces: qgis-common (<< 1.5)
110109
Breaks: qgis-common (<< 1.5)
111-
Description: GRASS plugin for Quantum GIS - architecture-independent data
112-
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
113-
and display databases of geographic information.
110+
Description: GRASS plugin for QGIS - architecture-independent data
111+
QGIS is a Geographic Information System (GIS) which manages, analyzes and
112+
display databases of geographic information.
114113
.
115114
This package contains architecture-independent supporting data files for use
116-
with the Quantum GIS GRASS plugin.
115+
with the QGIS GRASS plugin.
117116

118117
Package: python-qgis
119118
Section: python
120119
Architecture: any
121120
Depends: python-qt4 (>=4.1.0), python-sip4 (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
122121
Provides: ${python:Provides}
123122
XB-Python-Version: ${python:Versions}
124-
Description: Python bindings to Quantum GIS
125-
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
126-
and display databases of geographic information.
123+
Description: Python bindings to QGIS
124+
QGIS is a Geographic Information System (GIS) which manages, analyzes and
125+
display databases of geographic information.
127126
.
128127
This package contains the files for the Python support.
129128

@@ -133,41 +132,40 @@ Architecture: all
133132
Provides: ${python:Provides}
134133
Depends: gdal-bin, python-gdal, python-matplotlib
135134
XB-Python-Version: ${python:Versions}
136-
Description: Python bindings to Quantum GIS - architecture-independent files
137-
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
138-
and display databases of geographic information.
135+
Description: Python bindings to QGIS - architecture-independent files
136+
QGIS is a Geographic Information System (GIS) which manages, analyzes and
137+
display databases of geographic information.
139138
.
140-
This package contains architecture-independent files for the Quantum GIS
141-
Python bindings.
139+
This package contains architecture-independent files for the QGIS Python
140+
bindings.
142141

143142
Package: qgis-providers
144143
Architecture: any
145144
Depends: qgis-providers-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
146145
Replaces: qgis (<= 1.6)
147146
Breaks: qgis (<= 1.6)
148-
Description: collection of data providers to Quantum GIS
149-
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
150-
and display databases of geographic information.
147+
Description: collection of data providers to QGIS
148+
QGIS is a Geographic Information System (GIS) which manages, analyzes and
149+
display databases of geographic information.
151150
.
152-
This package contains the provider plugins for Quantum GIS.
151+
This package contains the provider plugins for QGIS.
153152

154153
Package: qgis-providers-common
155154
Architecture: all
156155
Replaces: qgis-common (<= 1.6)
157156
Breaks: qgis-common (<= 1.6)
158-
Description: collection of data providers to Quantum GIS - architecture-independent files
159-
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
160-
and display databases of geographic information.
157+
Description: collection of data providers to QGIS - architecture-independent files
158+
QGIS is a Geographic Information System (GIS) which manages, analyzes and
159+
display databases of geographic information.
161160
.
162-
This package contains architecture-independent files for the Quantum GIS
163-
providers.
161+
This package contains architecture-independent files for the QGIS providers.
164162

165163
Package: qgis-mapserver
166164
Architecture: any
167165
Depends: qgis-providers (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
168-
Description: Quantum GIS mapserver
169-
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
166+
Description: QGIS mapserver
167+
QGIS is a Geographic Information System (GIS) which manages, analyzes
170168
and display databases of geographic information.
171169
.
172-
This package contains the Quantum GIS mapserver.
170+
This package contains the QGIS mapserver.
173171

0 commit comments

Comments
 (0)