Skip to content
Permalink
Browse files
Merge branch 'master' of https://github.com/qgis/Quantum-GIS
  • Loading branch information
volaya committed Jan 12, 2013
2 parents 5b431df + bc4f8f2 commit 13bfb5eb9a0094548205b7e3dbe555aff38bf4f7
Showing with 16,867 additions and 2,015 deletions.
  1. +5 −0 CMakeLists.txt
  2. +2 −2 cmake/FindQwt.cmake
  3. +2 −0 cmake_templates/qgsconfig.h.in
  4. +232 −0 debian/control.sid-oracle
  5. +2 −0 debian/qgis-oracle-provider.install.in
  6. +6 −1 debian/rules
  7. +41 −41 doc/TRANSLATORS
  8. +2,218 −1,054 i18n/qgis_de.ts
  9. +1,808 −674 i18n/qgis_gl_ES.ts
  10. +6 −0 images/images.qrc
  11. BIN images/themes/default/mActionAddOracleLayer.png
  12. BIN images/themes/default/mActionRotateFeature.png
  13. BIN images/themes/default/mIconCritical.png
  14. BIN images/themes/default/mIconInfo.png
  15. BIN images/themes/default/mIconOracle.png
  16. BIN images/themes/gis/mIconOracle.png
  17. +3 −1 ms-windows/osgeo4w/package-nightly.cmd
  18. +9 −1 ms-windows/osgeo4w/package.cmd
  19. +2 −1 python/console/console_output.py
  20. +2 −1 python/console/console_sci.py
  21. +15 −2 python/gui/qgsmessagebar.sip
  22. +1 −1 python/plugins/sextante/grass/GrassAlgorithm.py
  23. +10 −1 scripts/addcopyright.sh
  24. +12 −0 scripts/licenses
  25. +5 −0 scripts/prepare-commit.sh
  26. +2 −0 src/app/CMakeLists.txt
  27. +2 −2 src/app/main.cpp
  28. +82 −26 src/app/qgisapp.cpp
  29. +14 −1 src/app/qgisapp.h
  30. +2 −5 src/app/qgsmaptooladdfeature.cpp
  31. +2 −7 src/app/qgsmaptooladdpart.cpp
  32. +2 −5 src/app/qgsmaptooladdring.cpp
  33. +18 −0 src/app/qgsmaptooledit.cpp
  34. +7 −0 src/app/qgsmaptooledit.h
  35. +2 −3 src/app/qgsmaptoolmovefeature.cpp
  36. +7 −1 src/app/qgsmaptooloffsetcurve.cpp
  37. +2 −5 src/app/qgsmaptoolreshape.cpp
  38. +343 −0 src/app/qgsmaptoolrotatefeature.cpp
  39. +74 −0 src/app/qgsmaptoolrotatefeature.h
  40. +8 −1 src/app/qgsmaptoolrotatepointsymbols.cpp
  41. +7 −4 src/app/qgsmaptoolselectutils.cpp
  42. +7 −0 src/app/qgsmaptoolsimplify.cpp
  43. +2 −5 src/app/qgsmaptoolsplitfeatures.cpp
  44. +1 −0 src/app/qgsvectorlayerproperties.cpp
  45. +1 −1 src/core/composer/qgscomposition.cpp
  46. +22 −23 src/core/qgis.cpp
  47. +74 −37 src/core/qgis.h
  48. +25 −15 src/core/qgsgeometry.cpp
  49. +0 −3 src/core/qgsgeometry.h
  50. +3 −3 src/core/qgsproviderregistry.cpp
  51. +1 −1 src/core/qgsvectorfilewriter.cpp
  52. +2 −2 src/core/qgsvectorlayer.cpp
  53. +22 −0 src/core/qgsvectorlayerimport.cpp
  54. +3 −0 src/core/qgsvectorlayerimport.h
  55. +1 −1 src/core/symbology-ng/qgsrendererv2.cpp
  56. +1 −1 src/gui/attributetable/qgsattributetablemodel.cpp
  57. +43 −2 src/gui/qgsattributeeditor.cpp
  58. +1 −1 src/gui/qgsfieldvalidator.cpp
  59. +144 −1 src/gui/qgsmanageconnectionsdialog.cpp
  60. +6 −1 src/gui/qgsmanageconnectionsdialog.h
  61. +95 −11 src/gui/qgsmessagebar.cpp
  62. +28 −6 src/gui/qgsmessagebar.h
  63. +1 −1 src/plugins/grass/qgsgrassmodule.cpp
  64. +0 −1 src/plugins/grass/qgsgrassmodule.h
  65. +4 −0 src/providers/CMakeLists.txt
  66. +0 −1 src/providers/mssql/qgsmssqlsourceselect.h
  67. +54 −0 src/providers/oracle/CMakeLists.txt
  68. +32 −0 src/providers/oracle/ocispatial/CMakeLists.txt
  69. +7 −0 src/providers/oracle/ocispatial/README
  70. +45 −0 src/providers/oracle/ocispatial/cmake/FindOCI.cmake
  71. +85 −0 src/providers/oracle/ocispatial/main.cpp
  72. +3,983 −0 src/providers/oracle/ocispatial/qsql_ocispatial.cpp
  73. +130 −0 src/providers/oracle/ocispatial/qsql_ocispatial.h
  74. +100 −0 src/providers/oracle/ocispatial/qsqlcachedresult_p.h
  75. +66 −0 src/providers/oracle/ocispatial/wkbptr.h
  76. +66 −0 src/providers/oracle/qgsoraclecolumntypethread.cpp
  77. +53 −0 src/providers/oracle/qgsoraclecolumntypethread.h
  78. +695 −0 src/providers/oracle/qgsoracleconn.cpp
  79. +180 −0 src/providers/oracle/qgsoracleconn.h
  80. +473 −0 src/providers/oracle/qgsoracledataitems.cpp
  81. +117 −0 src/providers/oracle/qgsoracledataitems.h
  82. +162 −0 src/providers/oracle/qgsoraclenewconnection.cpp
  83. +43 −0 src/providers/oracle/qgsoraclenewconnection.h
  84. +3,159 −0 src/providers/oracle/qgsoracleprovider.cpp
  85. +427 −0 src/providers/oracle/qgsoracleprovider.h
  86. +655 −0 src/providers/oracle/qgsoraclesourceselect.cpp
  87. +167 −0 src/providers/oracle/qgsoraclesourceselect.h
  88. +339 −0 src/providers/oracle/qgsoracletablemodel.cpp
  89. +69 −0 src/providers/oracle/qgsoracletablemodel.h
  90. +1 −1 src/providers/postgres/qgspgnewconnection.cpp
  91. +3 −3 src/providers/postgres/qgspostgresconn.cpp
  92. +6 −7 src/providers/postgres/qgspostgresprovider.cpp
  93. +0 −1 src/providers/wms/qgswmsprovider.cpp
  94. +31 −1 src/ui/qgisapp.ui
  95. +265 −0 src/ui/qgsoraclenewconnectionbase.ui
  96. +7 −44 tests/src/core/testqgsgeometry.cpp
  97. +5 −1 tests/src/python/test_qgscomposermap.py
@@ -70,6 +70,11 @@ IF (WITH_SPATIALITE)
ENDIF (WITH_INTERNAL_SPATIALITE)
ENDIF (WITH_SPATIALITE)

SET (WITH_ORACLE FALSE CACHE BOOL "Determines whether Oracle support should be built")
IF(WITH_ORACLE)
SET(HAVE_ORACLE TRUE)
ENDIF(WITH_ORACLE)

# try to configure and build python bindings by default
SET (WITH_BINDINGS TRUE CACHE BOOL "Determines whether python bindings should be built")
IF (WITH_BINDINGS)
@@ -17,10 +17,10 @@ FIND_PATH(QWT_INCLUDE_DIR NAMES qwt.h PATHS
/usr/local/include
"$ENV{LIB_DIR}/include"
"$ENV{INCLUDE}"
PATH_SUFFIXES qwt-qt4 qwt qwt5
PATH_SUFFIXES qwt-qt4 qwt qwt5 qwt6
)

FIND_LIBRARY(QWT_LIBRARY NAMES qwt qwt5 qwt-qt4 qwt5-qt4 PATHS
FIND_LIBRARY(QWT_LIBRARY NAMES qwt qwt5 qwt6 qwt-qt4 qwt5-qt4 PATHS
/usr/lib
/usr/local/lib
"$ENV{LIB_DIR}/lib"
@@ -38,6 +38,8 @@

#cmakedefine HAVE_MSSQL

#cmakedefine HAVE_ORACLE

#cmakedefine HAVE_PYTHON

#cmakedefine HAVE_TOUCH
@@ -0,0 +1,232 @@
Source: qgis
Section: science
Priority: extra
Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
Build-Depends:
bison,
cmake (>= 2.6),
debhelper (>= 9),
flex,
grass-dev,
libexpat1-dev,
libfcgi-dev,
libgdal1-dev,
libgeos-dev (>= 3.0.0),
libgsl0-dev,
libpq-dev,
libproj-dev,
libqt4-dev (>=4.4.0),
libqt4-opengl-dev,
libqtwebkit-dev,
libqwt-dev,
libspatialite-dev,
libsqlite3-dev,
libspatialindex-dev,
pkg-config,
pyqt4-dev-tools,
python,
python-dev (>= 2.6.6-3~),
python-qt4 (>=4.1.0),
python-qt4-dev (>=4.1.0),
python-sip (>= 4.5.0),
python-sip-dev (>= 4.5.0),
libosgearth-dev,
libopenscenegraph-dev,
git,
doxygen,
graphviz,
txt2tags,
xvfb, xauth, xfonts-base,
oracle-instantclient11.2-devel
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.9.3
X-Python-Version: current
Homepage: http://qgis.org/

Package: qgis
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
Recommends: qgis-plugin-globe, 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: ${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.
.
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-dev
Architecture: any
Section: libdevel
Depends:
grass-dev,
libexpat1-dev,
libgdal1-dev,
libgeos-dev (>= 3.0.0),
libgsl0-dev,
libpq-dev,
libproj-dev,
libqgis{QGIS_ABI} (= ${binary:Version}),
libqt4-dev (>=4.4.0),
libsqlite3-dev,
python-qt4 (>=4.1.0),
python-qt4-dev (>=4.1.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
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}, grass{GRASS_ABI}
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: python, ${misc:Depends}
Replaces: qgis-common (<< 1.5)
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
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-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-pyspatialite, python-psycopg2, python-qscintilla2, ${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.
.
This package contains the files for the Python support.

Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal, libjs-jquery, libjs-underscore, ${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.
.
This package contains architecture-independent files for the Quantum GIS
Python bindings.

Package: qgis-providers
Architecture: any
Depends: qgis-providers-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
Replaces: qgis (<= 1.6)
Breaks: qgis (<= 1.6)
Description: collection of data providers to Quantum GIS
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
.
This package contains the provider plugins for Quantum GIS.

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.
.
This package contains architecture-independent files for the Quantum GIS
providers.

Package: qgis-mapserver
Architecture: any
Depends: qgis-providers (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: Quantum GIS mapserver
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
.
This package contains the Quantum GIS mapserver.

Package: qgis-sqlanywhere
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: qgis-sqlanywhere1.7.0, qgis-sqlanywhere1.7.1, qgis-sqlanywhere1.8.0
Description: Quantum GIS sql anywhere plugin and provider
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
.
This package contains the Quantum GIS sqlanywhere plugin and provider.

Package: qgis-api-doc
Architecture: all
Section: doc
Depends: libjs-jquery
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
.
This package contains the Quantum GIS API documentation.

Package: qgis-plugin-globe
Architecture: any
Depends: qgis (= ${binary:Version}), qgis-plugin-globe-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: OSG globe plugin for Quantum GIS
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
.
This plugin enables 3D viewing using OSG globe in the Quantum GIS.

Package: qgis-plugin-globe-common
Architecture: all
Description: OSG GLOBE 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 GLOBE plugin.

Package: qgis-oracle-provider
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Section: contrib/databases
Description: Quantum GIS oracle provider
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
.
This package contains the Quantum GIS oracle provider.

@@ -0,0 +1,2 @@
usr/lib/qgis/plugins/liboracleprovider.so
usr/lib/{DEB_BUILD_GNU_TYPE}/qt4/plugins/sqldrivers/libqsqlocispatial.so
@@ -16,7 +16,7 @@ ifeq (,$(DISTRIBUTION))
DISTRIBUTION := $(shell dpkg-parsechangelog --format rfc822 | sed -ne "s/^Distribution: //p")
endif

ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"squeeze wheezy lucid maverick natty oneiric precise"))
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"squeeze wheezy lucid maverick natty oneiric precise sid-oracle"))
DISTRIBUTION := sid
endif

@@ -71,6 +71,10 @@ else
CMAKE_OPTS += -D WITH_GLOBE=TRUE
endif

ifneq (,$(findstring -oracle,$(DISTRIBUTION)))
CMAKE_OPTS += -D WITH_ORACLE=TRUE
endif

ifneq (,$(findstring $(DISTRIBUTION),"wheezy sid"))
CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
@@ -107,6 +111,7 @@ endif
define gentemplate
$(2): $(1)
sed \
-e "s/{DEB_BUILD_GNU_TYPE}/$(DEB_BUILD_GNU_TYPE)/g" \
-e "s/{QGIS_ABI}/$(QGIS_ABI)/g" \
-e "s/{GRASS}/$(GRASS)/g" \
-e "s/{GRASS_ABI}/$(GRASS_ABI)/g" $$^ >$$@

0 comments on commit 13bfb5e

Please sign in to comment.