Skip to content
Permalink
Browse files

Merge branch 'master' of github.com:qgis/Quantum-GIS

  • Loading branch information
timlinux committed May 25, 2011
2 parents 3f50ee2 + c3e161a commit 4be0d7181099e973e69089ebf1d391edc259cd9e
Showing with 695 additions and 732 deletions.
  1. +10 −20 CMakeLists.txt
  2. +2 −1 debian/changelog
  3. +2 −2 debian/control.hardy
  4. +3 −2 debian/control.intrepid
  5. +3 −2 debian/control.jaunty
  6. +3 −2 debian/control.karmic
  7. +3 −2 debian/control.lenny
  8. +3 −2 debian/control.lucid
  9. +3 −2 debian/control.maverick
  10. +3 −2 debian/control.natty
  11. +3 −2 debian/control.sid
  12. +3 −2 debian/control.squeeze
  13. +1 −0 debian/python-qgis.lintian-overrides.in
  14. +0 −1 debian/qgis-plugin-grass.lintian-overrides
  15. +1 −0 debian/qgis-plugin-grass.postrm
  16. +1 −0 debian/qgis-plugin-grass.preinst
  17. +2 −0 debian/qgis-sqlanywhere{QGIS_ABI}.lintian-overrides
  18. +7 −1 debian/rules
  19. +7 −7 i18n/qgis_af.ts
  20. +7 −7 i18n/qgis_ar.ts
  21. +7 −7 i18n/qgis_bg.ts
  22. +7 −7 i18n/qgis_ca_ES.ts
  23. +8 −8 i18n/qgis_cs_CZ.ts
  24. +7 −7 i18n/qgis_de.ts
  25. +7 −7 i18n/qgis_el_GR.ts
  26. +7 −7 i18n/qgis_es.ts
  27. +7 −7 i18n/qgis_fa.ts
  28. +7 −7 i18n/qgis_fi.ts
  29. +7 −7 i18n/qgis_fr.ts
  30. +7 −7 i18n/qgis_he.ts
  31. +7 −7 i18n/qgis_hr_HR.ts
  32. +7 −7 i18n/qgis_hu.ts
  33. +7 −7 i18n/qgis_id.ts
  34. +7 −7 i18n/qgis_is.ts
  35. +9 −9 i18n/qgis_it.ts
  36. +7 −7 i18n/qgis_ja.ts
  37. +7 −7 i18n/qgis_ka_GE.ts
  38. +7 −7 i18n/qgis_lo.ts
  39. +7 −7 i18n/qgis_lt.ts
  40. +7 −7 i18n/qgis_lv.ts
  41. +7 −7 i18n/qgis_mn.ts
  42. +7 −7 i18n/qgis_nl.ts
  43. +7 −7 i18n/qgis_pl_PL.ts
  44. +7 −7 i18n/qgis_pt_BR.ts
  45. +7 −7 i18n/qgis_pt_PT.ts
  46. +7 −7 i18n/qgis_ro.ts
  47. +7 −7 i18n/qgis_ru.ts
  48. +7 −7 i18n/qgis_sk.ts
  49. +7 −7 i18n/qgis_sl_SI.ts
  50. +7 −7 i18n/qgis_sq_AL.ts
  51. +7 −7 i18n/qgis_sr_CS-Latn.ts
  52. +7 −7 i18n/qgis_sv.ts
  53. +7 −7 i18n/qgis_ta.ts
  54. +7 −7 i18n/qgis_th.ts
  55. +7 −7 i18n/qgis_tr.ts
  56. +7 −7 i18n/qgis_uk.ts
  57. +7 −7 i18n/qgis_vi.ts
  58. +7 −7 i18n/qgis_xh.ts
  59. +7 −7 i18n/qgis_zh_CN.ts
  60. +7 −7 i18n/qgis_zh_TW.ts
  61. +1 −0 ms-windows/osgeo4w/package-nightly.cmd
  62. +1 −0 ms-windows/osgeo4w/package.cmd
  63. +2 −0 ms-windows/osgeo4w/postinstall.bat
  64. +3 −0 ms-windows/osgeo4w/preremove.bat
  65. +17 −0 qbrowser.1
  66. +1 −0 scripts/spelling.dat
  67. +1 −1 src/app/qgisapp.cpp
  68. +1 −1 src/app/qgsrasterlayerproperties.cpp
  69. +1 −1 src/app/qgstipfactory.cpp
  70. 0 src/browser/qgsbrowsermodel.cpp
  71. +2 −0 src/core/qgscredentials.cpp
  72. +12 −14 src/core/qgsdataitem.cpp
  73. 0 src/core/qgsdataitem.h
  74. +1 −1 src/core/qgsmaplayer.cpp
  75. +7 −4 src/core/qgspallabeling.cpp
  76. +1 −1 src/core/qgsproject.cpp
  77. +0 −1 src/core/qgssearchstring.cpp
  78. +9 −0 src/core/qgsvectorlayer.cpp
  79. +9 −2 src/core/symbology-ng/qgslinesymbollayerv2.cpp
  80. +5 −2 src/mapserver/qgsconfigparser.cpp
  81. +4 −0 src/mapserver/qgsgetrequesthandler.cpp
  82. +4 −2 src/plugins/grass/CMakeLists.txt
  83. +1 −0 src/plugins/grass/qgsgrassplugin.cpp
  84. +5 −3 src/plugins/grass/qgsgrassplugin.h
  85. +2 −2 src/plugins/grass/qgsgrassselect.cpp
  86. +1 −1 src/providers/gdal/qgsgdalprovider.cpp
  87. +33 −51 src/providers/grass/CMakeLists.txt
  88. +0 −70 src/providers/grass/provider.cpp
  89. +46 −46 src/providers/grass/qgsgrass.cpp
  90. +58 −58 src/providers/grass/qgsgrass.h
  91. +89 −41 src/providers/grass/qgsgrassprovider.cpp
  92. +16 −16 src/providers/grass/qgsgrassprovider.h
  93. +1 −1 src/providers/ogr/qgsogrprovider.cpp
  94. +6 −0 src/providers/osm/osmprovider.cpp
  95. +3 −15 src/providers/sqlanywhere/CMakeLists.txt
  96. +1 −1 src/ui/qgsattributetypeedit.ui
  97. +1 −1 src/ui/qgsvectorlayersaveasdialogbase.ui
  98. +0 −20 tests/src/analysis/CMakeLists.txt
  99. +0 −18 tests/src/core/CMakeLists.txt
  100. +0 −18 tests/src/gui/CMakeLists.txt
@@ -348,27 +348,17 @@ IF(COMMAND cmake_policy)
ENDIF(COMMAND cmake_policy)

IF (WIN32)
# expect that classes are being imported
# Note: MSVC doesn't like when the macros are quotes
# and MSYS doesn't like them unqouted (bacause of braces)
IF (MSVC)
ADD_DEFINITIONS("-DCORE_EXPORT=__declspec(dllimport)")
ADD_DEFINITIONS("-DGUI_EXPORT=__declspec(dllimport)")
ADD_DEFINITIONS("-DPYTHON_EXPORT=__declspec(dllimport)")
ADD_DEFINITIONS("-DANALYSIS_EXPORT=__declspec(dllimport)")
ELSE (MSVC)
ADD_DEFINITIONS("\"-DCORE_EXPORT=__declspec(dllimport)\"")
ADD_DEFINITIONS("\"-DGUI_EXPORT=__declspec(dllimport)\"")
ADD_DEFINITIONS("\"-DPYTHON_EXPORT=__declspec(dllimport)\"")
ADD_DEFINITIONS("\"-DANALYSIS_EXPORT=__declspec(dllimport)\"")
ENDIF (MSVC)
SET(DLLIMPORT "__declspec(dllimport)")
SET(DLLEXPORT "__declspec(dllexport)")
ELSE (WIN32)
# other compilers don't use that MSVC construct
ADD_DEFINITIONS(-DCORE_EXPORT=)
ADD_DEFINITIONS(-DGUI_EXPORT=)
ADD_DEFINITIONS(-DPYTHON_EXPORT=)
ADD_DEFINITIONS(-DANALYSIS_EXPORT=)
ENDIF (WIN32)
SET(DLLIMPORT "")
SET(DLLEXPORT "")
ENDIF(WIN32)

ADD_DEFINITIONS("-DCORE_EXPORT=${DLLIMPORT}")
ADD_DEFINITIONS("-DGUI_EXPORT=${DLLIMPORT}")
ADD_DEFINITIONS("-DPYTHON_EXPORT=${DLLIMPORT}")
ADD_DEFINITIONS("-DANALYSIS_EXPORT=${DLLIMPORT}")

#############################################################
# user-changeable settings which can be used to customize
@@ -1,8 +1,9 @@
qgis (1.8.0) UNRELEASED; urgency=low

* new development version 1.8 after branch
* add qgis browser (qbrowser)

-- Jürgen E. Fischer <jef@norbit.de> Sat, 07 May 2011 00:47:20 +0200
-- Jürgen E. Fischer <jef@norbit.de> Mon, 23 May 2011 18:08:18 +0200

qgis (1.7.0) UNRELEASED; urgency=low

@@ -79,7 +79,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -104,7 +104,7 @@ Description: Python bindings to Quantum GIS
Package: python-qgis-common
Section: python
Architecture: all
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
@@ -80,7 +80,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -105,7 +105,7 @@ Description: Python bindings to Quantum GIS
Package: python-qgis-common
Section: python
Architecture: all
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
@@ -148,6 +148,7 @@ Description: Quantum GIS mapserver

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.
@@ -80,7 +80,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -105,7 +105,7 @@ Description: Python bindings to Quantum GIS
Package: python-qgis-common
Section: python
Architecture: all
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
@@ -148,6 +148,7 @@ Description: Quantum GIS mapserver

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.
@@ -80,7 +80,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -105,7 +105,7 @@ Description: Python bindings to Quantum GIS
Package: python-qgis-common
Section: python
Architecture: all
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
@@ -148,6 +148,7 @@ Description: Quantum GIS mapserver

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.
@@ -109,7 +109,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -135,7 +135,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal
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
@@ -186,6 +186,7 @@ Description: Quantum GIS sql anywhere 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.
@@ -110,7 +110,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -136,7 +136,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal
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
@@ -187,6 +187,7 @@ Description: Quantum GIS sql anywhere 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.
@@ -111,7 +111,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -137,7 +137,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal
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
@@ -188,6 +188,7 @@ Description: Quantum GIS sql anywhere 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.
@@ -111,7 +111,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -137,7 +137,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal
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
@@ -188,6 +188,7 @@ Description: Quantum GIS sql anywhere 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.
@@ -111,7 +111,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -137,7 +137,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal
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
@@ -188,6 +188,7 @@ Description: Quantum GIS sql anywhere 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.
@@ -110,7 +110,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -136,7 +136,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal
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
@@ -187,6 +187,7 @@ Description: Quantum GIS sql anywhere 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.
@@ -1 +1,2 @@
python-qgis: package-name-doesnt-match-sonames
python-qgis: no-symbols-control-file
@@ -1,3 +1,2 @@
qgis-plugin-grass: binary-without-manpage
qgis-plugin-grass: package-name-doesnt-match-sonames
qgis-plugin-grass: no-symbols-control-file
@@ -4,6 +4,7 @@ set -e

if [ "$1" = "remove" ]; then
dpkg-divert --package qgis-plugin-grass --remove --rename --divert /usr/bin/qgis.bin /usr/bin/qgis
dpkg-divert --package qgis-plugin-grass --remove --rename --divert /usr/bin/qbrowser.bin /usr/bin/qbrowser
fi

#DEBHELPER#
@@ -4,6 +4,7 @@ set -e

if [ "$1" = "install" -o "$1" = "upgrade" ]; then
dpkg-divert --package qgis-plugin-grass --add --rename --divert /usr/bin/qgis.bin /usr/bin/qgis
dpkg-divert --package qgis-plugin-grass --add --rename --divert /usr/bin/qbrowser.bin /usr/bin/qbrowser
fi

#DEBHELPER#
@@ -0,0 +1,2 @@
qgis-sqlanywhere{QGIS_ABI}: package-name-doesnt-match-sonames
qgis-sqlanywhere{QGIS_ABI}: no-symbols-control-file
@@ -129,6 +129,10 @@ endif
# Add here commands to install the package into debian/tmp.
$(MAKE) -C debian/build install DESTDIR=$(CURDIR)/debian/tmp

# remove unwanted files
rm debian/tmp/usr/share/qgis/doc/api/installdox
! [ -f debian/tmp/usr/share/qgis/doc/api/jquery.js ] || rm debian/tmp/usr/share/qgis/doc/api/jquery.js

# Install menu pixmap
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps
@@ -150,17 +154,19 @@ binary-arch: build install

install -o root -g root -m 755 -d $(CURDIR)/debian/qgis/usr/bin
install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qgis $(CURDIR)/debian/qgis/usr/bin
install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qbrowser $(CURDIR)/debian/qgis/usr/bin

install -o root -g root -m 755 -d $(CURDIR)/debian/qgis-plugin-grass/usr/bin
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qgis
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qbrowser

dh_pycentral
dh_installmenu
dh_icons
ifneq (,$(findstring $(DISTRIBUTION),"lenny hardy"))
dh_desktop
endif
dh_installman -pqgis qgis.1
dh_installman -pqgis qgis.1 qbrowser.1
dh_installmime -pqgis
dh_link
if which dh_lintian >/dev/null; then dh_lintian; fi

0 comments on commit 4be0d71

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