Skip to content
Permalink
Browse files

Merge branch 'master' into slovak

  • Loading branch information
imincik committed Jun 3, 2013
2 parents 21a884b + d4945db commit 5095afe414e9e40c1670c85b778a6c6573545c2a
Showing with 7,130 additions and 4,795 deletions.
  1. +1 −1 CODING
  2. +17 −18 README
  3. +1 −1 cmake_templates/Doxyfile.in
  4. +15 −14 debian/changelog
  5. +45 −47 debian/control
  6. +66 −62 debian/control.lucid
  7. +67 −62 debian/control.maverick
  8. +66 −62 debian/control.natty
  9. +66 −62 debian/control.oneiric
  10. +73 −70 debian/control.precise
  11. +73 −69 debian/control.quantal
  12. +73 −70 debian/control.raring
  13. +73 −69 debian/control.sid
  14. +77 −73 debian/control.sid-oracle
  15. +64 −61 debian/control.squeeze
  16. +71 −69 debian/control.wheezy
  17. +1 −1 debian/copyright
  18. +2 −2 debian/mime/application/x-qgis-layer-settings.desktop
  19. +2 −2 debian/mime/application/x-qgis-project.desktop
  20. +1 −1 debian/qbrowser.desktop
  21. +1 −1 debian/qgis-common.sharedmimeinfo
  22. +1 −1 debian/qgis.desktop
  23. +1 −1 debian/qgis.menu
  24. +1 −1 debian/qgis.mime
  25. +4 −4 debian/qgis.xml
  26. +3 −0 debian/rules
  27. +1 −1 doc/CODING.t2t
  28. +33 −33 doc/TRANSLATORS
  29. +1,237 −1,125 i18n/qgis_de.ts
  30. +520 −485 i18n/qgis_nl.ts
  31. +2 −2 images/splash/README_FONTS
  32. +17 −17 ms-windows/QGIS-Installer.nsi
  33. +2 −2 ms-windows/QGIS-Packager.bat
  34. +22 −22 ms-windows/README.html
  35. +1 −1 ms-windows/osgeo4w/browser.bat.tmpl
  36. +2 −2 ms-windows/osgeo4w/creatensis.pl
  37. +4 −4 ms-windows/osgeo4w/postinstall-desktop.bat
  38. +4 −4 ms-windows/osgeo4w/postinstall-dev.bat
  39. +4 −4 ms-windows/osgeo4w/preremove-desktop.bat
  40. +1 −1 ms-windows/osgeo4w/qgis.bat.tmpl
  41. +7 −7 ms-windows/osgeo4w/qgis.reg.tmpl
  42. +2 −2 ms-windows/quickpackage.sh
  43. +10 −15 python/console/console_editor.py
  44. +20 −3 python/core/qgsmaplayer.sip
  45. +162 −46 python/core/qgsvectorlayer.sip
  46. +1 −0 python/gui/gui.sip
  47. +24 −0 python/gui/qgssublayersdialog.sip
  48. +2 −1 python/plugins/sextante/algs/QGISAlgorithmProvider.py
  49. +2 −1 python/plugins/sextante/core/QGisLayers.py
  50. +1 −9 python/plugins/sextante/core/SextanteLog.py
  51. +1 −1 python/plugins/sextante/grass/description/r.stream.stats.txt
  52. +7 −0 python/plugins/sextante/grass/description/v.transform.pointsfile.txt
  53. +3 −4 python/plugins/sextante/grass/description/v.transform.txt
  54. +1 −0 python/plugins/sextante/gui/BatchInputSelectionPanel.py
  55. +3 −5 python/plugins/sextante/gui/ConfigDialog.py
  56. +1 −1 python/plugins/sextante/gui/CouldNotLoadResultsDialog.py
  57. +1 −0 python/plugins/sextante/gui/Help2Html.py
  58. +0 −1 python/plugins/sextante/gui/HelpEditionDialog.py
  59. +3 −3 python/plugins/sextante/gui/InputLayerSelectorPanel.py
  60. +2 −2 qbrowser.1
  61. 0 resources/context_help/{QgsIdentifyResults-en_US → QgsIdentifyResultsDialog-en_US}
  62. +1 −1 resources/context_help/QgsPluginInstallerDialog-en_US
  63. BIN resources/srs.db
  64. +1 −1 scripts/make_gource_video.sh
  65. +0 −8 src/app/CMakeLists.txt
  66. +0 −21 src/app/composer/qgscomposer.cpp
  67. +0 −5 src/app/composer/qgscomposer.h
  68. +6 −4 src/app/composer/qgscomposerlegendwidget.cpp
  69. +20 −5 src/app/composer/qgscomposerpicturewidget.cpp
  70. +9 −0 src/app/composer/qgscomposerpicturewidget.h
  71. +19 −0 src/app/nodetool/qgsselectedfeature.cpp
  72. +5 −0 src/app/nodetool/qgsselectedfeature.h
  73. +0 −71 src/app/ogr/qgsogrsublayersdialog.cpp
  74. +141 −140 src/app/qgisapp.cpp
  75. +7 −0 src/app/qgisapp.h
  76. +22 −1 src/app/qgsbookmarks.cpp
  77. +140 −105 src/app/qgslabelinggui.cpp
  78. +7 −2 src/app/qgslabelinggui.h
  79. +0 −146 src/app/qgsmaptooladdvertex.cpp
  80. +0 −47 src/app/qgsmaptooladdvertex.h
  81. +0 −112 src/app/qgsmaptooldeletevertex.cpp
  82. +0 −48 src/app/qgsmaptooldeletevertex.h
  83. +0 −206 src/app/qgsmaptoolmovevertex.cpp
  84. +0 −59 src/app/qgsmaptoolmovevertex.h
  85. +8 −20 src/app/qgsmaptoolvertexedit.cpp
  86. +2 −1 src/app/qgsoptions.cpp
  87. +5 −8 src/app/qgspluginmanager.cpp
  88. +97 −114 src/app/qgspluginregistry.cpp
  89. +2 −0 src/app/qgsprojectproperties.cpp
  90. +22 −0 src/app/qgsrasterlayerproperties.cpp
  91. +12 −11 src/app/qgssnappingdialog.cpp
  92. +31 −7 src/app/qgsvectorlayerproperties.cpp
  93. +1 −1 src/app/qgsvectorlayerproperties.h
  94. +5 −0 src/core/composer/qgslegendmodel.cpp
  95. +0 −1 src/core/qgsdatadefined.h
  96. +10 −1 src/core/qgsgml.cpp
  97. +17 −15 src/core/qgslogger.h
  98. +67 −0 src/core/qgsmaplayer.cpp
  99. +27 −0 src/core/qgsmaplayer.h
  100. +2 −0 src/core/qgsmaplayerregistry.cpp
  101. +16 −0 src/core/qgsmaplayerregistry.h
  102. +145 −229 src/core/qgsproviderregistry.cpp
  103. +5 −6 src/core/qgsvectorlayer.cpp
  104. +5 −0 src/core/qgsvectorlayer.h
  105. +6 −0 src/core/qgsvectorlayereditbuffer.cpp
  106. +4 −0 src/core/qgsvectorlayereditutils.cpp
  107. +32 −26 src/core/qgsvectorlayerundocommand.cpp
  108. +12 −4 src/core/qgsvectorlayerundocommand.h
  109. +7 −1 src/core/raster/qgsrasterblock.cpp
  110. +6 −2 src/core/raster/qgsrasterdataprovider.cpp
  111. +1 −1 src/core/raster/qgsrasterlayer.cpp
  112. +1 −1 src/core/symbology-ng/qgslinesymbollayerv2.cpp
  113. +4 −0 src/gui/CMakeLists.txt
  114. +1 −1 src/gui/qgscredentialdialog.cpp
  115. +109 −45 src/gui/qgsdatadefinedbutton.cpp
  116. +14 −1 src/gui/qgsdatadefinedbutton.h
  117. +211 −235 src/gui/qgsmapcanvassnapper.cpp
  118. +166 −0 src/gui/qgssublayersdialog.cpp
  119. +26 −9 src/{app/ogr/qgsogrsublayersdialog.h → gui/qgssublayersdialog.h}
  120. +1 −1 src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
  121. +16 −0 src/mapserver/qgis_map_serv.cpp
  122. +3 −0 src/mapserver/qgsconfigparser.h
  123. +536 −1 src/mapserver/qgsprojectparser.cpp
  124. +13 −0 src/mapserver/qgsprojectparser.h
  125. +3 −1 src/mapserver/qgssldparser.h
  126. +70 −75 src/mapserver/qgswfsserver.cpp
  127. +3 −0 src/mapserver/qgswfsserver.h
  128. +34 −0 src/mapserver/qgswmsserver.cpp
  129. +2 −0 src/mapserver/qgswmsserver.h
  130. +8 −11 src/plugins/grass/qgsgrassmodule.cpp
  131. +4 −4 src/plugins/grass/qgsgrassplugin.cpp
  132. +3 −0 src/plugins/grass/qgsgrassselect.cpp
  133. +17 −15 src/plugins/grass/qtermwidget/TerminalDisplay.cpp
  134. +21 −16 src/providers/delimitedtext/qgsdelimitedtextfile.cpp
  135. +123 −127 src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
  136. +5 −4 src/providers/delimitedtext/qgsdelimitedtextprovider.h
  137. +11 −11 src/providers/mssql/qgsmssqlprovider.cpp
  138. +5 −1 src/providers/mssql/qgsmssqlsourceselect.cpp
  139. +2 −2 src/providers/mssql/qgsmssqltablemodel.cpp
  140. +2 −2 src/providers/mssql/qgsmssqltablemodel.h
  141. +4 −3 src/providers/ogr/qgsogrfeatureiterator.cpp
  142. +133 −24 src/providers/ogr/qgsogrprovider.cpp
  143. +6 −0 src/providers/ogr/qgsogrprovider.h
  144. +6 −3 src/providers/oracle/qgsoraclecolumntypethread.cpp
  145. +3 −3 src/providers/oracle/qgsoracleconn.h
  146. +2 −2 src/providers/oracle/qgsoracletablemodel.cpp
  147. +2 −2 src/providers/oracle/qgsoracletablemodel.h
  148. +6 −3 src/providers/postgres/qgscolumntypethread.cpp
  149. +6 −6 src/providers/postgres/qgspgsourceselect.cpp
  150. +5 −5 src/providers/postgres/qgspgsourceselect.h
  151. +2 −2 src/providers/postgres/qgspgtablemodel.cpp
  152. +2 −2 src/providers/postgres/qgspgtablemodel.h
  153. +3 −3 src/providers/postgres/qgspostgresconn.h
  154. +2 −3 src/providers/wfs/qgswfsprovider.cpp
  155. +0 −2 src/providers/wfs/qgswfssourceselect.cpp
  156. +2 −5 src/ui/qgscomposerpicturewidgetbase.ui
  157. +0 −10 src/ui/qgslabelingguibase.ui
  158. +14 −0 src/ui/qgsprojectpropertiesbase.ui
  159. +129 −13 src/ui/qgsrasterlayerpropertiesbase.ui
  160. +14 −14 src/ui/{qgsogrsublayersdialogbase.ui → qgssublayersdialogbase.ui}
  161. +123 −7 src/ui/qgsvectorlayerpropertiesbase.ui
  162. +2 −2 tests/bench/main.cpp
  163. +1 −1 tests/src/providers/testqgswcspublicservers.cpp
  164. +1 −1 tests/src/python/test_qgsapplication.py
  165. +1 −1 tests/src/python/test_qgscomposereffects.py
  166. +1 −1 tests/src/python/test_qgscomposerhtml.py
  167. +1 −1 tests/src/python/test_qgscomposermap.py
  168. +1 −1 tests/src/python/test_qgscomposition.py
  169. +1 −1 tests/src/python/test_qgscoordinatetransform.py
  170. +24 −9 tests/src/python/test_qgsdelimitedtextprovider.py
  171. +17 −27 tests/src/python/test_qgsdelimitedtextprovider_wanted.py
  172. +2 −2 tests/src/python/test_qgsexpression.py
  173. +1 −1 tests/src/python/test_qgsfeature.py
  174. +1 −1 tests/src/python/test_qgsgeometry.py
  175. +1 −1 tests/src/python/test_qgslogger.py
  176. +1 −1 tests/src/python/test_qgsmemoryprovider.py
  177. +1 −1 tests/src/python/test_qgspallabeling.py
  178. +1 −1 tests/src/python/test_qgspoint.py
  179. +1 −1 tests/src/python/test_qgsrasterfilewriter.py
  180. +1 −1 tests/src/python/test_qgsrasterlayer.py
  181. +1 −1 tests/src/python/test_qgsrectangle.py
  182. +1 −1 tests/src/python/test_qgsspatialindex.py
  183. +1 −1 tests/src/python/test_qgsvectorfilewriter.py
  184. +1 −1 tests/src/python/test_qgsvectorlayer.py
  185. +1 −1 tests/src/python/utilities.py
  186. BIN tests/testdata/landsat.nc
  187. +1,292 −0 tests/testdata/layers.gpx
  188. +2 −2 tests/testdata/raster/wcs.map
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 5095afe

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