Skip to content
Permalink
Browse files

merge from trunk r11450:11500

git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11889 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder
wonder committed Nov 2, 2009
1 parent 7d3257e commit dee6b0a61a28cb3386c1c9d4d71ef6625ff1b844
Showing with 30,679 additions and 24,092 deletions.
  1. +30 −17 CMakeLists.txt
  2. +1 −0 CONTRIBUTORS
  3. +3 −3 TRANSLATORS
  4. +0 −1 cmake_templates/qgssvnversion.h.in_cmake
  5. +0 −17 cmake_templates/svnscript.cmake.in_cmake
  6. +6 −0 debian/changelog
  7. +4 −4 debian/control
  8. 0 debian/{libqgis1.2.0-dev.README.Debian → libqgis1.3.0-dev.README.Debian}
  9. 0 debian/{libqgis1.2.0-dev.install → libqgis1.3.0-dev.install}
  10. 0 debian/{libqgis1.2.0.install → libqgis1.3.0.install}
  11. +2 −2 debian/libqgis1.lintian-overrides
  12. +801 −803 i18n/qgis_ar.ts
  13. +1,054 −884 i18n/qgis_cs_CZ.ts
  14. +301 −268 i18n/qgis_de.ts
  15. +771 −788 i18n/qgis_el_GR.ts
  16. +262 −145 i18n/qgis_es.ts
  17. +1,083 −543 i18n/qgis_fr.ts
  18. +767 −784 i18n/qgis_he.ts
  19. +779 −671 i18n/qgis_hu.ts
  20. +936 −870 i18n/qgis_id.ts
  21. +2,905 −2,467 i18n/qgis_it.ts
  22. +999 −863 i18n/qgis_ja.ts
  23. +1,015 −833 i18n/qgis_ka_GE.ts
  24. +962 −778 i18n/qgis_lo.ts
  25. +784 −801 i18n/qgis_lt.ts
  26. +2,297 −1,677 i18n/qgis_lv.ts
  27. +998 −818 i18n/qgis_mn.ts
  28. +558 −541 i18n/qgis_nl.ts
  29. +2,095 −847 i18n/qgis_pl_PL.ts
  30. +1,015 −825 i18n/qgis_pt_BR.ts
  31. +978 −835 i18n/qgis_ro.ts
  32. +169 −169 i18n/qgis_ru.ts
  33. +1,018 −832 i18n/qgis_sk.ts
  34. +961 −777 i18n/qgis_sq_AL.ts
  35. +383 −409 i18n/qgis_sv.ts
  36. +995 −827 i18n/qgis_th.ts
  37. +1,195 −977 i18n/qgis_tr.ts
  38. +663 −512 i18n/qgis_vi.ts
  39. +362 −383 i18n/qgis_xh.ts
  40. +614 −458 i18n/qgis_zh_CN.ts
  41. +1,468 −1,459 i18n/qgis_zh_TW.ts
  42. BIN images/splash/splash.png
  43. BIN images/splash/splash.xcf.bz2
  44. BIN images/themes/default/mActionAddImage.png
  45. BIN images/themes/default/mActionAddMap.png
  46. BIN images/themes/default/mActionReshape.png
  47. BIN images/themes/default/mActionSaveMapAsImage.png
  48. +117 −5 mac/xcode/Qgis.xcodeproj/project.pbxproj
  49. +3 −3 mac/xcode/qgis_settings.xcconfig
  50. +17 −8 ms-windows/QGIS-Installer.nsi
  51. +16 −12 ms-windows/osgeo4w/package.cmd
  52. +5 −0 python/core/qgsgeometry.sip
  53. +25 −0 resources/context_help/361087368_pl_PL
  54. +6 −0 resources/context_help/687883780_pl_PL
  55. +7 −0 resources/context_help/689216579_pl_PL
  56. +2 −0 resources/context_help/831088384_pl_PL
  57. +34 −0 resources/context_help/863656587_pl_PL
  58. +18 −0 resources/context_help/929865718_pl_PL
  59. +20 −0 resources/context_help/939347163_pl_PL
  60. +11 −0 resources/context_help/985715179_pl_PL
  61. +1 −0 src/app/CMakeLists.txt
  62. +3 −3 src/app/composer/qgscomposer.cpp
  63. +26 −1 src/app/qgisapp.cpp
  64. +4 −0 src/app/qgisapp.h
  65. +70 −3 src/app/qgsattributetypedialog.cpp
  66. +12 −1 src/app/qgsattributetypedialog.h
  67. +120 −67 src/app/qgsdbsourceselect.cpp
  68. +36 −12 src/app/qgsdbsourceselect.h
  69. +15 −7 src/app/qgsdbtablemodel.cpp
  70. +12 −1 src/app/qgsdbtablemodel.h
  71. +52 −2 src/app/qgsmaptoolidentify.cpp
  72. +5 −0 src/app/qgsmaptoolidentify.h
  73. +128 −0 src/app/qgsmaptoolreshape.cpp
  74. +31 −0 src/app/qgsmaptoolreshape.h
  75. +16 −2 src/app/qgsmeasuretool.cpp
  76. +7 −4 src/app/qgsmergeattributesdialog.cpp
  77. +2 −2 src/app/qgsspatialitesourceselect.cpp
  78. +2 −1 src/core/composer/qgscomposeritem.cpp
  79. +4 −0 src/core/composer/qgscomposition.cpp
  80. +10 −13 src/core/qgscoordinatereferencesystem.cpp
  81. +31 −7 src/core/qgsdistancearea.cpp
  82. +2 −2 src/core/qgsdistancearea.h
  83. +495 −23 src/core/qgsgeometry.cpp
  84. +30 −1 src/core/qgsgeometry.h
  85. +6 −4 src/core/qgsvectorfilewriter.cpp
  86. +1 −1 src/core/renderer/qgsuniquevaluerenderer.h
  87. +7 −1 src/gui/qgsprojectionselector.cpp
  88. +5 −5 src/providers/ogr/qgsogrprovider.cpp
  89. +15 −2 src/providers/postgres/qgspostgresprovider.cpp
  90. +1 −3 src/providers/spatialite/qgsspatialiteprovider.cpp
  91. +12 −5 src/ui/qgsattributetypeedit.ui
  92. +3 −3 src/ui/qgscomposerbase.ui
@@ -1,12 +1,12 @@
SET(CPACK_PACKAGE_VERSION_MAJOR "1")
SET(CPACK_PACKAGE_VERSION_MINOR "2")
SET(CPACK_PACKAGE_VERSION_MINOR "3")
SET(CPACK_PACKAGE_VERSION_PATCH "0")
SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
SET(RELEASE_NAME "Daphnis")
SET(RELEASE_NAME "Unstable")
SET(PROJECT_VERSION ${COMPLETE_VERSION})
PROJECT(qgis${PROJECT_VERSION})
# Note the version no is Mmmpp for Major/minor/patch, 0-padded, thus '10100' for 1.1.0
SET(QGIS_VERSION_INT 10200)
SET(QGIS_VERSION_INT 10300)

# TODO:
# - install includes for libs
@@ -340,20 +340,33 @@ LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/src/core ${CMAKE_BINARY_DIR}/src/gui)

FIND_FILE(SVN_MARKER entries PATHS ${CMAKE_SOURCE_DIR}/.svn)

IF (NOT SVN_MARKER)
SET (SVN_MARKER ${CMAKE_SOURCE_DIR}/CMakeLists.txt) # Dummy file
ENDIF (NOT SVN_MARKER)
# Add a custom command to drive the svn script whenever the svn entries
# file changes.
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake_templates/svnscript.cmake.in_cmake
${CMAKE_CURRENT_BINARY_DIR}/svnscript.cmake
@ONLY)

ADD_CUSTOM_COMMAND (
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
DEPENDS ${SVN_MARKER}
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/svnscript.cmake
)
IF (SVN_MARKER)
# See if we have svn installed
FIND_PROGRAM(SVNVERSION svnversion PATHS c:/cygwin/bin)

IF(SVNVERSION)
IF(MSVC)
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
COMMAND for /f usebackq %%a in "(`\"${SVNVERSION}\"`)" do echo \#define QGSSVNVERSION \"%%a\" >${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
MAIN_DEPENDENCY ${SVN_MARKER}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
)
ELSE(MSVC)
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
COMMAND echo \\\#define QGSSVNVERSION \\\"`${SVNVERSION}`\\\" >${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h
MAIN_DEPENDENCY ${SVN_MARKER}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
)
ENDIF(MSVC)
ELSE(SVNVERSION)
MESSAGE(STATUS "svnversion not found - version will be unknown")
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h "#define QGSSVNVERSION \"unknown\"")
ENDIF (SVNVERSION)
ELSE (SVN_MARKER)
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h "#define QGSSVNVERSION \"exported\"")
ENDIF (SVN_MARKER)

ADD_CUSTOM_TARGET(svnversion ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/qgssvnversion.h)

@@ -34,3 +34,4 @@ Nikos Alexandris
Robert Szczepanek
Matt Amos
Mathias Walker
Germán Carrillo
@@ -10,7 +10,7 @@
#
# ALWAYS USE UTF-8 WHEN WRITING THIS FILE!
#
Arabic|Assem Kamal
Arabic|Assem Kamal, Latif Jalil
Czech|Martin Landa
Chinese|Zhang Jun
Danish|Henriette Roued
@@ -22,9 +22,9 @@ Indonesian|Januar V. Simarmata
Italian|Maurizio Napolitano
Japanese|BABA Yoshihiko
Lao|Anousak Souphavanh
Latvian|Maris Nartiss
Latvian|Maris Nartiss, Peteris Bruns
Lithuanian|Kestas M
Polish|Tomasz Paul, Mateusz Loskot, Robert Szczepanek
Polish|Tomasz Paul, Mateusz Loskot, Milena Nowotarska, Robert Szczepanek
Portuguese (Brazil)|Arthur Nanni, Christian Ferreira
Romanian|Lonut Losifescu-Enescu
Russian|Artem Popov

This file was deleted.

This file was deleted.

@@ -1,3 +1,9 @@
qgis (1.3.0) UNRELEASED; urgency=low

* new development version after 1.2 branch

-- Jürgen E. Fischer <jef@norbit.de> Sat, 22 Aug 2009 17:28:29 +0200

qgis (1.2.0) UNRELEASED; urgency=low

* new development version after 1.1 branch
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
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.2.0-dev, qgis-dev
Build-Conflicts: libqgis1.3.0-dev, qgis-dev
Standards-Version: 3.8.0
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.2.0
Package: libqgis1.3.0
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: qgis (<=0.9.2rc1), libqgis-core1, libqgis-gui1, libqgis0, libqgis1
@@ -50,10 +50,10 @@ 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.2.0-dev
Package: libqgis1.3.0-dev
Architecture: any
Section: libdevel
Depends: libqgis1.2.0 (= ${binary:Version}), libgdal1-dev | libgdal1-1.3.2-dev,
Depends: libqgis1.3.0 (= ${binary:Version}), libgdal1-dev | libgdal1-1.3.2-dev,
libpq-dev | postgresql-dev, libgeos-dev (>= 2.0.1), 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),
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,3 +1,3 @@
libqgis1: shlib-calls-exit
libqgis1: no-symbols-control-file usr/lib/libqgis_gui.so.1.2.0
libqgis1: no-symbols-control-file usr/lib/libqgis_core.so.1.2.0
libqgis1: no-symbols-control-file usr/lib/libqgis_gui.so.1.3.0
libqgis1: no-symbols-control-file usr/lib/libqgis_core.so.1.3.0

0 comments on commit dee6b0a

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