Skip to content
Permalink
Browse files

merge from trunk r11650:11700

git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11893 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder
wonder committed Nov 2, 2009
1 parent 7473956 commit bf09b1d71dd853382a4f889ad8fd73ace22d6a69
Showing with 32,124 additions and 27,423 deletions.
  1. +1 −1 TRANSLATORS
  2. +9 −0 debian/changelog
  3. +8 −8 debian/control
  4. +115 −0 debian/control.hardy
  5. +115 −0 debian/control.intrepid
  6. +115 −0 debian/control.jaunty
  7. +115 −0 debian/control.karmic
  8. +115 −0 debian/control.lenny
  9. +115 −0 debian/control.sid
  10. +0 −8 debian/libqgis1.3.0-dev.README.Debian
  11. +0 −3 debian/libqgis1.3.0-dev.install
  12. +3 −0 debian/libqgis{QGIS_ABI}-dev.install
  13. 0 debian/{libqgis1.3.0.install → libqgis{QGIS_ABI}.install}
  14. +34 −4 debian/rules
  15. +932 −868 i18n/qgis_ar.ts
  16. +934 −870 i18n/qgis_cs_CZ.ts
  17. +727 −644 i18n/qgis_de.ts
  18. +932 −868 i18n/qgis_el_GR.ts
  19. +1,457 −1,217 i18n/qgis_es.ts
  20. +1,334 −1,125 i18n/qgis_fr.ts
  21. +932 −868 i18n/qgis_he.ts
  22. +952 −753 i18n/qgis_hu.ts
  23. +934 −874 i18n/qgis_id.ts
  24. +957 −750 i18n/qgis_it.ts
  25. +935 −871 i18n/qgis_ja.ts
  26. +937 −869 i18n/qgis_ka_GE.ts
  27. +937 −869 i18n/qgis_lo.ts
  28. +931 −867 i18n/qgis_lt.ts
  29. +949 −861 i18n/qgis_lv.ts
  30. +937 −869 i18n/qgis_mn.ts
  31. +1,593 −1,472 i18n/qgis_nl.ts
  32. +585 −1,074 i18n/qgis_pl_PL.ts
  33. +2,667 −2,055 i18n/qgis_pt_BR.ts
  34. +938 −870 i18n/qgis_ro.ts
  35. +954 −751 i18n/qgis_ru.ts
  36. +937 −869 i18n/qgis_sk.ts
  37. +937 −869 i18n/qgis_sq_AL.ts
  38. +939 −760 i18n/qgis_sv.ts
  39. +937 −869 i18n/qgis_th.ts
  40. +937 −869 i18n/qgis_tr.ts
  41. +2,502 −2,155 i18n/qgis_uk.ts
  42. +168 −139 i18n/qgis_vi.ts
  43. +170 −141 i18n/qgis_xh.ts
  44. +168 −139 i18n/qgis_zh_CN.ts
  45. +175 −130 i18n/qgis_zh_TW.ts
  46. +1 −1 images/CMakeLists.txt
  47. BIN images/splash/splash.png
  48. BIN images/splash/splash.xcf.bz2
  49. BIN images/themes/default/mActionRotatePointSymbols.png
  50. +20 −61 mac/xcode/Qgis.xcodeproj/project.pbxproj
  51. +2 −2 mac/xcode/qgis_settings.xcconfig
  52. +6 −5 ms-windows/osgeo4w/package.cmd
  53. +6 −6 ms-windows/osgeo4w/postinstall.bat
  54. +5 −4 ms-windows/osgeo4w/preremove.bat
  55. +1 −1 ms-windows/osgeo4w/{qgis-dev.bat.tmpl → qgis.bat.tmpl}
  56. +2 −2 ms-windows/osgeo4w/{qgis-dev.reg.tmpl → qgis.reg.tmpl}
  57. +2 −0 src/app/CMakeLists.txt
  58. +1 −1 src/app/attributetable/qgsattributetabledialog.cpp
  59. +31 −5 src/app/attributetable/qgsattributetablemodel.cpp
  60. +1 −0 src/app/attributetable/qgsattributetablemodel.h
  61. +2 −2 src/app/legend/qgslegend.cpp
  62. +29 −4 src/app/qgisapp.cpp
  63. +4 −0 src/app/qgisapp.h
  64. +10 −7 src/app/qgsattributedialog.cpp
  65. +1 −2 src/app/qgsattributedialog.h
  66. +12 −1 src/app/qgsattributeeditor.cpp
  67. +7 −0 src/app/qgsattributetypedialog.cpp
  68. +222 −40 src/app/qgsidentifyresults.cpp
  69. +9 −0 src/app/qgsidentifyresults.h
  70. +21 −5 src/app/qgsmaptoolidentify.cpp
  71. +316 −0 src/app/qgsmaptoolrotatepointsymbols.cpp
  72. +73 −0 src/app/qgsmaptoolrotatepointsymbols.h
  73. +111 −0 src/app/qgspointrotationitem.cpp
  74. +51 −0 src/app/qgspointrotationitem.h
  75. +4 −5 src/app/qgsspatialitesourceselect.cpp
  76. +1 −0 src/app/qgsvectorlayerproperties.cpp
  77. +1 −1 src/core/CMakeLists.txt
  78. +12 −2 src/core/qgsvectorfilewriter.cpp
  79. +3 −0 src/core/qgsvectorfilewriter.h
  80. +3 −3 src/core/qgsvectorlayer.cpp
  81. +2 −1 src/core/qgsvectorlayer.h
  82. +9 −0 src/core/renderer/qgssinglesymbolrenderer.cpp
  83. +35 −3 src/ui/qgsattributetypeedit.ui
  84. +39 −30 src/ui/qgsidentifyresultsbase.ui
@@ -15,7 +15,7 @@ Czech|Martin Landa
Chinese|Zhang Jun
Danish|Henriette Roued
Dutch|Richard Duivenvoorde, Raymond Nijssen
French|Eve Rousseau, Marc Monnerat, Lionel Roubeyrie
French|Eve Rousseau, Marc Monnerat, Lionel Roubeyrie, Jean Roc Morreale
German|Jürgen E. Fischer, Stephan Holl, Otto Dassau, Werner Macho
Hungarian|Siki Zoltan
Indonesian|Januar V. Simarmata
@@ -1,3 +1,12 @@
qgis (1.4.0) UNRELEASED; urgency=low

* new development version after 1.3 branch
* use templates for configuration for ABIs and distributions
* policy updated to 3.8.3
* remove README.Debian from libqgis{QGIS_ABI}-dev

-- Jürgen E. Fischer <jef@norbit.de> Fri, 18 Sep 2009 18:50:02 +0200

qgis (1.3.0) UNRELEASED; urgency=low

* new upstream release
@@ -3,14 +3,14 @@ Section: science
Priority: extra
Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
libgeos-dev (>= 2.0.1), grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev,
libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev,
flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
sharutils, sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
libsm-dev, pyqt4-dev-tools
Build-Conflicts: libqgis1.3.0-dev, qgis-dev
Standards-Version: 3.8.0
Build-Conflicts: libqgis1.4.0-dev, qgis-dev
Standards-Version: 3.8.3
XS-Python-Version: current
Homepage: http://qgis.org/

@@ -39,7 +39,7 @@ Description: Quantum GIS - architecture-independent data
This package contains architecture-independent supporting data files for use
with Quantum GIS.

Package: libqgis1.3.0
Package: libqgis1.4.0
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: qgis (<=0.9.2rc1), libqgis-core1, libqgis-gui1, libqgis0, libqgis1
@@ -50,11 +50,11 @@ Description: Quantum GIS - shared libraries
This package contains the shared core and gui library that provide an
interface for plugins and stand-alone applications.

Package: libqgis1.3.0-dev
Package: libqgis1.4.0-dev
Architecture: any
Section: libdevel
Depends: libqgis1.3.0 (= ${binary:Version}), libgdal1-dev | libgdal1-1.3.2-dev,
libpq-dev | postgresql-dev, libgeos-dev (>= 2.0.1), grass-dev,
Depends: libqgis1.4.0 (= ${binary:Version}), libgdal1-dev,
libpq-dev, libgeos-dev (>= 3.0.0), grass-dev,
libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, libqt4-core (>=4.2.0),
libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0),
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
@@ -70,7 +70,7 @@ Description: Quantum GIS - development files

Package: qgis-plugin-grass
Architecture: any
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.6.0-grass | libgdal1-1.5.0-grass | libgdal1-1.4.0-grass
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.6.0-grass, grass64
Description: GRASS plugin for Quantum GIS
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -0,0 +1,115 @@
Source: qgis
Section: science
Priority: extra
Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev,
flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
sharutils, sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
libsm-dev, pyqt4-dev-tools
Build-Conflicts: libqgis{QGIS_ABI}-dev, qgis-dev
Standards-Version: 3.8.0
XS-Python-Version: current
Homepage: http://qgis.org/

Package: qgis
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, 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
Depends: qgis (>= ${source:Version})
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{QGIS_ABI}-dev
Architecture: any
Section: libdevel
Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
libpq-dev, libgeos-dev (>= 3.0.0), grass-dev,
libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, libqt4-core (>=4.2.0),
libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0),
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
qt4-designer (>=4.2.0)
Provides: libqgis-dev, qgis-dev
Replaces: libqgis-dev, qgis-dev, libqgis1-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}, libgdal1-1.5.0-grass
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: qgis-plugin-grass (>= ${source:Version}), python
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-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc: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
Depends: python-qgis (>= ${source:Version})
Provides: ${python:Provides}
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.

@@ -0,0 +1,115 @@
Source: qgis
Section: science
Priority: extra
Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev,
flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
sharutils, sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
libsm-dev, pyqt4-dev-tools
Build-Conflicts: libqgis{QGIS_ABI}-dev, qgis-dev
Standards-Version: 3.8.0
XS-Python-Version: current
Homepage: http://qgis.org/

Package: qgis
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, 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
Depends: qgis (>= ${source:Version})
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{QGIS_ABI}-dev
Architecture: any
Section: libdevel
Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
libpq-dev, libgeos-dev (>= 3.0.0), grass-dev,
libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, libqt4-core (>=4.2.0),
libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0),
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
qt4-designer (>=4.2.0)
Provides: libqgis-dev, qgis-dev
Replaces: libqgis-dev, qgis-dev, libqgis1-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}, libgdal1-1.5.0-grass
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: qgis-plugin-grass (>= ${source:Version}), python
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-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc: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
Depends: python-qgis (>= ${source:Version})
Provides: ${python:Provides}
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.

0 comments on commit bf09b1d

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