Skip to content
Permalink
Browse files

Merge master

  • Loading branch information
NathanW2 committed Jun 8, 2013
2 parents 014d872 + 02c29c0 commit e6f98362dc9a65871843e7080a566cfcbac02ae5
Showing 358 changed files with 53,534 additions and 34,958 deletions.
2 CODING
@@ -507,7 +507,7 @@ development versions.
2.4. QGIS documentation sources
===============================

If you're interested in checking out Quantum GIS documentation sources:
If you're interested in checking out QGIS documentation sources:

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

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

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

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

HELP US -- Please submit bug reports using the QGIS bug tracker at:
http://hub.qgis.org/
When reporting a bug, either login or, if you don't
have a qgis trac, provide an email address where we can
have a qgis trac, provide an email address where we can
request additional information.

SUPPORT - You can get support in the following ways:
1. Using the QGIS community site at http://qgis.org
2. Joining the qgis-users mailing list at:
http://lists.osgeo.org/mailman/listinfo/qgis-user
3. Using IRC by joining the #qgis channel on irc.freenode.net.
Please wait around for a response to your question as many
folks on the channel are doing other things and it may take a
3. Using IRC by joining the #qgis channel on irc.freenode.net.
Please wait around for a response to your question as many
folks on the channel are doing other things and it may take a
while for them to notice your question.

QGIS is on GitHub at http://github.com/qgis/Quantum-GIS. If you wish to contribute
@@ -25,7 +25,7 @@ DOXYFILE_ENCODING = UTF-8
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.

PROJECT_NAME = "Quantum GIS API Documentation"
PROJECT_NAME = "QGIS API Documentation"

# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or
@@ -16,8 +16,9 @@ qgis (1.9.0) UNRELEASED; urgency=low
* include topology plugin
* drop delimited text plugin (now in core)
* drop context_help, function_help and qgis_help.db files
* use dh_sip

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

qgis (1.8.0) UNRELEASED; urgency=low

@@ -72,7 +73,7 @@ qgis (1.6.0) UNRELEASED; urgency=low
* add subversion as build dependency for trunk
* add qgis-mapserver package
* trim dependencies

-- Jürgen E. Fischer <jef@norbit.de> Sun, 17 Oct 2010 12:09:23 +0200

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

qgis (1.1.0-3) UNRELEASED; urgency=low

* include diagram overlays
* include diagram overlays

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

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

qgis (1.0.0) experimental; urgency=low

* new upstream release
* update qgis.mime
* add qgis.desktop and qgis.xml
* add qgis.desktop and qgis.xml
* add mime types for KDE
* don't ignore errors in preinst and postrm
* run ldconfig in postrm
@@ -281,7 +282,7 @@ qgis (0.11.0test3) experimental; urgency=low

qgis (0.11.0test2) experimental; urgency=low

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

qgis (0.10.0-2) gutsy; urgency=low

* fix libgdal1 grass dependency for ubuntu gutsy/hardy (1.4.0 | 1.5.0)

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

qgis (0.10.0-1) gutsy; urgency=low

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

qgis (0.9.2test1) gutsy; urgency=low

* Testing package to see if icons deploy
* Testing package to see if icons deploy

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

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

qgis (0.9.0) gutsy; urgency=low

* Quantum GIS 0.9.0 'Ganymede' release
* Quantum GIS 0.9.0 'Ganymede' release

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

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

qgis (0.8.0-5) unstable; urgency=low

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

qgis (0.5.0-2) unstable; urgency=low

* Fix typos in .install files that left out the delimitedtext plugin
* Fix typos in .install files that left out the delimitedtext plugin
(Closes: #282084)

-- 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

qgis (0.1-2) unstable; urgency=low

* Build with the Shapefile to PostGIS Import Tool (SPIT) and
* Build with the Shapefile to PostGIS Import Tool (SPIT) and
PostgreSQL support (Closes: #233191)

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

qgis (0.1-1) unstable; urgency=low

* New upstream release
* changed install location of html documentation to /usr/share/doc/qgis
* changed install location of html documentation to /usr/share/doc/qgis
* updated man page to describe new command-line options and include pointers
to HTML and PDF documentation (Closes: #234600)
* debian/control:
@@ -1,7 +1,7 @@
Source: qgis
Section: science
Priority: extra
Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
Maintainer: QGIS developers <qgis-developer@lists.osgeo.org>
Build-Depends:
bison,
cmake (>= 2.6),
@@ -40,29 +40,29 @@ Suggests: gpsbabel
Conflicts: uim-qt3
Description: Geographic Information System (GIS)
A Geographic Information System (GIS) manages, analyzes, and displays
databases of geographic information. Quantum GIS (QGIS) supports shape file
viewing and editing, spatial data storage with PostgreSQL/PostGIS, projection
on-the-fly, map composition, and a number of other features via a plugin
interface. QGIS also supports display of various georeferenced raster and
Digital Elevation Model (DEM) formats including GeoTIFF, Arc/Info ASCII Grid,
and USGS ASCII DEM.
databases of geographic information. QGIS supports shape file viewing and
editing, spatial data storage with PostgreSQL/PostGIS, projection on-the-fly,
map composition, and a number of other features via a plugin interface. QGIS
also supports display of various georeferenced raster and Digital Elevation
Model (DEM) formats including GeoTIFF, Arc/Info ASCII Grid, and USGS ASCII
DEM.

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

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

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

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
Description: GRASS plugin for QGIS - architecture-independent data
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This package contains architecture-independent supporting data files for use
with the Quantum GIS GRASS plugin.
with the QGIS GRASS plugin.

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

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

Package: qgis-providers
Architecture: any
Depends: qgis-providers-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
Replaces: qgis (<= 1.6)
Breaks: qgis (<= 1.6)
Description: collection of data providers to Quantum GIS
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
Description: collection of data providers to QGIS
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This package contains the provider plugins for Quantum GIS.
This package contains the provider plugins for QGIS.

Package: qgis-providers-common
Architecture: all
Replaces: qgis-common (<= 1.6)
Breaks: qgis-common (<= 1.6)
Description: collection of data providers to Quantum GIS - architecture-independent files
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
Description: collection of data providers to QGIS - architecture-independent files
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This package contains architecture-independent files for the Quantum GIS
providers.
This package contains architecture-independent files for the QGIS providers.

Package: qgis-mapserver
Architecture: any
Depends: qgis-providers (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: Quantum GIS mapserver
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
Description: QGIS mapserver
QGIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
.
This package contains the Quantum GIS mapserver.
This package contains the QGIS mapserver.

0 comments on commit e6f9836

Please sign in to comment.
You can’t perform that action at this time.