Skip to content
Permalink
Browse files

Merge remote-tracking branch 'upstream/master' into expression-labels…

…-merge-wonder
  • Loading branch information
Nathan
Nathan committed Aug 31, 2011
2 parents 706b6f1 + 7deb0c9 commit 27d3e517f98e4b8d6b1329a546f46c5e871ae59c
Showing with 13,926 additions and 4,537 deletions.
  1. +2 −2 CMakeLists.txt
  2. +4 −4 INSTALL
  3. +5 −5 cmake/Bison.cmake
  4. +10 −2 cmake/FindQGIS.cmake
  5. +3 −1 cmake/FindQwt.cmake
  6. +1 −1 cmake/PythonMacros.cmake
  7. +4 −1 debian/changelog
  8. +1 −0 debian/compat.oneiric
  9. +1 −1 debian/control
  10. +1 −1 debian/control.lucid
  11. +197 −0 debian/control.oneiric
  12. +28 −10 debian/control.sid
  13. +0 −1 debian/libqgis{QGIS_ABI}.lintian-overrides
  14. +1 −0 debian/qgis-plugin-globe-common.install
  15. +1 −0 debian/qgis-plugin-globe.install
  16. +1 −3 debian/qgis.install
  17. +11 −10 debian/rules
  18. +1 −0 doc/AUTHORS
  19. +1 −0 doc/CONTRIBUTORS
  20. +4 −4 doc/INSTALL.html
  21. +2 −2 doc/linux.t2t
  22. +2 −2 doc/overview.t2t
  23. +1,850 −1,495 i18n/qgis_de.ts
  24. +3 −0 images/images.qrc
  25. BIN {src/plugins/copyright_label → images/themes/default/plugins}/copyright_label.png
  26. BIN {src/plugins/north_arrow → images/themes/default/plugins}/north_arrow.png
  27. BIN {src/plugins/scale_bar → images/themes/default/plugins}/scale_bar.png
  28. +6 −6 mac/cmake/1qt.cmake.in
  29. +9 −3 python/CMakeLists.txt
  30. +1 −2 python/core/qgscomposeritem.sip
  31. +2 −2 python/core/qgsmaplayer.sip
  32. +94 −61 python/plugins/GdalTools/GdalTools.py
  33. BIN python/plugins/GdalTools/icons/projection-export.png
  34. +1 −0 python/plugins/GdalTools/resources.qrc
  35. +117 −0 python/plugins/GdalTools/tools/dialogExtractProjection.ui
  36. +193 −0 python/plugins/GdalTools/tools/doExtractProj.py
  37. +8 −7 python/plugins/plugin_installer/installer_data.py
  38. +4 −3 python/plugins/plugin_installer/installer_gui.py
  39. 0 resources/context_help/{QgsCopyrightLabelPluginGui-de_DE → QgsDecorationCopyrightDialog-de_DE}
  40. 0 resources/context_help/{QgsCopyrightLabelPluginGui-en_US → QgsDecorationCopyrightDialog-en_US}
  41. 0 resources/context_help/{QgsCopyrightLabelPluginGui-es_ES → QgsDecorationCopyrightDialog-es_ES}
  42. 0 resources/context_help/{QgsCopyrightLabelPluginGui-fr_FR → QgsDecorationCopyrightDialog-fr_FR}
  43. 0 resources/context_help/{QgsCopyrightLabelPluginGui-it_IT → QgsDecorationCopyrightDialog-it_IT}
  44. 0 resources/context_help/{QgsCopyrightLabelPluginGui-ja_JP → QgsDecorationCopyrightDialog-ja_JP}
  45. 0 resources/context_help/{QgsCopyrightLabelPluginGui-pl_PL → QgsDecorationCopyrightDialog-pl_PL}
  46. 0 resources/context_help/{QgsCopyrightLabelPluginGui-pt_BR → QgsDecorationCopyrightDialog-pt_BR}
  47. 0 resources/context_help/{QgsCopyrightLabelPluginGui-ru_RU → QgsDecorationCopyrightDialog-ru_RU}
  48. 0 resources/context_help/{QgsCopyrightLabelPluginGui-sk_SK → QgsDecorationCopyrightDialog-sk_SK}
  49. 0 resources/context_help/{QgsCopyrightLabelPluginGui-sv_SE → QgsDecorationCopyrightDialog-sv_SE}
  50. 0 resources/context_help/{QgsNorthArrowPluginGui-de_DE → QgsDecorationNorthArrowDialog-de_DE}
  51. 0 resources/context_help/{QgsNorthArrowPluginGui-en_US → QgsDecorationNorthArrowDialog-en_US}
  52. 0 resources/context_help/{QgsNorthArrowPluginGui-fr_FR → QgsDecorationNorthArrowDialog-fr_FR}
  53. 0 resources/context_help/{QgsNorthArrowPluginGui-it_IT → QgsDecorationNorthArrowDialog-it_IT}
  54. 0 resources/context_help/{QgsNorthArrowPluginGui-ja_JP → QgsDecorationNorthArrowDialog-ja_JP}
  55. 0 resources/context_help/{QgsNorthArrowPluginGui-pt_BR → QgsDecorationNorthArrowDialog-pt_BR}
  56. 0 resources/context_help/{QgsScaleBarPluginGui-de_DE → QgsDecorationScaleBarDialog-de_DE}
  57. 0 resources/context_help/{QgsScaleBarPluginGui-en_US → QgsDecorationScaleBarDialog-en_US}
  58. 0 resources/context_help/{QgsScaleBarPluginGui-es_ES → QgsDecorationScaleBarDialog-es_ES}
  59. 0 resources/context_help/{QgsScaleBarPluginGui-fr_FR → QgsDecorationScaleBarDialog-fr_FR}
  60. 0 resources/context_help/{QgsScaleBarPluginGui-it_IT → QgsDecorationScaleBarDialog-it_IT}
  61. 0 resources/context_help/{QgsScaleBarPluginGui-ja_JP → QgsDecorationScaleBarDialog-ja_JP}
  62. 0 resources/context_help/{QgsScaleBarPluginGui-pl_PL → QgsDecorationScaleBarDialog-pl_PL}
  63. 0 resources/context_help/{QgsScaleBarPluginGui-pt_BR → QgsDecorationScaleBarDialog-pt_BR}
  64. +1 −1 scripts/update_ts_files.sh
  65. +76 −31 src/app/CMakeLists.txt
  66. +634 −202 src/app/gps/qgsgpsinformationwidget.cpp
  67. +26 −5 src/app/gps/qgsgpsinformationwidget.h
  68. +13 −5 src/app/gps/qgsgpsmarker.cpp
  69. +2 −0 src/app/gps/qgsgpsmarker.h
  70. 0 src/app/gps/{qwtpolar → qwtpolar-0.1}/qwt_polar.h
  71. 0 src/app/gps/{qwtpolar → qwtpolar-0.1}/qwt_polar_canvas.cpp
  72. 0 src/app/gps/{qwtpolar → qwtpolar-0.1}/qwt_polar_canvas.h
  73. 0 src/app/gps/{qwtpolar → qwtpolar-0.1}/qwt_polar_curve.cpp
  74. 0 src/app/gps/{qwtpolar → qwtpolar-0.1}/qwt_polar_curve.h
  75. 0 src/app/gps/{qwtpolar → qwtpolar-0.1}/qwt_polar_fitter.cpp
  76. 0 src/app/gps/{qwtpolar → qwtpolar-0.1}/qwt_polar_fitter.h
  77. 0 src/app/gps/{qwtpolar → qwtpolar-0.1}/qwt_polar_global.h
  78. 0 src/app/gps/{qwtpolar → qwtpolar-0.1}/qwt_polar_grid.cpp
  79. 0 src/app/gps/{qwtpolar → qwtpolar-0.1}/qwt_polar_grid.h
  80. 0 src/app/gps/{qwtpolar → qwtpolar-0.1}/qwt_polar_item.cpp
  81. 0 src/app/gps/{qwtpolar → qwtpolar-0.1}/qwt_polar_item.h
  82. 0 src/app/gps/{qwtpolar → qwtpolar-0.1}/qwt_polar_itemdict.cpp
  83. 0 src/app/gps/{qwtpolar → qwtpolar-0.1}/qwt_polar_itemdict.h
  84. 0 src/app/gps/{qwtpolar → qwtpolar-0.1}/qwt_polar_layout.cpp
  85. 0 src/app/gps/{qwtpolar → qwtpolar-0.1}/qwt_polar_layout.h
  86. 0 src/app/gps/{qwtpolar → qwtpolar-0.1}/qwt_polar_magnifier.cpp
  87. 0 src/app/gps/{qwtpolar → qwtpolar-0.1}/qwt_polar_magnifier.h
  88. 0 src/app/gps/{qwtpolar → qwtpolar-0.1}/qwt_polar_marker.cpp
  89. 0 src/app/gps/{qwtpolar → qwtpolar-0.1}/qwt_polar_marker.h
  90. 0 src/app/gps/{qwtpolar → qwtpolar-0.1}/qwt_polar_panner.cpp
  91. 0 src/app/gps/{qwtpolar → qwtpolar-0.1}/qwt_polar_panner.h
  92. 0 src/app/gps/{qwtpolar → qwtpolar-0.1}/qwt_polar_plot.cpp
  93. 0 src/app/gps/{qwtpolar → qwtpolar-0.1}/qwt_polar_plot.h
  94. 0 src/app/gps/{qwtpolar → qwtpolar-0.1}/qwt_polar_point.cpp
  95. 0 src/app/gps/{qwtpolar → qwtpolar-0.1}/qwt_polar_point.h
  96. 0 src/app/gps/{qwtpolar → qwtpolar-0.1}/qwt_polar_spectrogram.cpp
  97. 0 src/app/gps/{qwtpolar → qwtpolar-0.1}/qwt_polar_spectrogram.h
  98. +84 −0 src/app/gps/qwtpolar-1.0/qwt_polar.h
  99. +298 −0 src/app/gps/qwtpolar-1.0/qwt_polar_canvas.cpp
  100. +79 −0 src/app/gps/qwtpolar-1.0/qwt_polar_canvas.h
  101. +635 −0 src/app/gps/qwtpolar-1.0/qwt_polar_curve.cpp
  102. +163 −0 src/app/gps/qwtpolar-1.0/qwt_polar_curve.h
  103. +100 −0 src/app/gps/qwtpolar-1.0/qwt_polar_fitter.cpp
  104. +40 −0 src/app/gps/qwtpolar-1.0/qwt_polar_fitter.h
  105. +43 −0 src/app/gps/qwtpolar-1.0/qwt_polar_global.h
  106. +1,129 −0 src/app/gps/qwtpolar-1.0/qwt_polar_grid.cpp
  107. +187 −0 src/app/gps/qwtpolar-1.0/qwt_polar_grid.h
  108. +444 −0 src/app/gps/qwtpolar-1.0/qwt_polar_item.cpp
  109. +176 −0 src/app/gps/qwtpolar-1.0/qwt_polar_item.h
  110. +169 −0 src/app/gps/qwtpolar-1.0/qwt_polar_itemdict.cpp
  111. +55 −0 src/app/gps/qwtpolar-1.0/qwt_polar_itemdict.h
  112. +444 −0 src/app/gps/qwtpolar-1.0/qwt_polar_layout.cpp
  113. +78 −0 src/app/gps/qwtpolar-1.0/qwt_polar_layout.h
  114. +167 −0 src/app/gps/qwtpolar-1.0/qwt_polar_magnifier.cpp
  115. +58 −0 src/app/gps/qwtpolar-1.0/qwt_polar_magnifier.h
  116. +233 −0 src/app/gps/qwtpolar-1.0/qwt_polar_marker.cpp
  117. +70 −0 src/app/gps/qwtpolar-1.0/qwt_polar_marker.h
  118. +118 −0 src/app/gps/qwtpolar-1.0/qwt_polar_panner.cpp
  119. +52 −0 src/app/gps/qwtpolar-1.0/qwt_polar_panner.h
  120. +245 −0 src/app/gps/qwtpolar-1.0/qwt_polar_picker.cpp
  121. +98 −0 src/app/gps/qwtpolar-1.0/qwt_polar_picker.h
  122. +1,269 −0 src/app/gps/qwtpolar-1.0/qwt_polar_plot.cpp
  123. +219 −0 src/app/gps/qwtpolar-1.0/qwt_polar_plot.h
  124. +421 −0 src/app/gps/qwtpolar-1.0/qwt_polar_renderer.cpp
  125. +71 −0 src/app/gps/qwtpolar-1.0/qwt_polar_renderer.h
  126. +527 −0 src/app/gps/qwtpolar-1.0/qwt_polar_spectrogram.cpp
  127. +95 −0 src/app/gps/qwtpolar-1.0/qwt_polar_spectrogram.h
  128. +28 −1 src/app/legend/qgslegend.cpp
  129. +39 −39 src/app/qgisapp.cpp
  130. +9 −3 src/app/qgisapp.h
  131. +8 −4 src/app/qgsaddjoindialog.cpp
  132. +6 −3 src/app/qgsattributedialog.cpp
  133. +35 −5 src/app/qgsbrowserdockwidget.cpp
  134. +25 −0 src/app/qgsconfigureshortcutsdialog.cpp
  135. +14 −1 src/app/qgsconfigureshortcutsdialog.h
  136. +152 −0 src/app/qgsdecorationcopyright.cpp
  137. +15 −45 src/{plugins/copyright_label/plugin.h → app/qgsdecorationcopyright.h}
  138. +34 −43 src/{plugins/copyright_label/plugingui.cpp → app/qgsdecorationcopyrightdialog.cpp}
  139. +13 −26 src/{plugins/copyright_label/plugingui.h → app/qgsdecorationcopyrightdialog.h}
  140. +30 −189 src/{plugins/north_arrow/plugin.cpp → app/qgsdecorationnortharrow.cpp}
  141. +21 −44 src/{plugins/north_arrow/plugin.h → app/qgsdecorationnortharrow.h}
  142. +36 −51 src/{plugins/north_arrow/plugingui.cpp → app/qgsdecorationnortharrowdialog.cpp}
  143. +10 −28 src/{plugins/north_arrow/plugingui.h → app/qgsdecorationnortharrowdialog.h}
  144. +35 −240 src/{plugins/scale_bar/plugin.cpp → app/qgsdecorationscalebar.cpp}
  145. +13 −51 src/{plugins/scale_bar/plugin.h → app/qgsdecorationscalebar.h}
  146. +92 −0 src/app/qgsdecorationscalebardialog.cpp
  147. +9 −27 src/{plugins/scale_bar/plugingui.h → app/qgsdecorationscalebardialog.h}
  148. +8 −6 src/app/qgsmaptoolidentify.cpp
  149. +22 −0 src/app/qgsrasterlayerproperties.cpp
  150. +18 −10 src/app/qgssnappingdialog.cpp
  151. +3 −0 src/app/qgssnappingdialog.h
  152. +1 −1 src/app/qgsvectorlayerproperties.cpp
  153. +5 −2 src/browser/qgsbrowserbase.ui
  154. +4 −12 src/core/composer/qgscomposeritem.cpp
  155. +1 −2 src/core/composer/qgscomposeritem.h
  156. +14 −2 src/core/composer/qgscomposerlegend.cpp
  157. +9 −8 src/core/composer/qgscomposermap.cpp
  158. +1 −1 src/core/gps/nmeatime.h
  159. +13 −2 src/core/gps/parse.c
  160. +7 −2 src/core/gps/qextserialport/qextserialenumerator.h
  161. +7 −0 src/core/gps/qgsgpsconnection.cpp
  162. +9 −0 src/core/gps/qgsgpsconnection.h
  163. +1 −3 src/core/gps/qgsgpsdetector.cpp
  164. +18 −3 src/core/gps/qgsnmeaconnection.cpp
  165. +2 −2 src/core/gps/time.c
  166. +2 −1 src/core/pal/costcalculator.cpp
  167. +4 −2 src/core/pal/problem.cpp
  168. +21 −0 src/core/qgsapplication.cpp
  169. +7 −4 src/core/qgsexpression.cpp
  170. +1 −3 src/core/qgsexpressionlexer.ll
  171. +2 −2 src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
  172. +101 −79 src/core/symbology-ng/qgsfillsymbollayerv2.cpp
  173. +14 −10 src/core/symbology-ng/qgsfillsymbollayerv2.h
  174. +3 −1 src/core/symbology-ng/qgsrendererv2.cpp
  175. +5 −0 src/core/symbology-ng/qgsrendererv2.h
  176. +25 −2 src/core/symbology-ng/qgsrulebasedrendererv2.cpp
  177. +5 −1 src/core/symbology-ng/qgsrulebasedrendererv2.h
  178. +1 −1 src/core/symbology-ng/qgssymbollayerv2.cpp
  179. +53 −0 src/core/symbology-ng/qgssymbollayerv2utils.cpp
  180. +6 −0 src/core/symbology-ng/qgssymbollayerv2utils.h
  181. +8 −0 src/gui/qgsmapcanvas.cpp
  182. +3 −0 src/gui/qgsmapcanvas.h
  183. +2 −1 src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
  184. +1 −0 src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h
  185. +20 −0 src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp
  186. +2 −0 src/gui/symbology-ng/qgsrendererv2propertiesdialog.h
  187. +120 −0 src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
  188. +11 −0 src/gui/symbology-ng/qgsrulebasedrendererv2widget.h
  189. +33 −23 src/gui/symbology-ng/qgssymbollayerv2widget.cpp
  190. +9 −8 src/gui/symbology-ng/qgssymbollayerv2widget.h
  191. +29 −11 src/mapserver/qgsconfigparser.cpp
  192. +3 −2 src/mapserver/qgsconfigparser.h
  193. +116 −91 src/mapserver/qgsprojectparser.cpp
  194. +7 −4 src/mapserver/qgsprojectparser.h
  195. +245 −84 src/mapserver/qgswmsserver.cpp
  196. +15 −7 src/mapserver/qgswmsserver.h
  197. +0 −3 src/plugins/CMakeLists.txt
  198. +0 −45 src/plugins/copyright_label/CMakeLists.txt
  199. +0 −15 src/plugins/copyright_label/README
  200. +0 −143 src/plugins/copyright_label/copyright.svg
  201. +0 −5 src/plugins/copyright_label/copyright_plugin.qrc
  202. +0 −329 src/plugins/copyright_label/plugin.cpp
  203. +0 −48 src/plugins/north_arrow/CMakeLists.txt
  204. +0 −15 src/plugins/north_arrow/README
  205. BIN src/plugins/north_arrow/images/logo.jpg
  206. BIN src/plugins/north_arrow/images/logo.xcf
  207. +0 −197 src/plugins/north_arrow/north_arrow.svg
  208. +0 −5 src/plugins/north_arrow/northarrow_plugin.qrc
  209. +0 −48 src/plugins/scale_bar/CMakeLists.txt
  210. +0 −97 src/plugins/scale_bar/plugingui.cpp
  211. +0 −124 src/plugins/scale_bar/scale_bar.svg
  212. +0 −5 src/plugins/scale_bar/scalebar_plugin.qrc
  213. +61 −63 src/providers/gdal/qgsgdalprovider.cpp
  214. +7 −0 src/providers/ogr/qgsogrprovider.cpp
  215. +1 −0 src/ui/CMakeLists.txt
  216. +46 −7 src/ui/qgisapp.ui
  217. +5 −7 src/{plugins/copyright_label/pluginguibase.ui → ui/qgsdecorationcopyrightdialog.ui}
  218. +6 −8 src/{plugins/north_arrow/pluginguibase.ui → ui/qgsdecorationnortharrowdialog.ui}
  219. +4 −6 src/{plugins/scale_bar/pluginguibase.ui → ui/qgsdecorationscalebardialog.ui}
  220. +945 −286 src/ui/qgsgpsinformationwidgetbase.ui
  221. +104 −11 src/ui/qgsrulebasedrendererv2widget.ui
  222. +18 −4 src/ui/symbollayer/widget_linepatternfill.ui
@@ -18,8 +18,8 @@ MESSAGE(STATUS "Quantum GIS version: ${COMPLETE_VERSION} ${RELEASE_NAME} (${QGIS
#############################################################
# CMake settings

# 2.6 required for QtWebkit
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
# 2.6.2 required for VERSION_LESS
CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2)

SET(CMAKE_COLOR_MAKEFILE ON)

@@ -1,9 +1,9 @@
Quantum GIS (QGIS)
Building QGIS from source - step by step
Thursday August 04, 2011
Sunday August 07, 2011


Last Updated: Thursday August 04, 2011
Last Updated: Sunday August 07, 2011
Last Change : Tuesday June 28, 2011


@@ -263,8 +263,8 @@ Now we create a build directory and run ccmake:
When you run ccmake (note the .. is required!), a menu will appear where
you can configure various aspects of the build. If you do not have root
access or do not want to overwrite existing QGIS installs (by your
packagemanager for example), set the CMAKE_BUILD_PREFIX to somewhere you
have write access to (I usually use /home/timlinux/apps). Now press
packagemanager for example), set the CMAKE_INSTALL_PREFIX to somewhere you
have write access to (I usually use ${HOME}/apps). Now press
'c' to configure, 'e' to dismiss any error messages that may appear.
and 'g' to generate the make files. Note that sometimes 'c' needs to
be pressed several times before the 'g' option becomes available.
@@ -27,11 +27,11 @@ MACRO(FIND_BISON)
# get first line in case it's multiline
STRING(REGEX REPLACE "([^\n]+).*" "\\1" FIRST_LINE "${BISON_VERSION_STR}")
# get version information
STRING(REGEX REPLACE ".* ([0-9]+)\\.([0-9]+)" "\\1" BISON_VERSION_MAJOR "${FIRST_LINE}")
STRING(REGEX REPLACE ".* ([0-9]+)\\.([0-9]+)" "\\2" BISON_VERSION_MINOR "${FIRST_LINE}")
IF (BISON_VERSION_MAJOR LESS 2)
MESSAGE (FATAL_ERROR "Bison version is too old (${BISON_VERSION_MAJOR}.${BISON_VERSION_MINOR}). Use 2.0 or higher.")
ENDIF (BISON_VERSION_MAJOR LESS 2)
STRING(REGEX REPLACE ".* ([0-9]+)\\.([0-9]+)(\\..*)?" "\\1" BISON_VERSION_MAJOR "${FIRST_LINE}")
STRING(REGEX REPLACE ".* ([0-9]+)\\.([0-9]+)(\\..*)?" "\\2" BISON_VERSION_MINOR "${FIRST_LINE}")
IF (BISON_VERSION_MAJOR LESS 2 OR (BISON_VERSION_MAJOR EQUAL 2 AND BISON_VERSION_MINOR LESS 4))
MESSAGE (FATAL_ERROR "Bison version is too old (${BISON_VERSION_MAJOR}.${BISON_VERSION_MINOR}). Use 2.4 or higher.")
ENDIF (BISON_VERSION_MAJOR LESS 2 OR (BISON_VERSION_MAJOR EQUAL 2 AND BISON_VERSION_MINOR LESS 4))

ENDIF (NOT BISON_EXECUTABLE)
ENDIF(NOT BISON_EXECUTABLE)
@@ -96,18 +96,23 @@ ELSE(WIN32)
PATHS
/usr/include/qgis
/usr/local/include/qgis
/Library/Frameworks/qgis_core.framework/Headers
${QGIS_MAC_PATH}/Frameworks/qgis_core.framework/Headers
"$ENV{LIB_DIR}/include/qgis"
)
# also get other frameworks' headers folders on OS X
IF (APPLE)
FIND_PATH(QGIS_GUI_INCLUDE_DIR
NAMES qgisgui.h
PATHS ${QGIS_MAC_PATH}/Frameworks/qgis_gui.framework/Headers
PATHS
/Library/Frameworks/qgis_core.framework/Headers
${QGIS_MAC_PATH}/Frameworks/qgis_gui.framework/Headers
)
FIND_PATH(QGIS_ANALYSIS_INCLUDE_DIR
NAMES qgsinterpolator.h
PATHS ${QGIS_MAC_PATH}/Frameworks/qgis_analysis.framework/Headers
PATHS
/Library/Frameworks/qgis_analysis.framework/Headers
${QGIS_MAC_PATH}/Frameworks/qgis_analysis.framework/Headers
)
SET(QGIS_INCLUDE_DIR
${QGIS_INCLUDE_DIR}
@@ -121,6 +126,7 @@ ELSE(WIN32)
/usr/lib64
/usr/lib
/usr/local/lib
/Library/Frameworks
${QGIS_MAC_PATH}/Frameworks
"$ENV{LIB_DIR}/lib/"
)
@@ -130,6 +136,7 @@ ELSE(WIN32)
/usr/lib64
/usr/lib
/usr/local/lib
/Library/Frameworks
${QGIS_MAC_PATH}/Frameworks
"$ENV{LIB_DIR}/lib/"
)
@@ -139,6 +146,7 @@ ELSE(WIN32)
/usr/lib64
/usr/lib
/usr/local/lib
/Library/Frameworks
${QGIS_MAC_PATH}/Frameworks
"$ENV{LIB_DIR}/lib/"
)
@@ -32,8 +32,10 @@ IF (QWT_INCLUDE_DIR AND QWT_LIBRARY)
ENDIF (QWT_INCLUDE_DIR AND QWT_LIBRARY)

IF (QWT_FOUND)
FILE(READ ${QWT_INCLUDE_DIR}/qwt_global.h qwt_header)
STRING(REGEX REPLACE "^.*QWT_VERSION_STR +\"([^\"]+)\".*$" "\\1" QWT_VERSION_STR "${qwt_header}")
IF (NOT QWT_FIND_QUIETLY)
MESSAGE(STATUS "Found Qwt: ${QWT_LIBRARY}")
MESSAGE(STATUS "Found Qwt: ${QWT_LIBRARY} (${QWT_VERSION_STR})")
ENDIF (NOT QWT_FIND_QUIETLY)
ELSE (QWT_FOUND)
IF (QWT_FIND_REQUIRED)
@@ -7,7 +7,7 @@
#
# This file defines the following macros:
#
# PYTHON_INSTALL (SOURCE_FILE DESINATION_DIR)
# PYTHON_INSTALL (SOURCE_FILE DESTINATION_DIR)
# Install the SOURCE_FILE, which is a Python .py file, into the
# destination directory during install. The file will be byte compiled
# and both the .py file and .pyc file will be installed.
@@ -2,8 +2,11 @@ qgis (1.8.0) UNRELEASED; urgency=low

* new development version 1.8 after branch
* add qgis browser (qbrowser)
* add zonal statistics plugins and globe plugin
* migrate unstable package to dh_python2
* add ubuntu oneiric

-- Jürgen E. Fischer <jef@norbit.de> Mon, 23 May 2011 18:08:18 +0200
-- Jürgen E. Fischer <jef@norbit.de> Tue, 23 Aug 2011 22:25:08 +0200

qgis (1.7.0) UNRELEASED; urgency=low

@@ -0,0 +1 @@
7
@@ -15,7 +15,7 @@ Build-Depends:
libgsl0-dev,
libpq-dev,
libqt4-dev (>=4.4.0),
libqwt5-qt4-dev,
libqwt5-qt4-dev | libqwt-dev,
libsqlite3-dev,
proj (<< 4.7.0) | libproj-dev (>= 4.7.0),
pyqt4-dev-tools,
@@ -31,7 +31,7 @@ Build-Depends:
git-core,
doxygen,
graphviz,
txt2tags
txt2tags
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.4
XS-Python-Version: current
@@ -0,0 +1,197 @@
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,
libgdal1-dev,
libgeos-dev (>= 3.0.0),
libgsl0-dev,
libpq-dev,
libproj-dev,
libqt4-dev (>=4.4.0),
libqtwebkit-dev,
libqwt5-qt4-dev,
libspatialite-dev,
libsqlite3-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),
git,
doxygen,
graphviz,
txt2tags
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-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,
libgdal1-dev,
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}), ${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, ${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{QGIS_ABI}
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
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
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.

0 comments on commit 27d3e51

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