Showing with 327 additions and 158 deletions.
  1. +11 −16 debian/changelog
  2. +1 −1 debian/compat.sid
  3. +1 −0 debian/compat.wheezy
  4. +10 −8 debian/control.sid
  5. +1 −1 debian/control.squeeze
  6. +10 −7 debian/control.wheezy
  7. +203 −58 debian/copyright
  8. +1 −1 python/core/qgsmaplayer.sip
  9. +2 −2 src/analysis/interpolation/TriDecorator.h
  10. +1 −0 src/analysis/raster/qgsrastercalcparser.yy
  11. +1 −0 src/analysis/vector/qgsgeometryanalyzer.cpp
  12. +1 −1 src/analysis/vector/qgsgeometryanalyzer.h
  13. +2 −2 src/app/legend/qgslegend.cpp
  14. +1 −1 src/app/legend/qgslegend.h
  15. +1 −0 src/app/main.cpp
  16. +1 −1 src/core/pal/hashtable.hpp
  17. +1 −0 src/core/qgscoordinatereferencesystem.cpp
  18. +2 −2 src/core/qgsdataprovider.h
  19. +1 −0 src/core/qgsdiagram.h
  20. +3 −3 src/core/qgsexpression.h
  21. +2 −2 src/core/qgsmaplayer.cpp
  22. +2 −3 src/core/qgsmaplayer.h
  23. +1 −0 src/core/qgssearchstringparser.yy
  24. +1 −1 src/core/raster/qgsrasterlayer.cpp
  25. +4 −4 src/core/raster/qgsrasterlayer.h
  26. +1 −1 src/core/renderer/qgsgraduatedsymbolrenderer.cpp
  27. +1 −1 src/core/spatialite/spatialite.c
  28. +1 −0 src/core/symbology-ng/qgsrendererv2registry.h
  29. +4 −0 src/core/symbology-ng/qgsrulebasedrendererv2.cpp
  30. +2 −0 src/core/symbology-ng/qgssymbollayerv2registry.h
  31. +2 −1 src/gui/attributetable/qgsattributetablememorymodel.cpp
  32. +2 −1 src/gui/attributetable/qgsattributetablememorymodel.h
  33. +2 −0 src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
  34. +1 −1 src/mapserver/qgswmsserver.cpp
  35. +6 −6 src/plugins/georeferencer/qgsleastsquares.cpp
  36. +1 −0 src/plugins/globe/globe_plugin.h
  37. +2 −2 src/plugins/globe/qgsosgearthtilesource.cpp
  38. +2 −3 src/plugins/globe/qgsosgearthtilesource.h
  39. +1 −1 src/plugins/grass/qgsgrassedit.cpp
  40. +1 −1 src/plugins/grass/qgsgrassmapcalc.cpp
  41. +1 −1 src/plugins/grass/qgsgrassmapcalc.h
  42. +1 −0 src/plugins/grass/qtermwidget/Screen.cpp
  43. +1 −1 src/plugins/grass/qtermwidget/ShellCommand.cpp
  44. +4 −0 src/plugins/heatmap/heatmapgui.cpp
  45. +1 −1 src/providers/grass/qgsgrassprovider.cpp
  46. +1 −1 src/providers/grass/qgsgrassprovider.h
  47. +2 −0 src/providers/mssql/qgsmssqlprovider.cpp
  48. +3 −1 src/providers/mssql/qgsmssqltablemodel.cpp
  49. +1 −4 src/providers/osm/osmhandler.cpp
  50. +1 −1 src/providers/osm/osmhandler.h
  51. +3 −1 src/providers/postgres/qgspgtablemodel.cpp
  52. +1 −3 src/providers/postgres/qgspostgresprovider.cpp
  53. +1 −1 src/providers/sqlanywhere/qgssqlanywhereprovider.cpp
  54. +1 −1 src/providers/sqlanywhere/qgssqlanywhereprovider.h
  55. +6 −5 src/providers/wfs/qgswfsprovider.cpp
  56. +3 −3 src/providers/wfs/qgswfsprovider.h
  57. +2 −2 src/providers/wms/qgswmsprovider.h
27 changes: 11 additions & 16 deletions debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,3 @@
qgis (1.9.90) UNRELEASED; urgency=low

* new development version 1.9.90 after branch of 1.8.0
* include function help in package
* include heatmap plugin
* drop extra include path for QtWebkit on oneiric and natty
* add translations for desktop link
* add browser desktop entry
* 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
* add mssqlprovider plugin

-- Jürgen E. Fischer <jef@norbit.de> Fri, 23 Mar 2012 20:47:06 +0100

qgis (1.8.0) UNRELEASED; urgency=low

* new development version 1.8 after branch
Expand All @@ -26,8 +11,18 @@ qgis (1.8.0) UNRELEASED; urgency=low
* include network analysis library
* build package with libspatialindex where available
* drop wfsplugin & displaceplugin
* include function help in package
* include heatmap plugin
* drop extra include path for QtWebkit on oneiric and natty
* add translations for desktop link
* add browser desktop entry
* 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
* add mssqlprovider plugin
* copyright & policy update (synced from debiangis)

-- Jürgen E. Fischer <jef@norbit.de> Fri, 28 Oct 2011 08:52:45 +0200
-- Jürgen E. Fischer <jef@norbit.de> Sun, 01 Apr 2012 17:20:03 +0200

qgis (1.7.0) UNRELEASED; urgency=low

Expand Down
2 changes: 1 addition & 1 deletion debian/compat.sid
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7
8
1 change: 1 addition & 0 deletions debian/compat.wheezy
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8
18 changes: 10 additions & 8 deletions debian/control.sid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
Build-Depends:
bison,
cmake (>= 2.6),
debhelper (>= 7),
debhelper (>= 9),
flex,
grass-dev,
libexpat1-dev,
Expand Down Expand Up @@ -37,8 +37,8 @@ Build-Depends:
graphviz,
txt2tags
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
Expand All @@ -58,6 +58,7 @@ 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.
Expand Down Expand Up @@ -92,7 +93,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
Expand All @@ -114,8 +116,8 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python, ${misc:Depends}
Replaces: qgis-common (<< 1.5)
Depends: python
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
Expand All @@ -127,8 +129,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}), ${shlibs:Depends}, ${misc:Depends}
Provides: ${python:Provides}
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), ${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.
Expand All @@ -139,7 +140,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${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.
Expand All @@ -162,6 +163,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.
Expand Down
2 changes: 1 addition & 1 deletion debian/control.squeeze
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Build-Depends:
git,
doxygen,
graphviz,
txt2tags
txt2tags
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.4
XS-Python-Version: current
Expand Down
17 changes: 10 additions & 7 deletions debian/control.wheezy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
Build-Depends:
bison,
cmake (>= 2.6),
debhelper (>= 7),
debhelper (>= 9),
flex,
grass-dev,
libexpat1-dev,
Expand Down Expand Up @@ -37,8 +37,8 @@ Build-Depends:
graphviz,
txt2tags
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
Expand All @@ -58,6 +58,7 @@ 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.
Expand Down Expand Up @@ -92,7 +93,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
Expand All @@ -114,8 +116,8 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python, ${misc:Depends}
Replaces: qgis-common (<< 1.5)
Depends: python
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
Expand All @@ -127,7 +129,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}), ${shlibs:Depends}, ${misc:Depends}
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}
Description: Python bindings to Quantum GIS
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
Expand All @@ -139,7 +141,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${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.
Expand All @@ -162,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.
Expand Down
Loading