Showing with 1,346 additions and 1,365 deletions.
  1. +1 −0 CMakeLists.txt
  2. +4 −3 debian/changelog
  3. +0 −1 debian/compat.hardy
  4. +0 −1 debian/compat.intrepid
  5. +0 −1 debian/compat.jaunty
  6. +0 −1 debian/compat.karmic
  7. +0 −147 debian/control.hardy
  8. +0 −156 debian/control.jaunty
  9. +0 −157 debian/control.karmic
  10. +23 −2 debian/control.precise
  11. +84 −24 debian/{control.intrepid → control.wheezy}
  12. +9 −9 debian/rules
  13. +643 −638 i18n/qgis_de.ts
  14. +3 −2 python/CMakeLists.txt
  15. +3 −3 python/core/qgscomposeritem.sip
  16. +37 −2 python/plugins/GdalTools/tools/doBuildVRT.py
  17. +19 −12 python/plugins/GdalTools/tools/widgetBuildVRT.ui
  18. +5 −6 python/plugins/GdalTools/tools/widgetPluginBase.py
  19. +116 −4 python/plugins/fTools/tools/doGeometry.py
  20. +5 −1 python/plugins/fTools/tools/doMergeShapes.py
  21. +19 −5 python/plugins/fTools/tools/frmGeometry.ui
  22. +6 −3 python/pyspatialite/CMakeLists.txt
  23. +2 −0 scripts/spelling.dat
  24. +11 −0 src/app/legend/qgslegend.cpp
  25. +39 −16 src/app/qgisapp.cpp
  26. +1 −0 src/app/qgisapp.h
  27. +109 −53 src/app/qgsbrowserdockwidget.cpp
  28. +5 −2 src/app/qgsbrowserdockwidget.h
  29. +5 −0 src/app/qgsoptions.cpp
  30. +10 −13 src/core/composer/qgscomposeritem.h
  31. +2 −4 src/core/composer/qgscomposerlabel.h
  32. +2 −1 src/core/qgsdataitem.cpp
  33. +11 −3 src/core/qgsexpression.cpp
  34. +2 −0 src/core/qgsexpression.h
  35. +8 −6 src/core/qgsexpressionlexer.ll
  36. +22 −24 src/core/qgsexpressionparser.yy
  37. +10 −4 src/core/raster/qgscolorrampshader.cpp
  38. +16 −7 src/core/raster/qgscolorrampshader.h
  39. +1 −1 src/core/symbology-ng/qgsrendererv2registry.h
  40. +8 −3 src/gui/qgsexpressionbuilderwidget.cpp
  41. +1 −1 src/gui/qgsquerybuilder.cpp
  42. +2 −0 src/plugins/grass/modules/default.qgc
  43. +5 −4 src/plugins/grass/modules/r.external.all.qgm
  44. +5 −5 src/plugins/grass/modules/r.external.qgis.qgm
  45. +4 −4 src/plugins/grass/modules/r.external.qgm
  46. +3 −2 src/plugins/grass/modules/r.in.gdal.loc.qgm
  47. +5 −4 src/plugins/grass/modules/r.in.gdal.qgis.loc.qgm
  48. +5 −3 src/plugins/grass/modules/r.in.gdal.qgis.qgm
  49. +4 −2 src/plugins/grass/modules/r.in.gdal.qgm
  50. +10 −0 src/plugins/grass/modules/v.extrude.attr.qgm
  51. +10 −0 src/plugins/grass/modules/v.extrude.fixed.qgm
  52. +1 −1 src/plugins/grass/modules/v.in.ogr.all.loc.qgm
  53. +1 −1 src/plugins/grass/modules/v.in.ogr.all.qgm
  54. +3 −3 src/plugins/grass/modules/v.in.ogr.loc.qgm
  55. +2 −2 src/plugins/grass/modules/v.in.ogr.qgis.loc.qgm
  56. +2 −2 src/plugins/grass/modules/v.in.ogr.qgis.qgm
  57. +2 −2 src/plugins/grass/modules/v.in.ogr.qgm
  58. +11 −2 src/plugins/grass/qgsgrassregion.cpp
  59. +10 −4 src/providers/gdal/qgsgdaldataitems.cpp
  60. +11 −1 src/providers/gdal/qgsgdalprovider.cpp
  61. +2 −0 src/providers/ogr/qgsogrprovider.cpp
  62. +6 −6 src/providers/postgres/qgspostgresconn.cpp
  63. +0 −1 src/providers/wms/qgswmssourceselect.cpp
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ SET (WITH_SPATIALITE TRUE CACHE BOOL "Determines whether SPATIALITE support shou

IF (WITH_SPATIALITE)
SET (WITH_INTERNAL_SPATIALITE TRUE CACHE BOOL "Determines whether SPATIALITE support should be built internally")
SET (WITH_PYSPATIALITE TRUE CACHE BOOL "Determines whether PYSPATIALITE should be built")
IF(WITH_INTERNAL_SPATIALITE)
SET(SPATIALITE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/core/spatialite/headers)
SET(HAVE_SPATIALITE TRUE)
Expand Down
7 changes: 4 additions & 3 deletions debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ qgis (1.9.90) UNRELEASED; urgency=low
* drop extra include path for QtWebkit on oneiric and natty
* add translations for desktop link
* add browser desktop entry
* add support for Ubuntu precise
* build package with libspatialite where available
* add support for Debian wheezy and Ubuntu precise
* build package with internal libspatialite where libspatialite not available
* drop support for Ubuntu hardy, intrepid, jaunty and karmic

-- Jürgen E. Fischer <jef@norbit.de> Mon, 05 Mar 2012 20:21:48 +0100
-- Jürgen E. Fischer <jef@norbit.de> Thu, 08 Mar 2012 16:08:09 +0100

qgis (1.8.0) UNRELEASED; urgency=low

Expand Down
1 change: 0 additions & 1 deletion debian/compat.hardy

This file was deleted.

1 change: 0 additions & 1 deletion debian/compat.intrepid

This file was deleted.

1 change: 0 additions & 1 deletion debian/compat.jaunty

This file was deleted.

1 change: 0 additions & 1 deletion debian/compat.karmic

This file was deleted.

147 changes: 0 additions & 147 deletions debian/control.hardy

This file was deleted.

156 changes: 0 additions & 156 deletions debian/control.jaunty

This file was deleted.

Loading