Skip to content
Permalink
Browse files
Merge branch 'master' of https://github.com/qgis/QGIS
  • Loading branch information
pcav committed Jun 4, 2015
2 parents 8cdd617 + 12134a0 commit 1969c716e67ed6ae512f4c15cabdd2aaa33d1918
Showing 389 changed files with 10,058 additions and 4,261 deletions.
@@ -41,7 +41,7 @@ install:
- cd build
- cmake -DWITH_SERVER=ON -DWITH_STAGED_PLUGINS=OFF -DWITH_GRASS=OFF
-DSUPPRESS_QT_WARNINGS=ON -DENABLE_MODELTEST=ON -DENABLE_PGTEST=ON
-DWITH_QWTPOLAR=OFF -DWITH_APIDOC=ON ..
-DWITH_QWTPOLAR=OFF -DWITH_APIDOC=ON -DWITH_PYSPATIALITE=ON ..

before_script:
- printf "[qgis_test]\nhost=localhost\ndbname=qgis_test\nuser=postgres" > ~/.pg_service.conf
@@ -214,6 +214,16 @@ ENDIF (WITH_POSTGRESQL)

FIND_PACKAGE(SPATIALITE REQUIRED)

IF(SPATIALITE_VERSION_GE_4_0_0)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSPATIALITE_VERSION_GE_4_0_0")
ENDIF(SPATIALITE_VERSION_GE_4_0_0)
IF(SPATIALITE_VERSION_G_4_1_1)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSPATIALITE_VERSION_G_4_1_1")
ENDIF(SPATIALITE_VERSION_G_4_1_1)
IF(SPATIALITE_HAS_INIT_EX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSPATIALITE_HAS_INIT_EX")
ENDIF(SPATIALITE_HAS_INIT_EX)

IF (NOT PROJ_FOUND OR NOT GEOS_FOUND OR NOT GDAL_FOUND)
MESSAGE (SEND_ERROR "Some dependencies were not found!")
ENDIF (NOT PROJ_FOUND OR NOT GEOS_FOUND OR NOT GDAL_FOUND)
@@ -32,9 +32,11 @@ MACRO (CHECK_GRASS G_PREFIX)
IF(GRASS_MAJOR_VERSION${GRASS_FIND_VERSION} LESS 7 )
LIST(APPEND GRASS_LIB_NAMES${GRASS_FIND_VERSION} vect)
LIST(APPEND GRASS_LIB_NAMES${GRASS_FIND_VERSION} form)
LIST(APPEND GRASS_LIB_NAMES${GRASS_FIND_VERSION} I)
ELSE(GRASS_MAJOR_VERSION${GRASS_FIND_VERSION} LESS 7 )
LIST(APPEND GRASS_LIB_NAMES${GRASS_FIND_VERSION} vector)
LIST(APPEND GRASS_LIB_NAMES${GRASS_FIND_VERSION} raster)
LIST(APPEND GRASS_LIB_NAMES${GRASS_FIND_VERSION} imagery)
ENDIF(GRASS_MAJOR_VERSION${GRASS_FIND_VERSION} LESS 7 )

FOREACH(LIB ${GRASS_LIB_NAMES${GRASS_FIND_VERSION}})
@@ -70,6 +70,7 @@ IF (SPATIALITE_FOUND)
ENDIF(APPLE)
check_library_exists("${SPATIALITE_LIBRARY}" gaiaDropTable "" SPATIALITE_VERSION_GE_4_0_0)
check_library_exists("${SPATIALITE_LIBRARY}" gaiaStatisticsInvalidate "" SPATIALITE_VERSION_G_4_1_1)
check_library_exists("${SPATIALITE_LIBRARY}" spatialite_init_ex "" SPATIALITE_HAS_INIT_EX)

ELSE (SPATIALITE_FOUND)

@@ -576,6 +576,7 @@ INPUT = @CMAKE_SOURCE_DIR@/doc \
@CMAKE_SOURCE_DIR@/src/core/diagram \
@CMAKE_SOURCE_DIR@/src/core/dxf \
@CMAKE_SOURCE_DIR@/src/core/effects \
@CMAKE_SOURCE_DIR@/src/core/geometry \
@CMAKE_SOURCE_DIR@/src/core/gps \
@CMAKE_SOURCE_DIR@/src/core/layertree \
@CMAKE_SOURCE_DIR@/src/core/pal \
@@ -1404,7 +1405,7 @@ SKIP_FUNCTION_MACROS = YES
# If a tag file is not located in the directory in which doxygen
# is run, you must also specify the path to the tagfile here.

TAGFILES =
TAGFILES = @DOXYGEN_TAGS@

# When a file name is specified after GENERATE_TAGFILE, doxygen will create
# a tag file that is based on the input files it reads.
@@ -3,8 +3,11 @@ qgis (2.9.0) UNRELEASED; urgency=medium
* New development version 2.9 after branch of 2.8
* include dependency to liblwgeom
* 'stretch' package a bit
* merge downstream addition of debug package
* make build directory configurable
* include links to qt4 documentation in api docs

-- Jürgen E. Fischer <jef@norbit.de> Fri, 22 May 2015 08:34:55 +0200
-- Jürgen E. Fischer <jef@norbit.de> Tue, 02 Jun 2015 22:54:19 +0200

qgis (2.8.0) unstable; urgency=medium

@@ -50,7 +50,7 @@ Build-Depends:
xvfb, xauth,
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
#sid-oracle# oracle-instantclient11.2-devel,
spawn-fcgi, lighttpd, poppler-utils, locales
spawn-fcgi, lighttpd, poppler-utils, locales, qt4-doc-html
Build-Conflicts: libqgis-dev, qgis-dev
#sid stretch jessie sid-oracle vivid#Standards-Version: 3.9.6
#wheezy#Standards-Version: 3.9.3
@@ -244,6 +244,26 @@ Description: QGIS - development files
This package contains the headers and libraries needed to develop plugins for
QGIS.

Package: qgis-dbg
Architecture: any
Section: debug
Priority: extra
Depends:
libqgis-core{QGIS_ABI} (= ${binary:Version}),
libqgis-gui{QGIS_ABI} (= ${binary:Version}),
libqgis-analysis{QGIS_ABI} (= ${binary:Version}),
libqgis-networkanalysis{QGIS_ABI} (= ${binary:Version}),
libqgis-server{QGIS_ABI} (= ${binary:Version}),
libqgisgrass{QGIS_ABI} (= ${binary:Version}),
libqgispython{QGIS_ABI} (= ${binary:Version}),
${misc:Depends}
Suggests: gdb
Description: QGIS - debugging symbols
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This package contains debugging symbols.

Package: qgis-plugin-grass
Architecture: any
Depends:
@@ -397,6 +417,8 @@ Section: doc
Depends:
libjs-jquery,
${misc:Depends}
Recommends:
qt4-doc-html
Description: QGIS API documentation
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
@@ -16,6 +16,7 @@ DEB_BUILD_MULTIARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
QT_PLUGIN_DIR = usr/lib/$(DEB_BUILD_MULTIARCH)/qt4/plugins

DEB_TEST_TARGET ?= Experimental
BUILDDIR ?= debian/build

QGIS_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')

@@ -64,7 +65,9 @@ CMAKE_OPTS := \
-DWITH_INTERNAL_PYGMENTS=FALSE \
-DWITH_INTERNAL_DATEUTIL=FALSE \
-DWITH_INTERNAL_PYTZ=FALSE \
-DWITH_INTERNAL_SIX=FALSE
-DWITH_INTERNAL_SIX=FALSE \
-DQT_TAG_FILE=/usr/share/qt4/doc/html/qt.tags \
-DQT_DOC_URL=/usr/share/qt4/doc/html/

ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -155,7 +158,7 @@ cleantemplates:
$(MAKE) -f debian/rules debian/control debian/compat

binary binary-arch binary-indep build build-arch build-indep clean install install-arch install-indep:
dh $@ --with python2 --parallel --builddirectory=debian/build
dh $@ --with python2 --parallel --builddirectory=$(BUILDDIR)

override_dh_clean: cleantemplates
dh_clean
@@ -164,7 +167,7 @@ override_dh_clean: cleantemplates
-$(RM) $(CURDIR)/src/core/qgscontexthelp_texts.cpp
-$(RM) $(CURDIR)/src/core/qgsexpression_texts.cpp

-$(RM) -r $(CURDIR)/debian/build/
-$(RM) -r $(CURDIR)/$(BUILDDIR)/

override_dh_auto_configure: templates
dh_auto_configure -- $(CMAKE_OPTS)
@@ -176,9 +179,9 @@ override_dh_auto_test:
localedef -f UTF-8 -i en_US ./debian/tmp/locale/en_US.UTF-8/
-LOCPATH=$(CURDIR)/debian/tmp/locale/ \
LC_ALL=en_US.UTF-8 \
LD_LIBRARY_PATH=$(CURDIR)/debian/build/output/lib:$(LD_LIBRARY_PATH) \
LD_LIBRARY_PATH=$(CURDIR)/$(BUILDDIR)/output/lib:$(LD_LIBRARY_PATH) \
PATH=/usr/sbin:$(PATH) \
$(TESTMAKE) -C debian/build $(DEB_TEST_TARGET)
$(TESTMAKE) -C $(BUILDDIR) $(DEB_TEST_TARGET)
else
override_dh_auto_test:
@echo Skipping tests.
@@ -274,3 +277,7 @@ override_dh_makeshlibs:

override_dh_shlibdeps:
dh_shlibdeps -l/usr/lib/$(GRASS)/lib

override_dh_strip:
dh_strip --dbg-package=qgis-dbg

@@ -4,6 +4,9 @@ SET (WITH_APIDOC FALSE CACHE BOOL "Determines whether the QGIS API doxygen docum
# include doxygen documentation
SET (WITH_TXT2TAGS_PDF FALSE CACHE BOOL "Determines whether PDF should be generate for the txt2tags documentation")

# include Qt documentation
SET (QT_DOC_URL "http://doc.qt.io/qt-4.8/" CACHE STRING "URL for Qt docs")

INCLUDE(Txt2Tags)
FIND_TXT2TAGS()

@@ -28,6 +31,16 @@ INSTALL(FILES ../images/icons/qgis-icon-60x60.png DESTINATION ${QGIS_DATA_DIR}/d
IF(WITH_APIDOC)
FIND_PACKAGE(Doxygen)
IF(DOXYGEN_FOUND)

FIND_FILE(QT_TAG_FILE
NAMES qt4.tags qt4.tag qt.tags qt.tag
PATHS "${QT_DOC_DIR}"
DOC "Path to Qt documentation tag file (eg qt.tags)"
)
IF(QT_TAG_FILE)
SET(DOXYGEN_TAGS ${QT_TAG_FILE}=${QT_DOC_URL})
ENDIF(QT_TAG_FILE)

CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake_templates/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
ADD_CUSTOM_TARGET(apidoc ALL
COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
@@ -294,13 +294,13 @@
"Committer": "Yes",
"First Commit Message": "Add backbuffering option to resolve flickering on X11 systems",
"First Commit Date": "07-08-2012",
"GIT Nickname": "matthias-kuhn"
"GIT Nickname": "m-kuhn"
},
"geometry": {
"type": "Point",
"coordinates": [
8.740423321723938,
47.4989812888759
7.6256,
46.7542
]
}
},
@@ -651,6 +651,40 @@
43.653226
]
}
},
{
"type": "Feature",
"properties": {
"Name": "Alessandro Pasotti",
"Committer": "Yes",
"First Commit Message": "Initial GetStyles implementation",
"First Commit Date": "06-01-2014",
"GIT Nickname": "elpaso"
},
"geometry": {
"type": "Point",
"coordinates": [
7.251318,
44.815437
]
}
},
{
"type": "Feature",
"properties": {
"Name": "Stéphane Brunner",
"Committer": "No",
"First Commit Message": "Typo in qgis_fr.ts",
"First Commit Date": "23-07-2013",
"GIT Nickname": "sbrunner"
},
"geometry": {
"type": "Point",
"coordinates": [
6.66946,
46.50825
]
}
}
]
}
@@ -1,11 +1,14 @@
<!DOCTYPE html>
<html>
<head>
<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7.2/leaflet.css" />
<title>Developers Map</title>
<meta charset="UTF-8">
<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.css" />
<style type="text/css">
body { padding: 0; margin: 0; }
html, body, #developers-map { height: 100%; }
</style>
<script src="http://cdn.leafletjs.com/leaflet-0.7.2/leaflet.js"></script>
<script src="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.js"></script>
<script src="http://code.jquery.com/jquery-2.1.0.min.js"></script>
<link rel="points" type="application/json" href="contributors.json">
</head>
@@ -27,7 +30,9 @@
var map = L.map('developers-map').fitBounds(geojson.getBounds());
developersMapTiles.addTo(map);
geojson.addTo(map);
map.setZoom(1);
setTimeout(function() {
map.setZoom(1);
}, 0);
});
</script>
</body>
@@ -20192,7 +20192,7 @@ Please try a lower resolution or a smaller papersize</source>
<translation>أعمدة متساوية العرض</translation>
</message>
<message>
<source>Allow to split layer items into multiple columns.</source>
<source>Allow splitting layer items into multiple columns.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -20225,7 +20225,7 @@ Pokušajte sa nižom rezolucijom ili manjom veličinom papira</translation>
<translation>Jednaka širina kolona</translation>
</message>
<message>
<source>Allow to split layer items into multiple columns.</source>
<source>Allow splitting layer items into multiple columns.</source>
<translation>Dozvoli dijeljenje stavki sloja u više kolona.</translation>
</message>
<message>
@@ -20144,7 +20144,7 @@ Please try a lower resolution or a smaller papersize</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Allow to split layer items into multiple columns.</source>
<source>Allow splitting layer items into multiple columns.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -20253,7 +20253,7 @@ Please try a lower resolution or a smaller papersize</source>
<translation>Stejné šířky sloupců</translation>
</message>
<message>
<source>Allow to split layer items into multiple columns.</source>
<source>Allow splitting layer items into multiple columns.</source>
<translation>Umožňuje rozdělit položky vrstvy do více sloupců.</translation>
</message>
<message>
@@ -20255,7 +20255,7 @@ Prøv en lavere opløsning eller en mindre papirstørrelse</translation>
<translation>Ens kolonnebredder</translation>
</message>
<message>
<source>Allow to split layer items into multiple columns.</source>
<source>Allow splitting layer items into multiple columns.</source>
<translation>Tillad at opdele lagelementer til flere kolonner.</translation>
</message>
<message>
@@ -20266,7 +20266,7 @@ Bitte versuchen Sie eine niedrigere Auflösung oder ein kleineres Papierformat</
<translation>Gleiche Spaltenbreite</translation>
</message>
<message>
<source>Allow to split layer items into multiple columns.</source>
<source>Allow splitting layer items into multiple columns.</source>
<translation>Aufteilung der Layerelemente in mehrere Spalten erlauben.</translation>
</message>
<message>
@@ -20113,7 +20113,7 @@ Please try a lower resolution or a smaller papersize</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Allow to split layer items into multiple columns.</source>
<source>Allow splitting layer items into multiple columns.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -20284,8 +20284,8 @@ Please try a lower resolution or a smaller papersize</translation>
<translation>Equal column widths</translation>
</message>
<message>
<source>Allow to split layer items into multiple columns.</source>
<translation>Allow to split layer items into multiple columns.</translation>
<source>Allow splitting layer items into multiple columns.</source>
<translation>Allow splitting layer items into multiple columns.</translation>
</message>
<message>
<source>Split layers</source>
@@ -20278,7 +20278,7 @@ Por favor, pruebe una resolución menor o un tamaño de papel más pequeño.</tr
<translation>Anchura de columnas igual</translation>
</message>
<message>
<source>Allow to split layer items into multiple columns.</source>
<source>Allow splitting layer items into multiple columns.</source>
<translation>Permitir dividir los elementos de las capas en múltiples columnas.</translation>
</message>
<message>
@@ -20170,7 +20170,7 @@ Please try a lower resolution or a smaller papersize</source>
<translation>Võrdsusta veeru laiused</translation>
</message>
<message>
<source>Allow to split layer items into multiple columns.</source>
<source>Allow splitting layer items into multiple columns.</source>
<translation>Luba kihi elemente mitmeks veeruks tükeldada</translation>
</message>
<message>
@@ -20253,7 +20253,7 @@ Saiatu bereizmen txikiagoarekin edo paper-tamaina txikiagoarekin</translation>
<translation>Zabalera bereko zutabeak</translation>
</message>
<message>
<source>Allow to split layer items into multiple columns.</source>
<source>Allow splitting layer items into multiple columns.</source>
<translation>Onartu geruza-elementuak zutabe anitzetan zatitzea.</translation>
</message>
<message>

0 comments on commit 1969c71

Please sign in to comment.