Skip to content
Permalink
Browse files
Merge branch 'master' of https://github.com/qgis/Quantum-GIS
  • Loading branch information
volaya committed Feb 3, 2013
2 parents dc340de + 1095f98 commit 28829ddc15c2cfc900144041346ff1ee4d696c8b
Showing with 18,079 additions and 10,095 deletions.
  1. +25 −1 CMakeLists.txt
  2. +3 −2 debian/changelog
  3. +1 −1 debian/compat.quantal
  4. +1 −0 debian/compat.raring
  5. +15 −16 debian/control.quantal
  6. +223 −0 debian/control.raring
  7. +0 −2 debian/python-qgis.install.quantal
  8. +5 −0 debian/python-qgis.install.raring
  9. +6 −2 debian/rules
  10. +38 −38 doc/TRANSLATORS
  11. +27 −3 doc/osx.t2t
  12. +1,180 −1,120 i18n/qgis_de.ts
  13. +10,500 −5,626 i18n/qgis_et_EE.ts
  14. +17 −17 i18n/qgis_pt_PT.ts
  15. +3 −0 mac/cmake/0vars.cmake.in
  16. +1 −1 mac/cmake/1qt.cmake.in
  17. +8 −1 ms-windows/QGIS-Installer.nsi
  18. +5 −4 ms-windows/osgeo4w/creatensis.pl
  19. +1 −1 ms-windows/osgeo4w/package-nightly.cmd
  20. +2 −2 ms-windows/osgeo4w/package.cmd
  21. +22 −13 python/console/console_help/i18n/ru_RU.properties
  22. +14 −0 python/core/qgsdataprovider.sip
  23. +2 −1 python/core/qgsfeature.sip
  24. +4 −4 python/core/qgsfeaturerequest.sip
  25. +7 −2 python/core/qgsmaplayer.sip
  26. +6 −1 python/core/qgsmaplayerregistry.sip
  27. +33 −26 python/core/qgsvectordataprovider.sip
  28. +126 −28 python/core/qgsvectorlayer.sip
  29. +75 −70 python/core/qgsvectorlayereditbuffer.sip
  30. +2 −0 python/core/qgsvectorlayerimport.sip
  31. +19 −9 python/core/raster/qgsrasterdataprovider.sip
  32. +3 −1 python/core/raster/qgsrasterfilewriter.sip
  33. +0 −21 python/core/raster/qgsrasterlayer.sip
  34. +2 −2 python/core/symbology-ng/qgssymbollayerv2utils.sip
  35. +5 −2 python/gui/qgscollapsiblegroupbox.sip
  36. +28 −0 python/gui/qgslegendinterface.sip
  37. +2 −0 python/gui/qgsrasterformatsaveoptionswidget.sip
  38. +3 −2 python/gui/qgsrasterlayersaveasdialog.sip
  39. +10 −1 python/gui/qgsrasterpyramidsoptionswidget.sip
  40. +9 −1 python/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.sip
  41. +10 −1 python/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.sip
  42. +11 −11 python/plugins/GdalTools/GdalTools.py
  43. +5 −0 python/plugins/GdalTools/tools/GdalTools_utils.py
  44. +15 −5 python/plugins/GdalTools/tools/doDEM.py
  45. +38 −16 python/plugins/GdalTools/tools/doOverview.py
  46. +12 −6 python/plugins/GdalTools/tools/doTranslate.py
  47. +282 −252 python/plugins/GdalTools/tools/widgetDEM.ui
  48. +181 −144 python/plugins/GdalTools/tools/widgetOverview.ui
  49. +12 −1 python/plugins/GdalTools/tools/widgetPluginBase.py
  50. +14 −5 python/plugins/GdalTools/tools/widgetTranslate.ui
  51. +4 −1 python/plugins/db_manager/dlg_import_vector.py
  52. +8 −8 python/plugins/fTools/tools/doEliminate.py
  53. +90 −104 python/plugins/fTools/tools/doGeometry.py
  54. +116 −160 python/plugins/fTools/tools/doGeoprocessing.py
  55. +5 −7 python/plugins/fTools/tools/doIntersectLines.py
  56. +4 −7 python/plugins/fTools/tools/doMeanCoords.py
  57. +37 −20 python/plugins/fTools/tools/doMergeShapes.py
  58. +14 −16 python/plugins/fTools/tools/doPointDistance.py
  59. +5 −9 python/plugins/fTools/tools/doPointsInPolygon.py
  60. +10 −12 python/plugins/fTools/tools/doRandPoints.py
  61. +4 −7 python/plugins/fTools/tools/doSelectByLocation.py
  62. +16 −16 python/plugins/fTools/tools/doSimplify.py
  63. +9 −11 python/plugins/fTools/tools/doSpatialJoin.py
  64. +4 −6 python/plugins/fTools/tools/doSubsetSelect.py
  65. +5 −9 python/plugins/fTools/tools/doSumLines.py
  66. +6 −6 python/plugins/fTools/tools/doValidate.py
  67. +7 −5 python/plugins/fTools/tools/doVectorSplit.py
  68. +15 −22 python/plugins/fTools/tools/doVisual.py
  69. +17 −39 python/plugins/fTools/tools/ftools_utils.py
  70. +4 −2 python/plugins/mapserver_export/ms_export.py
  71. +1 −1 python/plugins/sextante/algs/ftools/Intersection.py
  72. +1 −1 python/plugins/sextante/algs/ftools/Union.py
  73. +58 −56 python/plugins/sextante/algs/ftools/ftools_utils.py
  74. +19 −15 python/plugins/sextante/gui/ParametersPanel.py
  75. +4 −1 python/utils.py
  76. +1 −1 scripts/prepare-commit.sh
  77. +19 −8 src/analysis/CMakeLists.txt
  78. +4 −3 src/analysis/interpolation/qgsinterpolator.cpp
  79. +4 −2 src/analysis/interpolation/qgstininterpolator.cpp
  80. +7 −6 src/analysis/network/qgslinevectorlayerdirector.cpp
  81. +24 −27 src/analysis/vector/qgsgeometryanalyzer.cpp
  82. +10 −9 src/analysis/vector/qgsoverlayanalyzer.cpp
  83. +0 −1 src/analysis/vector/qgszonalstatistics.cpp
  84. +27 −0 src/app/legend/qgsapplegendinterface.cpp
  85. +8 −0 src/app/legend/qgsapplegendinterface.h
  86. +164 −4 src/app/legend/qgslegend.cpp
  87. +34 −1 src/app/legend/qgslegend.h
  88. +11 −0 src/app/legend/qgslegendgroup.cpp
  89. +7 −0 src/app/legend/qgslegendgroup.h
  90. +6 −8 src/app/legend/qgslegendlayer.cpp
  91. +6 −5 src/app/legend/qgslegendlayer.h
  92. +1 −1 src/app/nodetool/qgsmaptoolnodetool.cpp
  93. +1 −1 src/app/nodetool/qgsselectedfeature.cpp
  94. +27 −0 src/app/ogr/qgsvectorlayersaveasdialog.cpp
  95. +7 −0 src/app/ogr/qgsvectorlayersaveasdialog.h
  96. +169 −16 src/app/qgisapp.cpp
  97. +7 −0 src/app/qgisapp.h
  98. +1 −1 src/app/qgsattributedialog.cpp
  99. +6 −3 src/app/qgsattributetabledialog.cpp
  100. +5 −3 src/app/qgsattributetypedialog.cpp
  101. +6 −4 src/app/qgsattributetypeloaddialog.cpp
  102. +2 −2 src/app/qgsfieldcalculator.cpp
  103. +2 −2 src/app/qgsgraduatedsymboldialog.cpp
  104. +3 −3 src/app/qgsidentifyresults.cpp
  105. +1 −1 src/app/qgslabelpropertydialog.cpp
  106. +1 −1 src/app/qgsmaptooldeletepart.cpp
  107. +1 −1 src/app/qgsmaptooldeletering.cpp
  108. +2 −2 src/app/qgsmaptoolfeatureaction.cpp
  109. +2 −2 src/app/qgsmaptoolidentify.cpp
  110. +9 −6 src/app/qgsmaptoollabel.cpp
  111. +2 −2 src/app/qgsmaptoolmovefeature.cpp
  112. +1 −1 src/app/qgsmaptooloffsetcurve.cpp
  113. +10 −8 src/app/qgsmaptoolpinlabels.cpp
  114. +2 −2 src/app/qgsmaptoolreshape.cpp
  115. +3 −3 src/app/qgsmaptoolrotatefeature.cpp
  116. +1 −1 src/app/qgsmaptoolrotatepointsymbols.cpp
  117. +2 −2 src/app/qgsmaptoolselectutils.cpp
  118. +3 −3 src/app/qgsmaptoolshowhidelabels.cpp
  119. +3 −3 src/app/qgsmaptoolsimplify.cpp
  120. +1 −1 src/app/qgsmergeattributesdialog.cpp
  121. +57 −1 src/app/qgsoptions.cpp
  122. +10 −0 src/app/qgsoptions.h
  123. +7 −1 src/app/qgsrasterlayerproperties.cpp
  124. +3 −0 src/app/qgsrasterlayerproperties.h
  125. +6 −2 src/app/qgsvectorlayerproperties.cpp
  126. +5 −0 src/app/qgsvectorlayerproperties.h
  127. +5 −0 src/core/CMakeLists.txt
  128. +12 −12 src/core/composer/qgsatlascomposition.cpp
  129. +8 −9 src/core/composer/qgscomposerattributetable.cpp
  130. +1 −1 src/core/composer/qgscomposerlegend.cpp
  131. +2 −2 src/core/composer/qgscomposertable.cpp
  132. +1 −1 src/core/composer/qgscomposertable.h
  133. +2 −1 src/core/composer/qgscomposition.h
  134. +2 −0 src/core/qgis.h
  135. +14 −0 src/core/qgsfeatureiterator.cpp
  136. +14 −0 src/core/qgsfeatureiterator.h
  137. +14 −0 src/core/qgsfeaturerequest.cpp
  138. +18 −3 src/core/qgsfeaturerequest.h
  139. +11 −12 src/core/qgsmaplayer.cpp
  140. +12 −2 src/core/qgsmaplayer.h
  141. +12 −0 src/core/qgsmaplayerregistry.cpp
  142. +6 −1 src/core/qgsmaplayerregistry.h
  143. +4 −0 src/core/qgsmessagelog.cpp
  144. +9 −7 src/core/qgsofflineediting.cpp
  145. +1 −1 src/core/qgsproject.cpp
  146. +6 −4 src/core/qgsvectordataprovider.h
  147. +426 −34 src/core/qgsvectorfilewriter.cpp
  148. +51 −5 src/core/qgsvectorfilewriter.h
  149. +104 −56 src/core/qgsvectorlayer.cpp
  150. +13 −13 src/core/qgsvectorlayer.h
  151. +17 −3 src/core/qgsvectorlayercache.cpp
  152. +35 −21 src/core/qgsvectorlayercache.h
  153. +32 −18 src/core/qgsvectorlayereditbuffer.cpp
  154. +125 −113 src/core/qgsvectorlayereditbuffer.h
  155. +27 −14 src/core/qgsvectorlayereditutils.cpp
  156. +103 −89 src/core/qgsvectorlayereditutils.h
  157. +21 −7 src/core/qgsvectorlayerfeatureiterator.cpp
  158. +77 −63 src/core/qgsvectorlayerfeatureiterator.h
  159. +26 −8 src/core/qgsvectorlayerimport.cpp
  160. +1 −0 src/core/qgsvectorlayerimport.h
  161. +9 −8 src/core/qgsvectorlayerjoinbuffer.cpp
  162. +30 −30 src/core/qgsvectorlayerundocommand.cpp
  163. +0 −2 src/core/qgswfsdata.h
  164. +57 −0 src/core/raster/qgsrasterdataprovider.cpp
  165. +23 −12 src/core/raster/qgsrasterdataprovider.h
  166. +3 −2 src/core/raster/qgsrasterfilewriter.cpp
  167. +4 −1 src/core/raster/qgsrasterfilewriter.h
  168. +0 −32 src/core/raster/qgsrasterlayer.h
  169. +26 −0 src/core/symbology-ng/qgsfillsymbollayerv2.cpp
  170. +4 −0 src/core/symbology-ng/qgsfillsymbollayerv2.h
  171. +3 −2 src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
  172. +15 −0 src/core/symbology-ng/qgslinesymbollayerv2.cpp
  173. +2 −0 src/core/symbology-ng/qgslinesymbollayerv2.h
  174. +62 −0 src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
  175. +2 −0 src/core/symbology-ng/qgsmarkersymbollayerv2.h
  176. +3 −5 src/core/symbology-ng/qgspointdisplacementrenderer.cpp
  177. +2 −0 src/core/symbology-ng/qgssymbollayerv2.h
  178. +86 −2 src/core/symbology-ng/qgssymbollayerv2utils.cpp
  179. +12 −2 src/core/symbology-ng/qgssymbollayerv2utils.h
  180. +0 −1 src/core/symbology-ng/qgssymbolv2.h
  181. +2 −2 src/gui/attributetable/qgsattributetablememorymodel.cpp
  182. +17 −6 src/gui/attributetable/qgsattributetablemodel.cpp
  183. +3 −2 src/gui/qgsattributeeditor.cpp
  184. +34 −11 src/gui/qgscollapsiblegroupbox.cpp
  185. +12 −2 src/gui/qgscollapsiblegroupbox.h
  186. +2 −3 src/gui/qgsexpressionbuilderdialog.cpp
  187. +5 −3 src/gui/qgsexpressionbuilderdialog.h
  188. +1 −2 src/gui/qgsexpressionbuilderwidget.cpp
  189. +4 −4 src/gui/qgsformannotationitem.cpp
  190. +3 −3 src/gui/qgshtmlannotationitem.cpp
  191. +36 −0 src/gui/qgslegendinterface.h
  192. +1 −2 src/gui/qgsmaptip.cpp
  193. +24 −20 src/gui/qgsmessagebar.cpp
  194. +95 −31 src/gui/qgsrasterformatsaveoptionswidget.cpp
  195. +15 −1 src/gui/qgsrasterformatsaveoptionswidget.h
  196. +14 −4 src/gui/qgsrasterlayersaveasdialog.cpp
  197. +4 −2 src/gui/qgsrasterlayersaveasdialog.h
  198. +22 −10 src/gui/qgsrasterpyramidsoptionswidget.cpp
  199. +7 −6 src/gui/qgsrasterpyramidsoptionswidget.h
  200. +4 −5 src/gui/qgssearchquerybuilder.cpp
  201. +2 −2 src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
  202. +1 −1 src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h
  203. +2 −2 src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
  204. +1 −1 src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h
  205. +4 −4 src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
  206. +60 −23 src/mapserver/qgswfsserver.cpp
  207. +5 −2 src/mapserver/qgswmsserver.cpp
  208. +1 −1 src/plugins/CMakeLists.txt
  209. +4 −4 src/plugins/diagram_overlay/qgsdiagramoverlay.cpp
  210. +1 −1 src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp
  211. +2 −2 src/plugins/evis/idtool/eviseventidtool.cpp
  212. +2 −3 src/plugins/globe/globe_plugin.cpp
  213. +11 −0 src/plugins/grass/CMakeLists.txt
  214. +2 −1 src/plugins/grass/qgsgrassmapcalc.cpp
  215. +1 −1 src/plugins/grass/qgsgrassmapcalc.h
  216. +1 −1 src/plugins/grass/qgsgrasstoolsbase.ui
  217. +1 −1 src/plugins/grass/qtermwidget/KeyboardTranslator.cpp
  218. +1 −1 src/plugins/grass/qtermwidget/k3processcontroller.cpp
  219. +2 −2 src/plugins/heatmap/heatmap.cpp
  220. +8 −12 src/plugins/spatialquery/qgsreaderfeatures.cpp
  221. +1 −0 src/plugins/spatialquery/qgsreaderfeatures.h
  222. +1 −1 src/plugins/spatialquery/qgsrubberselectid.cpp
  223. +2 −2 src/plugins/spatialquery/qgsspatialquery.cpp
  224. +1 −1 src/plugins/spatialquery/qgsspatialquerydialog.cpp
  225. +2 −2 src/providers/CMakeLists.txt
  226. +25 −11 src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.cpp
  227. +15 −1 src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.h
  228. +108 −45 src/providers/gdal/qgsgdalprovider.cpp
  229. +7 −3 src/providers/gdal/qgsgdalprovider.h
  230. +28 −14 src/providers/gpx/qgsgpxfeatureiterator.cpp
  231. +20 −6 src/providers/gpx/qgsgpxfeatureiterator.h
  232. +14 −0 src/providers/grass/qgsgrassfeatureiterator.cpp
  233. +14 −0 src/providers/grass/qgsgrassfeatureiterator.h
  234. +14 −0 src/providers/memory/qgsmemoryfeatureiterator.cpp
  235. +14 −0 src/providers/memory/qgsmemoryfeatureiterator.h
  236. +1 −3 src/providers/mssql/CMakeLists.txt
  237. +276 −0 src/providers/mssql/qgsmssqlfeatureiterator.cpp
  238. +76 −0 src/providers/mssql/qgsmssqlfeatureiterator.h
  239. +186 −363 src/providers/mssql/qgsmssqlprovider.cpp
  240. +13 −41 src/providers/mssql/qgsmssqlprovider.h
  241. +1 −0 src/providers/ogr/CMakeLists.txt
  242. +14 −0 src/providers/ogr/qgsogrfeatureiterator.cpp
  243. +14 −0 src/providers/ogr/qgsogrfeatureiterator.h
  244. +1 −7 src/providers/oracle/qgsoracleconn.cpp
  245. +2 −1 src/providers/oracle/qgsoracleconn.h
  246. +36 −30 src/providers/oracle/qgsoracleprovider.cpp
  247. +0 −1 src/providers/oracle/qgsoraclesourceselect.cpp
  248. +11 −11 src/providers/oracle/qgsoracletablemodel.cpp
  249. +22 −8 src/providers/osm/osmfeatureiterator.cpp
  250. +14 −0 src/providers/osm/osmfeatureiterator.h
  251. +22 −8 src/providers/postgres/qgspostgresfeatureiterator.cpp
  252. +14 −0 src/providers/postgres/qgspostgresfeatureiterator.h
  253. +1 −1 src/providers/postgres/qgspostgresprovider.cpp
  254. +14 −0 src/providers/spatialite/qgsspatialitefeatureiterator.cpp
  255. +14 −0 src/providers/spatialite/qgsspatialitefeatureiterator.h
  256. +5 −5 src/providers/spatialite/qgsspatialiteprovider.cpp
  257. +8 −3 src/providers/sqlanywhere/CMakeLists.txt
  258. +376 −0 src/providers/sqlanywhere/qgssqlanywherefeatureiterator.cpp
  259. +64 −0 src/providers/sqlanywhere/qgssqlanywherefeatureiterator.h
  260. +37 −343 src/providers/sqlanywhere/qgssqlanywhereprovider.cpp
  261. +17 −63 src/providers/sqlanywhere/qgssqlanywhereprovider.h
  262. +1 −1 src/providers/sqlanywhere/sqlanyconnection/sqlanyconnection.cpp
  263. +1 −1 src/providers/sqlanywhere/sqlanyconnection/sqlanyconnection.h
  264. +1 −1 src/providers/sqlanywhere/sqlanyconnection/sqlanystatement.cpp
  265. +1 −1 src/providers/sqlanywhere/sqlanyconnection/sqlanystatement.h
  266. +16 −0 src/providers/wfs/qgswfsfeatureiterator.cpp
  267. +14 −0 src/providers/wfs/qgswfsfeatureiterator.h
  268. +1 −1 src/ui/qgsabout.ui
  269. +8 −16 src/ui/qgsexpressionbuilder.ui
  270. +199 −33 src/ui/qgsoptionsbase.ui
  271. +1 −1 src/ui/qgsoraclenewconnectionbase.ui
  272. +19 −9 src/ui/qgsrasterlayerpropertiesbase.ui
  273. +54 −54 src/ui/qgsrasterpyramidsoptionswidgetbase.ui
  274. +36 −19 src/ui/qgsvectorlayerpropertiesbase.ui
  275. +67 −37 src/ui/qgsvectorlayersaveasdialogbase.ui
  276. +3 −4 tests/src/core/testqgscomposerlabel.cpp
  277. +1 −1 tests/src/core/testqgsdataitem.cpp
  278. +2 −2 tests/src/core/testqgsvectorlayer.cpp
  279. BIN tests/testdata/control_images/expected_diagram/expected_piediagram.png
@@ -304,13 +304,37 @@ IF (PEDANTIC)
ADD_DEFINITIONS( /wd4610 ) # user defined constructor required (sqlite3_index_info)
ADD_DEFINITIONS( /wd4706 ) # assignment within conditional expression (pal)
ELSE (MSVC)
ADD_DEFINITIONS( -Wall -Wextra -Wno-long-long -Wformat-security -Wno-strict-aliasing )
IF (APPLE)
# add warnings via flags instead of definitions on Mac (otherwise -Wall can not be overridden per language)
SET(_warnings "-Wall -Wextra -Wno-long-long -Wformat-security -Wno-strict-aliasing")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_warnings}")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_warnings}")
ELSE (APPLE)
ADD_DEFINITIONS( -Wall -Wextra -Wno-long-long -Wformat-security -Wno-strict-aliasing )
ENDIF (APPLE)
# Qt produces lots of warnings with strict aliasing (as of Qt 4.4.0 & GCC 4.3)
# There are redundant declarations in Qt and GDAL
# ADD_DEFINITIONS( -fstrict-aliasing -Wstrict-aliasing=1 -Wredundant-decls )

IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
IF (APPLE)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type-c-linkage")
ELSE (APPLE)
ADD_DEFINITIONS(-Wno-return-type-c-linkage) # used in plugins and providers
ENDIF (APPLE)
ENDIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
ENDIF (MSVC)

ENDIF (PEDANTIC)

IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Qunused-arguments")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments")
SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Qunused-arguments")
SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Qunused-arguments")
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Qunused-arguments")
ENDIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")

IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
# spatialite crashes on ppc - see bugs.debian.org/603986
ADD_DEFINITIONS( -fno-strict-aliasing )
@@ -9,10 +9,11 @@ qgis (1.9.0) UNRELEASED; urgency=low
* add python-unittest2 build dependency for maverick and squeeze
* disable PyQgsRectangle test on lucid (depends on unittest2)
* add python-psycopg2 and python-qscintilla2 dependency to python-qgis
* add support for ubuntu quantal
* add support for ubuntu quantal and raring
* remove js files and add libjs-jquery/libjs-underscore dependency
* temporarily disable mssql provider until migrated to new vector api.

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

qgis (1.8.0) UNRELEASED; urgency=low

@@ -1 +1 @@
7
8
@@ -0,0 +1 @@
7
@@ -5,28 +5,27 @@ Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
Build-Depends:
bison,
cmake (>= 2.6),
debhelper (>= 7),
debhelper (>= 9),
flex,
grass-dev,
libexpat1-dev,
libfcgi-dev,
libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
libgdal1-dev,
libgeos-dev (>= 3.0.0),
libgsl0-dev,
libpq-dev,
libproj-dev,
libqt4-dev (>=4.4.0),
libqt4-opengl-dev,
libqtwebkit-dev,
libqwt5-qt4-dev,
libqwt-dev,
libspatialite-dev,
libsqlite3-dev,
libspatialindex-dev,
pkg-config,
pyqt4-dev-tools,
python,
python-central (>=0.5),
python-dev,
python-dev (>= 2.6.6-3~),
python-qt4 (>=4.1.0),
python-qt4-dev (>=4.1.0),
python-sip (>= 4.5.0),
@@ -39,8 +38,8 @@ Build-Depends:
txt2tags,
xvfb, xauth, xfonts-base
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.4
XS-Python-Version: current
Standards-Version: 3.9.3
X-Python-Version: current
Homepage: http://qgis.org/

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

Package: qgis-common
Architecture: all
Depends: ${misc:Depends}
Description: Quantum GIS - architecture-independent data
Quantum GIS 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
This package contains architecture-independent supporting data files for use
with Quantum GIS.

Package: libqgis{QGIS_ABI}
@@ -84,7 +84,7 @@ Section: libdevel
Depends:
grass-dev,
libexpat1-dev,
libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
libgdal1-dev,
libgeos-dev (>= 3.0.0),
libgsl0-dev,
libpq-dev,
@@ -94,7 +94,8 @@ Depends:
libsqlite3-dev,
python-qt4 (>=4.1.0),
python-qt4-dev (>=4.1.0),
qt4-designer (>=4.4.0)
qt4-designer (>=4.4.0),
${misc:Depends}
Provides: qgis-dev
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
Description: Quantum GIS - development files
@@ -116,7 +117,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: ${python:Depends}
Depends: python, ${misc:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -129,9 +130,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data
Package: python-qgis
Section: python
Architecture: any
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}
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
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}
Description: Python bindings to Quantum GIS
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -142,8 +141,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal, libjs-jquery, libjs-underscore, ${python:Depends}
XB-Python-Version: ${python:Versions}
Depends: gdal-bin, python-gdal, libjs-jquery, libjs-underscore, ${misc:Depends}
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.
@@ -166,6 +164,7 @@ Package: qgis-providers-common
Architecture: all
Replaces: qgis-common (<= 1.6)
Breaks: qgis-common (<= 1.6)
Depends: ${misc:Depends}
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.
@@ -0,0 +1,223 @@
Source: qgis
Section: science
Priority: extra
Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
Build-Depends:
bison,
cmake (>= 2.6),
debhelper (>= 7),
flex,
grass-dev,
libexpat1-dev,
libfcgi-dev,
libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
libgeos-dev (>= 3.0.0),
libgsl0-dev,
libpq-dev,
libproj-dev,
libqt4-dev (>=4.4.0),
libqt4-opengl-dev,
libqtwebkit-dev,
libqwt5-qt4-dev,
libspatialite-dev,
libsqlite3-dev,
libspatialindex-dev,
pkg-config,
pyqt4-dev-tools,
python,
python-central (>=0.5),
python-dev,
python-qt4 (>=4.1.0),
python-qt4-dev (>=4.1.0),
python-sip (>= 4.5.0),
python-sip-dev (>= 4.5.0),
libpython2.7-dev,
libosgearth-dev,
libopenscenegraph-dev,
git,
doxygen,
graphviz,
txt2tags,
xvfb, xauth, xfonts-base
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.4
XS-Python-Version: current
Homepage: http://qgis.org/

Package: qgis
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
Recommends: qgis-plugin-globe, qgis-plugin-grass, python-qgis
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.

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.
.
This package contains architecture-independent supporting data files for use
with Quantum GIS.

Package: libqgis{QGIS_ABI}
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.
.
This package contains the shared core and gui library that provide an
interface for plugins and stand-alone applications.

Package: libqgis-dev
Architecture: any
Section: libdevel
Depends:
grass-dev,
libexpat1-dev,
libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
libgeos-dev (>= 3.0.0),
libgsl0-dev,
libpq-dev,
libproj-dev,
libqgis{QGIS_ABI} (= ${binary:Version}),
libqt4-dev (>=4.4.0),
libsqlite3-dev,
python-qt4 (>=4.1.0),
python-qt4-dev (>=4.1.0),
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.
.
This package contains the headers and libraries needed to develop plugins for
Quantum GIS.

Package: qgis-plugin-grass
Architecture: any
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, grass{GRASS_ABI}
Description: GRASS plugin for Quantum GIS
Quantum GIS 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.

Package: qgis-plugin-grass-common
Architecture: all
Depends: ${python:Depends}
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.
.
This package contains architecture-independent supporting data files for use
with the Quantum GIS GRASS plugin.

Package: python-qgis
Section: python
Architecture: any
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}
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.
.
This package contains the files for the Python support.

Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal, libjs-jquery, libjs-underscore, ${python:Depends}
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.
.
This package contains architecture-independent files for the Quantum GIS
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.
.
This package contains the provider plugins for Quantum GIS.

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.
.
This package contains architecture-independent files for the Quantum GIS
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
and display databases of geographic information.
.
This package contains the Quantum GIS mapserver.

Package: qgis-sqlanywhere
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: qgis-sqlanywhere1.7.0, qgis-sqlanywhere1.7.1, qgis-sqlanywhere1.8.0
Description: Quantum GIS sql anywhere plugin and provider
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
.
This package contains the Quantum GIS sqlanywhere plugin and provider.

Package: qgis-api-doc
Architecture: all
Section: doc
Depends: libjs-jquery
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
.
This package contains the Quantum GIS API documentation.

Package: qgis-plugin-globe
Architecture: any
Depends: qgis (= ${binary:Version}), qgis-plugin-globe-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: OSG globe plugin for Quantum GIS
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
.
This plugin enables 3D viewing using OSG globe in the Quantum GIS.

Package: qgis-plugin-globe-common
Architecture: all
Description: OSG GLOBE plugin for Quantum GIS - architecture-independent data
Quantum GIS 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 GLOBE plugin.

Loading

0 comments on commit 28829dd

Please sign in to comment.