Skip to content
Permalink
Browse files

Merge branch 'master' of git://github.com/qgis/Quantum-GIS

  • Loading branch information
pcav committed May 24, 2011
2 parents a075104 + b610620 commit a421ec2f62060fa4144410a05c2b041f7de669a6
Showing with 13,551 additions and 5,628 deletions.
  1. +4 −0 .gitignore
  2. +8 −0 cmake/Txt2Tags.cmake
  3. +2 −1 debian/changelog
  4. +1 −0 debian/control.intrepid
  5. +1 −0 debian/control.jaunty
  6. +1 −0 debian/control.karmic
  7. +1 −0 debian/control.lenny
  8. +1 −0 debian/control.lucid
  9. +1 −0 debian/control.maverick
  10. +1 −0 debian/control.natty
  11. +1 −0 debian/control.sid
  12. +1 −0 debian/control.squeeze
  13. +1 −0 debian/qgis-plugin-grass.postrm
  14. +1 −0 debian/qgis-plugin-grass.preinst
  15. +2 −0 debian/rules
  16. +31 −4 doc/CODING.t2t
  17. +31 −5 doc/INSTALL.t2t
  18. +3 −0 doc/iauthors.t2t
  19. BIN doc/qgis-footer.png
  20. BIN doc/qgis-footer.xcf
  21. +3 −3 i18n/qgis_af.ts
  22. +3 −3 i18n/qgis_ar.ts
  23. +3 −3 i18n/qgis_bg.ts
  24. +3 −3 i18n/qgis_ca_ES.ts
  25. +3 −3 i18n/qgis_cs_CZ.ts
  26. +2,105 −1,924 i18n/qgis_de.ts
  27. +3 −3 i18n/qgis_el_GR.ts
  28. +3 −3 i18n/qgis_es.ts
  29. +3 −3 i18n/qgis_fa.ts
  30. +3 −3 i18n/qgis_fi.ts
  31. +3 −3 i18n/qgis_fr.ts
  32. +3 −3 i18n/qgis_he.ts
  33. +3 −3 i18n/qgis_hr_HR.ts
  34. +3 −3 i18n/qgis_hu.ts
  35. +3 −3 i18n/qgis_id.ts
  36. +3 −3 i18n/qgis_is.ts
  37. +3 −3 i18n/qgis_it.ts
  38. +3 −3 i18n/qgis_ja.ts
  39. +3 −3 i18n/qgis_ka_GE.ts
  40. +3 −3 i18n/qgis_lo.ts
  41. +3 −3 i18n/qgis_lt.ts
  42. +3 −3 i18n/qgis_lv.ts
  43. +3 −3 i18n/qgis_mn.ts
  44. +3 −3 i18n/qgis_nl.ts
  45. +3 −3 i18n/qgis_pl_PL.ts
  46. +3 −3 i18n/qgis_pt_BR.ts
  47. +3 −3 i18n/qgis_pt_PT.ts
  48. +3 −3 i18n/qgis_ro.ts
  49. +3 −3 i18n/qgis_ru.ts
  50. +3 −3 i18n/qgis_sk.ts
  51. +3 −3 i18n/qgis_sl_SI.ts
  52. +3 −3 i18n/qgis_sq_AL.ts
  53. +3 −3 i18n/qgis_sr_CS-Latn.ts
  54. +3 −3 i18n/qgis_sv.ts
  55. +3 −3 i18n/qgis_ta.ts
  56. +3 −3 i18n/qgis_th.ts
  57. +3 −3 i18n/qgis_tr.ts
  58. +3 −3 i18n/qgis_uk.ts
  59. +3 −3 i18n/qgis_vi.ts
  60. +3 −3 i18n/qgis_xh.ts
  61. +3 −3 i18n/qgis_zh_CN.ts
  62. +3 −3 i18n/qgis_zh_TW.ts
  63. +4 −0 images/images.qrc
  64. BIN images/themes/default/customization/calendarwidget.png
  65. BIN images/themes/default/customization/checkbox.png
  66. BIN images/themes/default/customization/columnview.png
  67. BIN images/themes/default/customization/combobox.png
  68. BIN images/themes/default/customization/commandlinkbutton.png
  69. BIN images/themes/default/customization/dateedit.png
  70. BIN images/themes/default/customization/datetimeedit.png
  71. BIN images/themes/default/customization/dial.png
  72. BIN images/themes/default/customization/dialogbuttonbox.png
  73. BIN images/themes/default/customization/dockwidget.png
  74. BIN images/themes/default/customization/doublespinbox.png
  75. BIN images/themes/default/customization/fontcombobox.png
  76. BIN images/themes/default/customization/frame.png
  77. BIN images/themes/default/customization/graphicsview.png
  78. BIN images/themes/default/customization/groupbox.png
  79. BIN images/themes/default/customization/groupboxcollapsible.png
  80. BIN images/themes/default/customization/hscrollbar.png
  81. BIN images/themes/default/customization/hslider.png
  82. BIN images/themes/default/customization/hsplit.png
  83. BIN images/themes/default/customization/label.png
  84. BIN images/themes/default/customization/lcdnumber.png
  85. BIN images/themes/default/customization/line.png
  86. BIN images/themes/default/customization/lineedit.png
  87. BIN images/themes/default/customization/listbox.png
  88. BIN images/themes/default/customization/listview.png
  89. BIN images/themes/default/customization/mdiarea.png
  90. BIN images/themes/default/customization/plaintextedit.png
  91. BIN images/themes/default/customization/progress.png
  92. BIN images/themes/default/customization/pushbutton.png
  93. BIN images/themes/default/customization/radiobutton.png
  94. BIN images/themes/default/customization/scrollarea.png
  95. BIN images/themes/default/customization/spacer.png
  96. BIN images/themes/default/customization/spinbox.png
  97. BIN images/themes/default/customization/tabbar.png
  98. BIN images/themes/default/customization/table.png
  99. BIN images/themes/default/customization/tabwidget.png
  100. BIN images/themes/default/customization/textedit.png
  101. BIN images/themes/default/customization/timeedit.png
  102. BIN images/themes/default/customization/toolbox.png
  103. BIN images/themes/default/customization/toolbutton.png
  104. BIN images/themes/default/customization/vline.png
  105. BIN images/themes/default/customization/vscrollbar.png
  106. BIN images/themes/default/customization/vslider.png
  107. BIN images/themes/default/customization/vspacer.png
  108. BIN images/themes/default/customization/widget.png
  109. BIN images/themes/default/customization/widgetstack.png
  110. BIN images/themes/default/customization/wizard.png
  111. BIN images/themes/default/grass_location.png
  112. BIN images/themes/default/grass_mapset.png
  113. BIN images/themes/default/mIconWms.png
  114. BIN images/themes/default/mIconWmsLayer.png
  115. +1 −0 ms-windows/osgeo4w/package-nightly.cmd
  116. +1 −0 ms-windows/osgeo4w/package.cmd
  117. +3 −0 ms-windows/osgeo4w/postinstall.bat
  118. +3 −0 ms-windows/osgeo4w/preremove.bat
  119. +3 −0 python/core/qgscomposeritem.sip
  120. +5 −1 python/core/qgscomposermap.sip
  121. +1 −1 python/core/qgsproviderregistry.sip
  122. +3 −1 python/plugins/GdalTools/tools/doClipper.py
  123. +10 −3 python/plugins/GdalTools/tools/widgetClipper.ui
  124. +129 −0 python/widgets_tree.py
  125. +1 −1 resources/CMakeLists.txt
  126. +2,024 −0 resources/customization.xml
  127. +9 −9 scripts/astyle-all.sh
  128. +1 −0 scripts/spelling.dat
  129. +1 −1 src/CMakeLists.txt
  130. +0 −5 src/analysis/interpolation/DualEdgeTriangulation.cc
  131. +1 −1 src/analysis/interpolation/ParametricLine.h
  132. +3 −20 src/app/CMakeLists.txt
  133. +52 −16 src/app/attributetable/qgsattributetabledialog.cpp
  134. +25 −0 src/app/attributetable/qgsattributetabledialog.h
  135. +58 −13 src/app/composer/qgscomposer.cpp
  136. +6 −5 src/app/composer/qgscomposer.h
  137. +1 −1 src/app/composer/qgscomposerlegendwidget.cpp
  138. +10 −4 src/app/composer/qgscomposermapwidget.cpp
  139. +3 −2 src/app/legend/qgslegend.cpp
  140. +26 −0 src/app/main.cpp
  141. +96 −122 src/app/qgisapp.cpp
  142. +13 −15 src/app/qgisapp.h
  143. +12 −6 src/app/qgsabout.cpp
  144. +2 −2 src/app/qgsattributeactiondialog.cpp
  145. +5 −4 src/app/qgsattributedialog.cpp
  146. +4 −2 src/app/qgsconfigureshortcutsdialog.cpp
  147. +917 −0 src/app/qgscustomization.cpp
  148. +165 −0 src/app/qgscustomization.h
  149. +3 −0 src/app/qgsmaptooladdpart.cpp
  150. +2 −1 src/app/qgspluginmanager.cpp
  151. +16 −9 src/app/qgspluginregistry.cpp
  152. +1 −1 src/app/qgsrasterlayerproperties.cpp
  153. +9 −245 src/app/qgsvectorlayerproperties.cpp
  154. +112 −0 src/browser/CMakeLists.txt
  155. +112 −0 src/browser/main.cpp
  156. +512 −0 src/browser/qgsbrowser.cpp
  157. +84 −0 src/browser/qgsbrowser.h
  158. +246 −0 src/browser/qgsbrowserbase.ui
  159. +315 −0 src/browser/qgsbrowsermodel.cpp
  160. +70 −0 src/browser/qgsbrowsermodel.h
  161. +5 −0 src/core/CMakeLists.txt
  162. +2 −0 src/core/composer/qgscomposeritem.cpp
  163. +3 −0 src/core/composer/qgscomposeritem.h
  164. +22 −8 src/core/composer/qgscomposermap.cpp
  165. +4 −2 src/core/composer/qgscomposermap.h
  166. +1 −1 src/core/pal/rtree.hpp
  167. +9 −1 src/core/qgsapplication.cpp
  168. +3 −0 src/core/qgsapplication.h
  169. +7 −0 src/core/qgsattributeaction.cpp
  170. +1 −0 src/core/qgsattributeaction.h
  171. +4 −2 src/core/qgscoordinatereferencesystem.cpp
  172. +4 −2 src/core/qgscoordinatetransform.cpp
  173. +570 −0 src/core/qgsdataitem.cpp
  174. +238 −0 src/core/qgsdataitem.h
  175. +13 −0 src/core/qgsdataprovider.h
  176. +6 −3 src/core/qgsdistancearea.cpp
  177. +6 −1 src/core/qgsmaplayer.cpp
  178. +3 −0 src/core/qgsmaplayer.h
  179. +5 −3 src/core/qgspallabeling.cpp
  180. +1 −1 src/core/qgsproject.cpp
  181. +62 −2 src/core/qgsproviderregistry.cpp
  182. +16 −2 src/core/qgsproviderregistry.h
  183. +43 −0 src/core/qgspythonrunner.cpp
  184. +41 −0 src/core/qgspythonrunner.h
  185. +2 −1 src/core/qgsrasterdataprovider.cpp
  186. +35 −22 src/core/qgsrasterprojector.cpp
  187. +1 −1 src/core/qgsrasterprojector.h
  188. +12 −6 src/core/qgsrectangle.cpp
  189. +10 −5 src/core/qgssearchtreenode.cpp
  190. +239 −3 src/core/qgsvectorlayer.cpp
  191. +2 −0 src/core/qgsvectorlayer.h
  192. +8 −4 src/core/raster/qgscontrastenhancement.cpp
  193. +12 −6 src/core/raster/qgsrasterlayer.cpp
  194. +6 −3 src/core/symbology-ng/qgscolorbrewerpalette.h
  195. +4 −2 src/core/symbology-ng/qgsfillsymbollayerv2.cpp
  196. +4 −2 src/core/symbology-ng/qgslinesymbollayerv2.cpp
  197. +2 −2 src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
  198. +4 −2 src/core/symbology-ng/qgssinglesymbolrendererv2.cpp
  199. +2 −1 src/core/symbology-ng/qgssymbollayerv2utils.cpp
  200. +2 −1 src/core/symbology-ng/qgsvectorcolorrampv2.cpp
  201. +2 −1 src/core/symbology/qgsmarkercatalogue.cpp
  202. +26 −0 src/gui/CMakeLists.txt
  203. 0 src/{app → gui}/attributetable/qgsattributetabledelegate.cpp
  204. 0 src/{app → gui}/attributetable/qgsattributetabledelegate.h
  205. 0 src/{app → gui}/attributetable/qgsattributetablefiltermodel.cpp
  206. 0 src/{app → gui}/attributetable/qgsattributetablefiltermodel.h
  207. 0 src/{app → gui}/attributetable/qgsattributetableidcolumnpair.cpp
  208. 0 src/{app → gui}/attributetable/qgsattributetableidcolumnpair.h
  209. 0 src/{app → gui}/attributetable/qgsattributetablememorymodel.cpp
  210. 0 src/{app → gui}/attributetable/qgsattributetablememorymodel.h
  211. +5 −9 src/{app → gui}/attributetable/qgsattributetablemodel.cpp
  212. +11 −2 src/{app → gui}/attributetable/qgsattributetablemodel.h
  213. +22 −32 src/{app → gui}/attributetable/qgsattributetableview.cpp
  214. +4 −21 src/{app → gui}/attributetable/qgsattributetableview.h
  215. +2 −1 src/gui/qgsannotationitem.cpp
  216. +4 −2 src/gui/qgsdetaileditemdelegate.cpp
  217. +1 −1 src/gui/qgsdetaileditemdelegate.h
  218. +1 −1 src/gui/qgsdetaileditemwidget.h
  219. +34 −17 src/{app → gui}/qgsmanageconnectionsdialog.cpp
  220. +1 −1 src/{app → gui}/qgsmanageconnectionsdialog.h
  221. +2 −1 src/gui/qgsmapcanvas.cpp
  222. +1 −1 src/gui/qgsmapcanvasitem.cpp
  223. +12 −6 src/gui/qgsmapoverviewcanvas.cpp
  224. 0 src/{app → gui}/qgsnewhttpconnection.cpp
  225. +1 −1 src/{app → gui}/qgsnewhttpconnection.h
  226. +105 −3 src/{app → gui}/qgsnewvectorlayerdialog.cpp
  227. +5 −1 src/{app → gui}/qgsnewvectorlayerdialog.h
  228. 0 src/{app → gui}/qgsnumericsortlistviewitem.cpp
  229. +1 −1 src/{app → gui}/qgsnumericsortlistviewitem.h
  230. +6 −9 src/gui/qgsquickprint.cpp
  231. +14 −7 src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
  232. +18 −9 src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp
  233. +23 −8 src/gui/symbology-ng/qgsstylev2managerdialog.cpp
  234. +9 −8 src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp
  235. +3 −3 src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp
  236. +2 −2 src/mapserver/qgis_map_serv.cpp
  237. +4 −4 src/mapserver/qgscapabilitiescache.cpp
  238. +1 −1 src/mapserver/qgscapabilitiescache.h
  239. +8 −4 src/mapserver/qgswmsserver.cpp
  240. +12 −6 src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp
  241. +4 −2 src/plugins/diagram_overlay/qgssvgdiagramfactorywidget.cpp
  242. +14 −7 src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp
  243. +10 −8 src/plugins/evis/idtool/eviseventidtool.cpp
  244. +1 −1 src/plugins/georeferencer/qgsgcpcanvasitem.cpp
  245. +2 −1 src/plugins/georeferencer/qgsgcplist.cpp
  246. +14 −5 src/plugins/georeferencer/qgsgeorefplugingui.cpp
  247. +6 −4 src/plugins/georeferencer/qgsgeoreftransform.cpp
  248. +15 −9 src/plugins/georeferencer/qgsimagewarper.cpp
  249. +4 −2 src/plugins/georeferencer/qgstransformsettingsdialog.cpp
  250. +4 −8 src/plugins/gps_importer/qgsgpsplugin.cpp
  251. +8 −4 src/plugins/grass/qgsgrassattributes.cpp
  252. +17 −9 src/plugins/grass/qgsgrassbrowser.cpp
  253. +76 −38 src/plugins/grass/qgsgrassedit.cpp
  254. +4 −2 src/plugins/grass/qgsgrassedittools.cpp
  255. +100 −49 src/plugins/grass/qgsgrassmapcalc.cpp
  256. +41 −21 src/plugins/grass/qgsgrassmodel.cpp
  257. +131 −63 src/plugins/grass/qgsgrassmodule.cpp
  258. +2 −2 src/plugins/grass/qgsgrassmodule.h
  259. +46 −23 src/plugins/grass/qgsgrassnewmapset.cpp
  260. +12 −6 src/plugins/grass/qgsgrassplugin.cpp
  261. +22 −11 src/plugins/grass/qgsgrassregion.cpp
  262. +29 −109 src/plugins/grass/qgsgrassselect.cpp
  263. +0 −3 src/plugins/grass/qgsgrassselect.h
  264. +11 −6 src/plugins/grass/qgsgrasstools.cpp
  265. +6 −7 src/plugins/grass/qgsgrassutils.cpp
  266. +11 −4 src/plugins/scale_bar/plugin.cpp
  267. +4 −1 src/plugins/sqlanywhere/sadbtablemodel.cpp
  268. +2 −1 src/plugins/sqlanywhere/sasourceselect.cpp
  269. +0 −5 src/plugins/wfs/CMakeLists.txt
  270. +14 −7 src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
  271. +147 −15 src/providers/gdal/qgsgdalprovider.cpp
  272. +12 −2 src/providers/gdal/qgsgdalprovider.h
  273. +2 −2 src/providers/grass/CMakeLists.txt
  274. +4 −2 src/providers/grass/qgis.g.info.c
  275. +128 −18 src/providers/grass/qgsgrass.cpp
  276. +3 −0 src/providers/grass/qgsgrass.h
  277. +189 −39 src/providers/grass/qgsgrassprovider.cpp
  278. +28 −1 src/providers/grass/qgsgrassprovider.h
  279. +4 −2 src/providers/grass/qgsgrassrasterprovider.cpp
  280. +4 −2 src/providers/memory/qgsmemoryprovider.cpp
  281. +292 −16 src/providers/ogr/qgsogrprovider.cpp
  282. +13 −0 src/providers/ogr/qgsogrprovider.h
  283. +2,098 −2,098 src/providers/spatialite/qgsspatialiteprovider.cpp
  284. +26 −26 src/providers/spatialite/qgsspatialiteprovider.h
  285. +6 −3 src/providers/sqlanywhere/qgssqlanywhereprovider.cpp
  286. +20 −10 src/providers/sqlanywhere/sqlanyconnection/sqlanyconnection.cpp
  287. +34 −17 src/providers/sqlanywhere/sqlanyconnection/sqlanystatement.cpp
  288. +1 −0 src/providers/wfs/qgswfsdata.cpp
  289. +15 −3 src/providers/wms/CMakeLists.txt
  290. +131 −0 src/providers/wms/qgswmsconnection.cpp
  291. +55 −0 src/providers/wms/qgswmsconnection.h
  292. +249 −2 src/providers/wms/qgswmsprovider.cpp
  293. +56 −0 src/providers/wms/qgswmsprovider.h
  294. +76 −136 src/{app → providers/wms}/qgswmssourceselect.cpp
  295. +21 −4 src/{app → providers/wms}/qgswmssourceselect.h
  296. +33 −12 src/ui/qgisapp.ui
  297. +140 −0 src/ui/qgscustomizationdialogbase.ui
@@ -30,3 +30,7 @@ ms-windows/untgz/
scripts/astyle.exe
# vim temporary files
.*.swp
*.aux
*.out
*.tex
*.toc
@@ -46,6 +46,14 @@ MACRO(ADD_TXT2TAGS_FILES _sources)
COMMENT "Building ${_out}.html from ${_in}"
)

ADD_CUSTOM_COMMAND(
OUTPUT ${_out}.tex
COMMAND ${TXT2TAGS_EXECUTABLE}
ARGS -o${_out}.tex -t tex ${_in}
DEPENDS ${_in}
COMMENT "Building ${_out}.tex from ${_in}"
)

SET(${_sources} ${${_sources}} ${_out} ${_out}.html)
ENDFOREACH (_current_FILE)
ENDMACRO(ADD_TXT2TAGS_FILES)
@@ -1,8 +1,9 @@
qgis (1.8.0) UNRELEASED; urgency=low

* new development version 1.8 after branch
* add qgis browser (qbrowser)

-- Jürgen E. Fischer <jef@norbit.de> Sat, 07 May 2011 00:47:20 +0200
-- Jürgen E. Fischer <jef@norbit.de> Mon, 23 May 2011 18:08:18 +0200

qgis (1.7.0) UNRELEASED; urgency=low

@@ -148,6 +148,7 @@ Description: Quantum GIS mapserver

Package: qgis-api-doc
Architecture: all
Section: doc
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -148,6 +148,7 @@ Description: Quantum GIS mapserver

Package: qgis-api-doc
Architecture: all
Section: doc
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -148,6 +148,7 @@ Description: Quantum GIS mapserver

Package: qgis-api-doc
Architecture: all
Section: doc
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -186,6 +186,7 @@ Description: Quantum GIS sql anywhere plugin and provider

Package: qgis-api-doc
Architecture: all
Section: doc
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -187,6 +187,7 @@ Description: Quantum GIS sql anywhere plugin and provider

Package: qgis-api-doc
Architecture: all
Section: doc
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -188,6 +188,7 @@ Description: Quantum GIS sql anywhere plugin and provider

Package: qgis-api-doc
Architecture: all
Section: doc
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -188,6 +188,7 @@ Description: Quantum GIS sql anywhere plugin and provider

Package: qgis-api-doc
Architecture: all
Section: doc
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -188,6 +188,7 @@ Description: Quantum GIS sql anywhere plugin and provider

Package: qgis-api-doc
Architecture: all
Section: doc
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -187,6 +187,7 @@ Description: Quantum GIS sql anywhere plugin and provider

Package: qgis-api-doc
Architecture: all
Section: doc
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -4,6 +4,7 @@ set -e

if [ "$1" = "remove" ]; then
dpkg-divert --package qgis-plugin-grass --remove --rename --divert /usr/bin/qgis.bin /usr/bin/qgis
dpkg-divert --package qgis-plugin-grass --remove --rename --divert /usr/bin/qbrowser.bin /usr/bin/qbrowser
fi

#DEBHELPER#
@@ -4,6 +4,7 @@ set -e

if [ "$1" = "install" -o "$1" = "upgrade" ]; then
dpkg-divert --package qgis-plugin-grass --add --rename --divert /usr/bin/qgis.bin /usr/bin/qgis
dpkg-divert --package qgis-plugin-grass --add --rename --divert /usr/bin/qbrowser.bin /usr/bin/qbrowser
fi

#DEBHELPER#
@@ -150,9 +150,11 @@ binary-arch: build install

install -o root -g root -m 755 -d $(CURDIR)/debian/qgis/usr/bin
install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qgis $(CURDIR)/debian/qgis/usr/bin
install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qbrowser $(CURDIR)/debian/qgis/usr/bin

install -o root -g root -m 755 -d $(CURDIR)/debian/qgis-plugin-grass/usr/bin
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qgis
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qbrowser

dh_pycentral
dh_installmenu
@@ -12,11 +12,37 @@ Developers guide for QGIS
%! PostProc(txt): '(?i)(\t)' ' '
%! encoding: iso-8859-1

%
% Tex processing
%
% Make sure this is first
%! PostProc(tex): '\\includegraphics' '\\includegraphics[width=100mm]'
% scartcl is from the koma script document class (apt-get install texlive-latex-recommended ttf-komatuna)
% setlength parindent suppresses first line of paragraph idents
% parskip puts blank space between paragraphs
% title pic stuff used to put a logo on the front page
%! PostProc(tex): '\\documentclass{article}' '\\documentclass{scrartcl}\n\\setlength{\\parindent}{0pt}\n\\setlength{\\parskip}{2ex}'
% use the color table and table packages so we can pimp the tables a little
%! PostProc(tex): '\\usepackage{style.css} % user defined' '\\usepackage{fancyvrb}\n\\usepackage{colortbl} \n\\usepackage [table]{xcolor}\n\\definecolor{tableShade}{HTML}{cecece}\n\\definecolor{qgis-green}{HTML}{0E7300}\n\\usepackage{wallpaper}\n\\LRCornerWallPaper{1}{WALLPAPER-IMAGE}\n\\usepackage{hyperref}\n\\hypersetup{linkcolor=qgis-green,urlcolor=qgis-green}\\renewcommand\\thesection{\\color{qgis-green}\\thechapter\\arabic{section}}'
% Make the header row of tables have a dark background. light text
%! PostProc(tex): '\\hline \\textbf' '\\hline \\rowcolor[rgb]{0,0,0} \\color{white} \\textbf'
%! PostProc(tex): '& \\textbf' '& \\color{white} \\textbf'
% Make verbatim text a little smaller and use fancyvrb package to draw it in a box
% Note Verbatim with capital V for fancyvrb to work
%! PostProc(tex): '\\begin{verbatim}' '{\\scriptsize\\begin{Verbatim}[frame=single,rulecolor=\\color{qgis-green}, framesep=4mm, label=\\fbox{\\small\\emph{Listing}}]'
%! PostProc(tex): '\\end{verbatim}' '\\end{Verbatim}\n}'
%! PostProc(tex): '\\section' '\\newpage\\section'
%! PostProc(tex): 'section{' 'section{\\color{qgis-green}'
%! PostProc(tex): NEWPAGE '\\newpage'
% Give alternating table rows different colours and use a smaller font in tables (\tiny)
%! PostProc(tex): '\\begin{tabular}' '\\rowcolors{2}{tableShade}{white} \n\\tiny\\begin{tabular}'
%! encoding: iso-8859-1

%! PostProc(tex): WALLPAPER-IMAGE 'qgis-footer.png'
% These are comments and will not be generated in any output
% -------------------

%This document is in text2tags format. You can generate html, plain text and
%This document is in txt2tags format. You can generate html, plain text and
%moinmoin formatted documentation by running txt2tags on this document. See the
%txt2tags home page for more details. Please insert manual line breaks in this
%document as it makes diffing for changes much easier. To do this in vim
@@ -26,12 +52,13 @@ Developers guide for QGIS

% To generate the text version of this document:
% txt2tags -t txt -o CODING CODING.t2t
% To generate the moinmoin version of this document:
% txt2tags -t moin -o CODING.moin CODING.t2t
% To generate the mediawiki version of this document:
% txt2tags -t wiki --no-enum-title -o CODING.wiki CODING.t2t
% To generate the html version of this document:
% txt2tags -t html -o CODING.html CODING.t2t
% To generate the LaTeX version of this document:
% txt2tags -t tex -o CODING.tex CODING.t2t
% txt2tags -t tex -o CODING.tex CODING.t2t; pdflatex CODING.tex

%
% End of comments
% -------------------
@@ -1,7 +1,6 @@
Quantum GIS (QGIS)

Building QGIS from source - step by step

%%date(%A %B %d, %Y)

%! target : html
%! style : style.css
@@ -12,6 +11,33 @@ Building QGIS from source - step by step
% Next line will replace tabs with 2 spaces in txt generated outputs
%! PostProc(txt): '(?i)(\t)' ' '
%! encoding: iso-8859-1
%
% Tex processing
%
% Make sure this is first
%! PostProc(tex): '\\includegraphics' '\\includegraphics[width=100mm]'
% scartcl is from the koma script document class (apt-get install texlive-latex-recommended ttf-komatuna)
% setlength parindent suppresses first line of paragraph idents
% parskip puts blank space between paragraphs
% title pic stuff used to put a logo on the front page
%! PostProc(tex): '\\documentclass{article}' '\\documentclass{scrartcl}\n\\setlength{\\parindent}{0pt}\n\\setlength{\\parskip}{2ex}'
% use the color table and table packages so we can pimp the tables a little
%! PostProc(tex): '\\usepackage{style.css} % user defined' '\\usepackage{fancyvrb}\n\\usepackage{colortbl} \n\\usepackage [table]{xcolor}\n\\definecolor{tableShade}{HTML}{cecece}\n\\definecolor{qgis-green}{HTML}{0E7300}\n\\usepackage{wallpaper}\n\\LRCornerWallPaper{1}{WALLPAPER-IMAGE}\n\\usepackage{hyperref}\n\\hypersetup{linkcolor=qgis-green,urlcolor=qgis-green}\\renewcommand\\thesection{\\color{qgis-green}\\thechapter\\arabic{section}}'
% Make the header row of tables have a dark background. light text
%! PostProc(tex): '\\hline \\textbf' '\\hline \\rowcolor[rgb]{0,0,0} \\color{white} \\textbf'
%! PostProc(tex): '& \\textbf' '& \\color{white} \\textbf'
% Make verbatim text a little smaller and use fancyvrb package to draw it in a box
% Note Verbatim with capital V for fancyvrb to work
%! PostProc(tex): '\\begin{verbatim}' '{\\scriptsize\\begin{Verbatim}[frame=single,rulecolor=\\color{qgis-green}, framesep=4mm, label=\\fbox{\\small\\emph{Listing}}]'
%! PostProc(tex): '\\end{verbatim}' '\\end{Verbatim}\n}'
%! PostProc(tex): '\\section' '\\newpage\\section'
%! PostProc(tex): 'section{' 'section{\\color{qgis-green}'
%! PostProc(tex): NEWPAGE '\\newpage'
% Give alternating table rows different colours and use a smaller font in tables (\tiny)
%! PostProc(tex): '\\begin{tabular}' '\\rowcolors{2}{tableShade}{white} \n\\tiny\\begin{tabular}'
%! encoding: iso-8859-1

%! PostProc(tex): WALLPAPER-IMAGE 'qgis-footer.png'
% These are comments and will not be generated in any output
% -------------------

@@ -30,13 +56,13 @@ Building QGIS from source - step by step
% To generate the html version of this document:
% txt2tags -t html -o INSTALL.html INSTALL.t2t
% To generate the LaTeX version of this document:
% txt2tags -t tex -o INSTALL.tex INSTALL.t2t
% txt2tags -t tex -o INSTALL.tex INSTALL.t2t; pdflatex INSTALL.tex

% End of comments
% -------------------

Last update: %%date
Last change: %%mtime
Last Updated: %%date(%A %B %d, %Y)
Last Change : %%mtime(%A %B %d, %Y)

%%toc

@@ -26,3 +26,6 @@ The following people have contributed to this document:
- GNU/Linux Section
- Tim Sutton 2006
- Debian package section: Juergen Fischer 2008

- Latex Generator
- Tim Sutton 2011
BIN +109 KB doc/qgis-footer.png
Binary file not shown.
BIN +308 KB doc/qgis-footer.xcf
Binary file not shown.
</message>
<message>
<location filename="../src/core/qgsmaplayer.cpp" line="714"/>
<source>The directory containing your dataset needs to be writeable!</source>
<source>The directory containing your dataset needs to be writable!</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../src/core/qgsproject.cpp" line="982"/>
<source>%1 is not writeable. Please adjust permissions (if possible) and try again.</source>
<source>%1 is not writable. Please adjust permissions (if possible) and try again.</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../src/app/qgsrasterlayerproperties.cpp" line="1560"/>
<source>The file was not writeable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
<source>The file was not writable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../src/core/qgsmaplayer.cpp" line="714"/>
<source>The directory containing your dataset needs to be writeable!</source>
<source>The directory containing your dataset needs to be writable!</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../src/core/qgsproject.cpp" line="982"/>
<source>%1 is not writeable. Please adjust permissions (if possible) and try again.</source>
<source>%1 is not writable. Please adjust permissions (if possible) and try again.</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../src/app/qgsrasterlayerproperties.cpp" line="1560"/>
<source>The file was not writeable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
<source>The file was not writable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../src/core/qgsmaplayer.cpp" line="714"/>
<source>The directory containing your dataset needs to be writeable!</source>
<source>The directory containing your dataset needs to be writable!</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../src/core/qgsproject.cpp" line="982"/>
<source>%1 is not writeable. Please adjust permissions (if possible) and try again.</source>
<source>%1 is not writable. Please adjust permissions (if possible) and try again.</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../src/app/qgsrasterlayerproperties.cpp" line="1560"/>
<source>The file was not writeable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
<source>The file was not writable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../src/core/qgsmaplayer.cpp" line="714"/>
<source>The directory containing your dataset needs to be writeable!</source>
<source>The directory containing your dataset needs to be writable!</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../src/core/qgsproject.cpp" line="982"/>
<source>%1 is not writeable. Please adjust permissions (if possible) and try again.</source>
<source>%1 is not writable. Please adjust permissions (if possible) and try again.</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../src/app/qgsrasterlayerproperties.cpp" line="1560"/>
<source>The file was not writeable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
<source>The file was not writable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../src/core/qgsmaplayer.cpp" line="714"/>
<source>The directory containing your dataset needs to be writeable!</source>
<source>The directory containing your dataset needs to be writable!</source>
<translation>Adresář obsahující Váš dataset potřebuje mít práva zápisu!</translation>
</message>
<message>
</message>
<message>
<location filename="../src/core/qgsproject.cpp" line="982"/>
<source>%1 is not writeable. Please adjust permissions (if possible) and try again.</source>
<source>%1 is not writable. Please adjust permissions (if possible) and try again.</source>
<translation>%1 není zapisovatelný. Nastavte prosím oprávnění (pokud je to možné) a zkuste znovu.</translation>
</message>
<message>
</message>
<message>
<location filename="../src/app/qgsrasterlayerproperties.cpp" line="1560"/>
<source>The file was not writeable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
<source>The file was not writable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
<translation>Soubor není přepisovatelný. Některé formáty nepodporují pyramidové přehledy. Pochybnosti konzultujte s dokumentací GDAL.</translation>
</message>
<message>

0 comments on commit a421ec2

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