Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into expression-labels
Browse files Browse the repository at this point in the history 
Conflicts:
	src/core/qgsexpression.cpp
	src/gui/CMakeLists.txt
  • Loading branch information
@NathanW2
NathanW2 committed Oct 17, 2011
2 parents fc80b60 + 139e297 commit 9d3079b
Show file tree
Hide file tree
Showing 335 changed files with 38,188 additions and 24,411 deletions.
5 changes: 1 addition & 4 deletions BUGS
View file
Expand Up @@ -3,7 +3,7 @@ Help I think I found a bug!

If you find a bug in QGIS, you can report it using the QGIS ticket/bug database at:

http://trac.osgeo.org/qgis/report
http://hub.qgis.org/projects/quantum-gis/issues/new


Some hints about when you should file a bug:
Expand All @@ -25,6 +25,3 @@ Some hints about when you should file a bug:
do. While we appreciate it's inconvenient if some issue prevents you doing
your work, we need to take the big picture view of things and focus on
things that affect the largest proportion of our user base.


$Id$
2,123 changes: 2,123 additions & 0 deletions CHANGELOG
View file

Large diffs are not rendered by default.

14 changes: 11 additions & 3 deletions CMakeLists.txt
View file
Expand Up @@ -51,7 +51,9 @@ IF (WITH_POSTGRESQL)
SET (POSTGRESQL_PREFIX "" CACHE PATH "Path to POSTGRESQL base directory")
ENDIF (WITH_POSTGRESQL)

SET (WITH_INTERNAL_QWTPOLAR TRUE CACHE BOOL "Use internal built of QwtPolar")
SET (WITH_INTERNAL_QWTPOLAR TRUE CACHE BOOL "Use internal build of QwtPolar")

SET (WITH_INTERNAL_SPATIALINDEX TRUE CACHE BOOL "Use internal build of Spatialindex")

SET (WITH_SPATIALITE TRUE CACHE BOOL "Determines whether SPATIALITE support should be built")

Expand Down Expand Up @@ -136,6 +138,11 @@ FIND_PACKAGE(Expat) # GPS importer plugin
FIND_PACKAGE(GSL) # Georeferencer
FIND_PACKAGE(GEOS)
FIND_PACKAGE(GDAL)

IF (NOT WITH_INTERNAL_SPATIALINDEX)
FIND_PACKAGE(Spatialindex REQUIRED)
ENDIF(NOT WITH_INTERNAL_SPATIALINDEX)

FIND_PACKAGE(Qwt REQUIRED)
IF (NOT WITH_INTERNAL_QWTPOLAR)
FIND_PACKAGE(QwtPolar REQUIRED)
Expand Down Expand Up @@ -219,9 +226,10 @@ IF (PEDANTIC)
ADD_DEFINITIONS( /wd4610 ) # user defined constructor required (sqlite3_index_info)
ADD_DEFINITIONS( /wd4706 ) # assignment within conditional expression (pal)
ELSE (MSVC)
ADD_DEFINITIONS( -Wall -Wextra -Wredundant-decls -Wno-long-long -Wformat-security -Wno-strict-aliasing )
ADD_DEFINITIONS( -Wall -Wextra -Wno-long-long -Wformat-security -Wno-strict-aliasing )
# Qt produces lots of warnings with strict aliasing (as of Qt 4.4.0 & GCC 4.3)
# ADD_DEFINITIONS( -fstrict-aliasing -Wstrict-aliasing=1 )
# There are redundant declarations in Qt and GDAL
# ADD_DEFINITIONS( -fstrict-aliasing -Wstrict-aliasing=1 -Wredundant-decls )
ENDIF (MSVC)
ENDIF (PEDANTIC)

Expand Down
4 changes: 2 additions & 2 deletions COPYING
View file
Expand Up @@ -2,7 +2,7 @@
Version 2, June 1991

Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.

Expand Down Expand Up @@ -318,7 +318,7 @@ the "copyright" line and a pointer to where the full notice is found.

You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA


Also add information on how to contact you by electronic and paper mail.
Expand Down
1,612 changes: 0 additions & 1,612 deletions ChangeLog
View file

This file was deleted.

1 change: 1 addition & 0 deletions Doxyfile
View file
Expand Up @@ -603,6 +603,7 @@ INPUT = doc \
src/analysis/interpolation \
src/analysis/raster \
src/analysis/vector \
src/analysis/network \
src/plugins

# This tag can be used to specify the character encoding of the source files
Expand Down
4 changes: 2 additions & 2 deletions README
View file
Expand Up @@ -46,7 +46,7 @@ installation document in qgis/doc/index.html. The installation document is
also available as PDF in the same directory.

HELP US -- Please submit bug reports using the QGIS bug tracker at:
http://trac.osgeo.org/qgis/
http://hub.qgis.org/
When reporting a bug, either login or, if you don't
have a qgis trac, provide an email address where we can
request additional information.
Expand All @@ -60,7 +60,7 @@ SUPPORT - You can get support in the following ways:
folks on the channel are doing other things and it may take a
while for them to notice your question.

QGIS is on GitHub at http://github.com/qgis/qgis. If you wish to contribute
QGIS is on GitHub at http://github.com/qgis/Quantum-GIS. If you wish to contribute
patches you can fork the project, make your changes, commit to your
repository, and then issue a pull request. The development team can then
review your contribution and commit it upstream as appropriate. See
Expand Down
43 changes: 43 additions & 0 deletions cmake/FindSpatialindex.cmake
View file
@@ -0,0 +1,43 @@
# Find Spatialindex
# ~~~~~~~~
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
# Once run this will define:
#
# SPATIALINDEX_FOUND = system has Spatialindex lib
# SPATIALINDEX_LIBRARY = full path to the Spatialindex library
# SPATIALINDEX_INCLUDE_DIR = where to find headers
#


FIND_PATH(SPATIALINDEX_INCLUDE_DIR NAMES SpatialIndex.h PATHS
/usr/include
/usr/local/include
"$ENV{LIB_DIR}/include"
"$ENV{INCLUDE}"
"$ENV{OSGEO4W_ROOT}/include"
PATH_SUFFIXES spatialindex
)

FIND_LIBRARY(SPATIALINDEX_LIBRARY NAMES spatialindex_i spatialindex PATHS
/usr/lib
/usr/local/lib
"$ENV{LIB_DIR}/lib"
"$ENV{LIB}/lib"
"$ENV{OSGEO4W_ROOT}/lib"
)

IF (SPATIALINDEX_INCLUDE_DIR AND SPATIALINDEX_LIBRARY)
SET(SPATIALINDEX_FOUND TRUE)
ENDIF (SPATIALINDEX_INCLUDE_DIR AND SPATIALINDEX_LIBRARY)

IF (SPATIALINDEX_FOUND)
IF (NOT SPATIALINDEX_FIND_QUIETLY)
MESSAGE(STATUS "Found Spatialindex: ${SPATIALINDEX_LIBRARY}")
ENDIF (NOT SPATIALINDEX_FIND_QUIETLY)
ELSE (SPATIALINDEX_FOUND)
IF (SPATIALINDEX_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find Spatialindex")
ENDIF (SPATIALINDEX_FIND_REQUIRED)
ENDIF (SPATIALINDEX_FOUND)
10 changes: 8 additions & 2 deletions debian/changelog
View file
Expand Up @@ -5,8 +5,14 @@ qgis (1.8.0) UNRELEASED; urgency=low
* add zonal statistics plugins and globe plugin
* migrate unstable package to dh_python2
* add ubuntu oneiric

-- Jürgen E. Fischer <jef@norbit.de> Tue, 23 Aug 2011 22:25:08 +0200
* include internal pyspatialite in python-qgis
* update watch
* drop abi postfix from sqlanywhere plugin
* include network analysis library
* build package with libspatialindex where available
* drop wfsplugin

-- Jürgen E. Fischer <jef@norbit.de> Sat, 08 Oct 2011 20:03:51 +0000

qgis (1.7.0) UNRELEASED; urgency=low

Expand Down
3 changes: 2 additions & 1 deletion debian/control.lenny
View file
Expand Up @@ -175,9 +175,10 @@ Description: Quantum GIS mapserver
.
This package contains the Quantum GIS mapserver.

Package: qgis-sqlanywhere{QGIS_ABI}
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.
Expand Down
4 changes: 3 additions & 1 deletion debian/control.lucid
View file
Expand Up @@ -18,6 +18,7 @@ Build-Depends:
libqt4-dev (>=4.4.0),
libqwt5-qt4-dev,
libspatialite-dev,
libspatialindex-dev,
libsqlite3-dev,
pkg-config,
pyqt4-dev-tools,
Expand Down Expand Up @@ -176,9 +177,10 @@ Description: Quantum GIS mapserver
.
This package contains the Quantum GIS mapserver.

Package: qgis-sqlanywhere{QGIS_ABI}
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.
Expand Down
4 changes: 3 additions & 1 deletion debian/control.maverick
View file
Expand Up @@ -19,6 +19,7 @@ Build-Depends:
libqtwebkit-dev,
libqwt5-qt4-dev,
libspatialite-dev,
libspatialindex-dev,
libsqlite3-dev,
pkg-config,
pyqt4-dev-tools,
Expand Down Expand Up @@ -177,9 +178,10 @@ Description: Quantum GIS mapserver
.
This package contains the Quantum GIS mapserver.

Package: qgis-sqlanywhere{QGIS_ABI}
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.
Expand Down
4 changes: 3 additions & 1 deletion debian/control.natty
View file
Expand Up @@ -19,6 +19,7 @@ Build-Depends:
libqtwebkit-dev,
libqwt5-qt4-dev,
libspatialite-dev,
libspatialindex-dev,
libsqlite3-dev,
pkg-config,
pyqt4-dev-tools,
Expand Down Expand Up @@ -177,9 +178,10 @@ Description: Quantum GIS mapserver
.
This package contains the Quantum GIS mapserver.

Package: qgis-sqlanywhere{QGIS_ABI}
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.
Expand Down
4 changes: 3 additions & 1 deletion debian/control.oneiric
View file
Expand Up @@ -19,6 +19,7 @@ Build-Depends:
libqtwebkit-dev,
libqwt5-qt4-dev,
libspatialite-dev,
libspatialindex-dev,
libsqlite3-dev,
pkg-config,
pyqt4-dev-tools,
Expand Down Expand Up @@ -177,9 +178,10 @@ Description: Quantum GIS mapserver
.
This package contains the Quantum GIS mapserver.

Package: qgis-sqlanywhere{QGIS_ABI}
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.
Expand Down
4 changes: 3 additions & 1 deletion debian/control.sid
View file
Expand Up @@ -21,6 +21,7 @@ Build-Depends:
libqwt-dev,
libspatialite-dev,
libsqlite3-dev,
libspatialindex-dev,
pkg-config,
pyqt4-dev-tools,
python,
Expand Down Expand Up @@ -177,9 +178,10 @@ Description: Quantum GIS mapserver
.
This package contains the Quantum GIS mapserver.

Package: qgis-sqlanywhere{QGIS_ABI}
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.
Expand Down
4 changes: 3 additions & 1 deletion debian/control.squeeze
View file
Expand Up @@ -19,6 +19,7 @@ Build-Depends:
libqwt5-qt4-dev,
libspatialite-dev,
libsqlite3-dev,
libspatialindex-dev,
pkg-config,
pyqt4-dev-tools,
python,
Expand Down Expand Up @@ -176,9 +177,10 @@ Description: Quantum GIS mapserver
.
This package contains the Quantum GIS mapserver.

Package: qgis-sqlanywhere{QGIS_ABI}
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.
Expand Down
1 change: 1 addition & 0 deletions debian/libqgis{QGIS_ABI}.install
View file
@@ -1,3 +1,4 @@
usr/lib/libqgis_core.so.{QGIS_ABI}
usr/lib/libqgis_gui.so.{QGIS_ABI}
usr/lib/libqgis_analysis.so.{QGIS_ABI}
usr/lib/libqgis_networkanalysis.so.{QGIS_ABI}
2 changes: 2 additions & 0 deletions debian/python-qgis.install.in
View file
@@ -1,3 +1,5 @@
usr/lib/python*/*-packages/qgis/*.py
usr/lib/python*/*-packages/qgis/*.so
usr/lib/python*/*-packages/pyspatialite/*.py
usr/lib/python*/*-packages/pyspatialite/*.so
usr/lib/libqgispython.so.{QGIS_ABI}
2 changes: 1 addition & 1 deletion debian/qgis-common.install
View file
@@ -1,7 +1,7 @@
usr/share/qgis/doc/CODING
usr/share/qgis/doc/favicon.ico
usr/share/qgis/doc/index.html
usr/share/qgis/doc/qgisdoc.css
usr/share/qgis/doc/style.css
usr/share/qgis/doc/AUTHORS
usr/share/qgis/doc/SPONSORS
usr/share/qgis/doc/CONTRIBUTORS
Expand Down
0 debian/qgis-sqlanywhere{QGIS_ABI}.install → debian/qgis-sqlanywhere.install.in
View file
File renamed without changes.
2 changes: 2 additions & 0 deletions debian/qgis-sqlanywhere.lintian-overrides
View file
@@ -0,0 +1,2 @@
qgis-sqlanywhere: package-name-doesnt-match-sonames
qgis-sqlanywhere: no-symbols-control-file
2 changes: 0 additions & 2 deletions debian/qgis-sqlanywhere{QGIS_ABI}.lintian-overrides
View file

This file was deleted.

1 change: 0 additions & 1 deletion debian/qgis.install
View file
Expand Up @@ -2,7 +2,6 @@ usr/lib/qgis/plugins/libdelimitedtextplugin.so
usr/lib/qgis/plugins/libgeorefplugin.so
usr/lib/qgis/plugins/libgpsimporterplugin.so
usr/lib/qgis/plugins/libspitplugin.so
usr/lib/qgis/plugins/libwfsplugin.so
usr/lib/qgis/plugins/libdxf2shpconverterplugin.so
usr/lib/qgis/plugins/libinterpolationplugin.so
usr/lib/qgis/plugins/libcoordinatecaptureplugin.so
Expand Down
6 changes: 5 additions & 1 deletion debian/rules
View file
Expand Up @@ -46,6 +46,10 @@ ifneq (,$(findstring $(DISTRIBUTION),"sid"))
CMAKE_OPTS += -D WITH_GLOBE=TRUE
endif

ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric sid"))
CMAKE_OPTS += -D WITH_INTERNAL_SPATIALINDEX=FALSE
endif

ifneq (,$(findstring $(DISTRIBUTION),"hardy intrepid"))
LDFLAGS += -Wl,--as-needed -Wl,--no-undefined
endif
Expand Down Expand Up @@ -147,7 +151,7 @@ binary-indep: build install
binary-arch: build install
dh_testdir
dh_testroot
dh_installchangelogs ChangeLog
dh_installchangelogs CHANGELOG
dh_installdocs
dh_installexamples
dh_install --sourcedir=debian/tmp
Expand Down
2 changes: 1 addition & 1 deletion debian/watch
View file
@@ -1,2 +1,2 @@
version=3
http://download.osgeo.org/qgis/src/qgis_(.*).tar.gz
http://qgis.org/downloads/qgis-(.*).tar.bz2
6 changes: 3 additions & 3 deletions doc/CMakeLists.txt
View file
Expand Up @@ -8,9 +8,9 @@ INCLUDE(Txt2Tags)
FIND_TXT2TAGS()

IF(TXT2TAGS_EXECUTABLE)
ADD_TXT2TAGS_FILES(QGIS_DOC_FILES INSTALL.t2t CODING.t2t)
ADD_TXT2TAGS_FILES(QGIS_DOC_FILES INSTALL.t2t CODING.t2t changelog.t2t)
IF(WITH_TXT2TAGS_PDF)
ADD_TXT2TAGS_PDFS(QGIS_DOC_FILES INSTALL.t2t CODING.t2t)
ADD_TXT2TAGS_PDFS(QGIS_DOC_FILES INSTALL.t2t CODING.t2t changelog.t2t)
ENDIF(WITH_TXT2TAGS_PDF)
ADD_CUSTOM_TARGET (t2tdoc ALL DEPENDS ${QGIS_DOC_FILES})
ELSE(TXT2TAGS_EXECUTABLE)
Expand All @@ -20,7 +20,7 @@ ELSE(TXT2TAGS_EXECUTABLE)
)
ENDIF(TXT2TAGS_EXECUTABLE)

SET(QGIS_DOC_FILES ${QGIS_DOC_FILES} index.html favicon.ico qgisdoc.css AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS)
SET(QGIS_DOC_FILES ${QGIS_DOC_FILES} index.html changelog.html favicon.ico style.css AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS)

INSTALL(FILES ${QGIS_DOC_FILES} DESTINATION ${QGIS_DATA_DIR}/doc)
INSTALL(FILES images/qgis_new_80pct.png DESTINATION ${QGIS_DATA_DIR}/doc/images)
Expand Down
2 changes: 1 addition & 1 deletion doc/INSTALL.t2t
View file
Expand Up @@ -33,7 +33,7 @@ Building QGIS from source - step by step
%! PostProc(tex): '\\section' '\\newpage\\section'
%! PostProc(tex): 'section{' 'section{\\color{qgis-green}'
%! PostProc(tex): NEWPAGE '\\newpage'
% Give alternating table rows different colours and use a smaller font in tables (\tiny)
% Give alternating table rows different colors and use a smaller font in tables (\tiny)
%! PostProc(tex): '\\begin{tabular}' '\\rowcolors{2}{tableShade}{white} \n\\tiny\\begin{tabular}'
%! encoding: iso-8859-1

Expand Down
3 changes: 3 additions & 0 deletions doc/SPONSORS
View file
Expand Up @@ -15,6 +15,9 @@
Please consider sponsoring the development of QuantumGIS.
See: http://qgis.org/en/sponsorship.html

SILVER
Kanton Solothurn, Switzerland (4.2011)|http://www.agi.so.ch/

BRONZE
Studio Associato Gfosservices|http://www.gfosservices.com
NEXTGIS|http://nextgis.org
2 changes: 1 addition & 1 deletion doc/TRANSLATORS
View file
Expand Up @@ -17,7 +17,7 @@ Chinese Traditional|Nungyao Lin
Croatian|Zoran Jankovic
Czech|Martin Landa, Peter Antolik, Martin Dzurov, Jan Helebrant
Danish|Henriette Roued
Dutch|Richard Duivenvoorde, Raymond Nijssen
Dutch|Richard Duivenvoorde, Raymond Nijssen, Carlo van Rijswijk
French|Eve Rousseau, Marc Monnerat, Lionel Roubeyrie, Jean Roc Morreale, Benjamin Bohard, Jeremy Garniaux, Yves Jacolin, Benjamin Lerre, Stéphane Morel, Marie Silvestre, Tahir Tamba, Xavier M, Mayeul Kauffmann, Mehdi Semchaoui
Georgian|Shota Murtskhvaladze, George Machitidze
German|Jürgen E. Fischer, Stephan Holl, Otto Dassau, Werner Macho
Expand Down

0 comments on commit 9d3079b

Please sign in to comment.