Skip to content

Commit 7473956

Browse files
author
wonder
committed
merge from trunk r11600:11650
git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11892 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent f289661 commit 7473956

File tree

76 files changed

+12834
-3396
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+12834
-3396
lines changed

‎CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
SET(CPACK_PACKAGE_VERSION_MAJOR "1")
2-
SET(CPACK_PACKAGE_VERSION_MINOR "3")
2+
SET(CPACK_PACKAGE_VERSION_MINOR "4")
33
SET(CPACK_PACKAGE_VERSION_PATCH "0")
44
SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
5-
SET(RELEASE_NAME "Unstable")
5+
SET(RELEASE_NAME "Trunk")
66
SET(PROJECT_VERSION ${COMPLETE_VERSION})
77
PROJECT(qgis${PROJECT_VERSION})
88
# Note the version no is Mmmpp for Major/minor/patch, 0-padded, thus '10100' for 1.1.0
9-
SET(QGIS_VERSION_INT 10300)
9+
SET(QGIS_VERSION_INT 10400)
1010

1111
# TODO:
1212
# - install includes for libs
@@ -395,7 +395,7 @@ ENDIF (ENABLE_TESTS)
395395
#############################################################
396396
# install stuff
397397

398-
INSTALL (FILES AUTHORS SPONSORS DONORS TRANSLATORS INSTALL CODING
398+
INSTALL (FILES AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS INSTALL CODING
399399
DESTINATION ${QGIS_DATA_DIR}/doc)
400400

401401
# manual page - makes sense only on unix systems

‎CONTRIBUTORS

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
The following people have submitted code, patches, graphics, comments,
2-
feedback, reviews and/or many other things that have aided the development of
3-
QGIS:
4-
1+
# This file will be used to populate the contributors tab in the about dialog
2+
# Lines prefixed with # will be ignored
3+
# The following people have submitted code, patches, graphics, comments,
4+
# feedback, reviews and/or many other things that have aided the development of
5+
# QGIS:
6+
#
57
Arthur Nanni
68
Baba Yoshihiko
79
Brent Wood
@@ -17,12 +19,10 @@ Hyao (IRC nickname)
1719
Ivan Lucena
1820
Jean-Denis Giguere
1921
Jerrit Collord
20-
Jürgen E. Fischer
2122
Magnus Homann
2223
Markus Neteler
2324
Maurizio Napolitano
2425
Paul Ramsey
25-
Peter Ersts
2626
Richard Kostecky
2727
Stefanie Tellex
2828
Tom Russo

‎DONORS

+3
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ Carl Nelson
2424
D R Arbib
2525
David Enns|http://www.mapitout.com/
2626
Ecotrust|http://www.ecotrust.org/
27+
Emanuele Zamprogno
2728
Ferdinando Urbano
2829
Flavio Rigolon
30+
FOSSGIS e.V.|http://www.fossgis.de/
2931
Fred Watchorn
3032
Glasic S.r.l.|http://www.glasic.it/
3133
Ivan Marchesini|http://www.gfosservices.it/
@@ -34,6 +36,7 @@ Jaroslaw Kowalczyk
3436
Jason Jorgenson
3537
John C. Tull|http://www.wildnevada.org
3638
John Dean
39+
Jorge Pinto
3740
Kanton Solothurn SOGIS
3841
Kevin Shook
3942
Laura Burnette

‎cmake/FindPostgres.cmake

+90-90
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,90 @@
1-
2-
# CMake module to search for PostgreSQL library
3-
#
4-
# pg_config is searched for in POSTGRES_CONFIG dir,
5-
# default /usr/bin
6-
#
7-
# If it's found it sets POSTGRES_FOUND to TRUE
8-
# and following variables are set:
9-
# POSTGRES_INCLUDE_DIR
10-
# POSTGRES_LIBRARY
11-
12-
IF(WIN32)
13-
IF (NOT POSTGRES_INCLUDE_DIR)
14-
FIND_PATH(POSTGRES_INCLUDE_DIR libpq-fe.h
15-
/usr/local/include
16-
/usr/include
17-
c:/msys/local/include
18-
"$ENV{LIB_DIR}/include/postgresql"
19-
"$ENV{LIB_DIR}/include"
20-
)
21-
ENDIF (NOT POSTGRES_INCLUDE_DIR)
22-
23-
IF (NOT POSTGRES_LIBRARY)
24-
FIND_LIBRARY(POSTGRES_LIBRARY NAMES pq libpq libpqdll PATHS
25-
/usr/local/lib
26-
/usr/lib
27-
c:/msys/local/lib
28-
"$ENV{LIB_DIR}/lib"
29-
)
30-
ENDIF (NOT POSTGRES_LIBRARY)
31-
32-
ELSE(WIN32)
33-
IF(UNIX)
34-
35-
SET(POSTGRES_CONFIG_PREFER_PATH "$ENV{POSTGRES_HOME}/bin" CACHE STRING "preferred path to PG (pg_config)")
36-
FIND_PROGRAM(POSTGRES_CONFIG pg_config
37-
${POSTGRES_CONFIG_PREFER_PATH}
38-
/usr/bin/
39-
)
40-
# MESSAGE("DBG POSTGRES_CONFIG ${POSTGRES_CONFIG}")
41-
42-
IF (POSTGRES_CONFIG)
43-
# set INCLUDE_DIR
44-
EXEC_PROGRAM(${POSTGRES_CONFIG}
45-
ARGS --includedir
46-
OUTPUT_VARIABLE PG_TMP)
47-
SET(POSTGRES_INCLUDE_DIR ${PG_TMP} CACHE STRING INTERNAL)
48-
49-
# set LIBRARY_DIR
50-
EXEC_PROGRAM(${POSTGRES_CONFIG}
51-
ARGS --libdir
52-
OUTPUT_VARIABLE PG_TMP)
53-
IF (APPLE)
54-
SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.dylib CACHE STRING INTERNAL)
55-
ELSE (APPLE)
56-
SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.so CACHE STRING INTERNAL)
57-
ENDIF (APPLE)
58-
ENDIF(POSTGRES_CONFIG)
59-
60-
ENDIF(UNIX)
61-
ENDIF(WIN32)
62-
63-
IF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY)
64-
SET(POSTGRES_FOUND TRUE)
65-
IF(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
66-
SET(HAVE_PGCONFIG TRUE)
67-
ELSE(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
68-
SET(HAVE_PGCONFIG FALSE)
69-
ENDIF(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
70-
ENDIF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY)
71-
72-
73-
IF (POSTGRES_FOUND)
74-
75-
IF (NOT POSTGRES_FIND_QUIETLY)
76-
MESSAGE(STATUS "Found PostgreSQL: ${POSTGRES_LIBRARY}")
77-
ENDIF (NOT POSTGRES_FIND_QUIETLY)
78-
79-
ELSE (POSTGRES_FOUND)
80-
81-
#SET (POSTGRES_INCLUDE_DIR "")
82-
#SET (POSTGRES_LIBRARY "")
83-
84-
IF (POSTGRES_FIND_REQUIRED)
85-
MESSAGE(FATAL_ERROR "Could not find PostgreSQL")
86-
ELSE (POSTGRES_FIND_REQUIRED)
87-
MESSAGE(STATUS "Could not find PostgreSQL")
88-
ENDIF (POSTGRES_FIND_REQUIRED)
89-
90-
ENDIF (POSTGRES_FOUND)
1+
2+
# CMake module to search for PostgreSQL library
3+
#
4+
# pg_config is searched for in POSTGRES_CONFIG dir,
5+
# default /usr/bin
6+
#
7+
# If it's found it sets POSTGRES_FOUND to TRUE
8+
# and following variables are set:
9+
# POSTGRES_INCLUDE_DIR
10+
# POSTGRES_LIBRARY
11+
12+
IF(WIN32)
13+
IF (NOT POSTGRES_INCLUDE_DIR)
14+
FIND_PATH(POSTGRES_INCLUDE_DIR libpq-fe.h
15+
/usr/local/include
16+
/usr/include
17+
c:/msys/local/include
18+
"$ENV{LIB_DIR}/include/postgresql"
19+
"$ENV{LIB_DIR}/include"
20+
)
21+
ENDIF (NOT POSTGRES_INCLUDE_DIR)
22+
23+
IF (NOT POSTGRES_LIBRARY)
24+
FIND_LIBRARY(POSTGRES_LIBRARY NAMES pq libpq libpqdll PATHS
25+
/usr/local/lib
26+
/usr/lib
27+
c:/msys/local/lib
28+
"$ENV{LIB_DIR}/lib"
29+
)
30+
ENDIF (NOT POSTGRES_LIBRARY)
31+
32+
ELSE(WIN32)
33+
IF(UNIX)
34+
35+
SET(POSTGRES_CONFIG_PREFER_PATH "$ENV{POSTGRES_HOME}/bin" CACHE STRING "preferred path to PG (pg_config)")
36+
FIND_PROGRAM(POSTGRES_CONFIG pg_config
37+
${POSTGRES_CONFIG_PREFER_PATH}
38+
/usr/bin/
39+
)
40+
# MESSAGE("DBG POSTGRES_CONFIG ${POSTGRES_CONFIG}")
41+
42+
IF (POSTGRES_CONFIG)
43+
# set INCLUDE_DIR
44+
EXEC_PROGRAM(${POSTGRES_CONFIG}
45+
ARGS --includedir
46+
OUTPUT_VARIABLE PG_TMP)
47+
SET(POSTGRES_INCLUDE_DIR ${PG_TMP} CACHE STRING INTERNAL)
48+
49+
# set LIBRARY_DIR
50+
EXEC_PROGRAM(${POSTGRES_CONFIG}
51+
ARGS --libdir
52+
OUTPUT_VARIABLE PG_TMP)
53+
IF (APPLE)
54+
SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.dylib CACHE STRING INTERNAL)
55+
ELSE (APPLE)
56+
SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.so CACHE STRING INTERNAL)
57+
ENDIF (APPLE)
58+
ENDIF(POSTGRES_CONFIG)
59+
60+
ENDIF(UNIX)
61+
ENDIF(WIN32)
62+
63+
IF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY)
64+
SET(POSTGRES_FOUND TRUE)
65+
IF(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
66+
SET(HAVE_PGCONFIG TRUE)
67+
ELSE(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
68+
SET(HAVE_PGCONFIG FALSE)
69+
ENDIF(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
70+
ENDIF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY)
71+
72+
73+
IF (POSTGRES_FOUND)
74+
75+
IF (NOT POSTGRES_FIND_QUIETLY)
76+
MESSAGE(STATUS "Found PostgreSQL: ${POSTGRES_LIBRARY}")
77+
ENDIF (NOT POSTGRES_FIND_QUIETLY)
78+
79+
ELSE (POSTGRES_FOUND)
80+
81+
#SET (POSTGRES_INCLUDE_DIR "")
82+
#SET (POSTGRES_LIBRARY "")
83+
84+
IF (POSTGRES_FIND_REQUIRED)
85+
MESSAGE(FATAL_ERROR "Could not find PostgreSQL")
86+
ELSE (POSTGRES_FIND_REQUIRED)
87+
MESSAGE(STATUS "Could not find PostgreSQL")
88+
ENDIF (POSTGRES_FIND_REQUIRED)
89+
90+
ENDIF (POSTGRES_FOUND)

‎cmake/FindSqlite3.cmake

+50-50
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
1-
2-
# CMake module to search for Sqlite3 library
3-
#
4-
# If it's found it sets SQLITE3_FOUND to TRUE
5-
# and following variables are set:
6-
# SQLITE3_INCLUDE_DIR
7-
# SQLITE3_LIBRARY
8-
9-
10-
# FIND_PATH and FIND_LIBRARY normally search standard locations
11-
# before the specified paths. To search non-standard paths first,
12-
# FIND_* is invoked first with specified paths and NO_DEFAULT_PATH
13-
# and then again with no specified paths to search the default
14-
# locations. When an earlier FIND_* succeeds, subsequent FIND_*s
15-
# searching for the same item do nothing.
16-
FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h
17-
"$ENV{LIB_DIR}/include"
18-
"$ENV{LIB_DIR}/include/sqlite"
19-
#mingw
20-
c:/msys/local/include
21-
NO_DEFAULT_PATH
22-
)
23-
FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h)
24-
25-
FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3 sqlite3_i PATHS
26-
"$ENV{LIB_DIR}/lib"
27-
#mingw
28-
c:/msys/local/lib
29-
NO_DEFAULT_PATH
30-
)
31-
FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3)
32-
33-
IF (SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY)
34-
SET(SQLITE3_FOUND TRUE)
35-
ENDIF (SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY)
36-
37-
38-
IF (SQLITE3_FOUND)
39-
40-
IF (NOT SQLITE3_FIND_QUIETLY)
41-
MESSAGE(STATUS "Found Sqlite3: ${SQLITE3_LIBRARY}")
42-
ENDIF (NOT SQLITE3_FIND_QUIETLY)
43-
44-
ELSE (SQLITE3_FOUND)
45-
46-
IF (SQLITE3_FIND_REQUIRED)
47-
MESSAGE(FATAL_ERROR "Could not find Sqlite3")
48-
ENDIF (SQLITE3_FIND_REQUIRED)
49-
50-
ENDIF (SQLITE3_FOUND)
1+
2+
# CMake module to search for Sqlite3 library
3+
#
4+
# If it's found it sets SQLITE3_FOUND to TRUE
5+
# and following variables are set:
6+
# SQLITE3_INCLUDE_DIR
7+
# SQLITE3_LIBRARY
8+
9+
10+
# FIND_PATH and FIND_LIBRARY normally search standard locations
11+
# before the specified paths. To search non-standard paths first,
12+
# FIND_* is invoked first with specified paths and NO_DEFAULT_PATH
13+
# and then again with no specified paths to search the default
14+
# locations. When an earlier FIND_* succeeds, subsequent FIND_*s
15+
# searching for the same item do nothing.
16+
FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h
17+
"$ENV{LIB_DIR}/include"
18+
"$ENV{LIB_DIR}/include/sqlite"
19+
#mingw
20+
c:/msys/local/include
21+
NO_DEFAULT_PATH
22+
)
23+
FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h)
24+
25+
FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3 sqlite3_i PATHS
26+
"$ENV{LIB_DIR}/lib"
27+
#mingw
28+
c:/msys/local/lib
29+
NO_DEFAULT_PATH
30+
)
31+
FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3)
32+
33+
IF (SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY)
34+
SET(SQLITE3_FOUND TRUE)
35+
ENDIF (SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY)
36+
37+
38+
IF (SQLITE3_FOUND)
39+
40+
IF (NOT SQLITE3_FIND_QUIETLY)
41+
MESSAGE(STATUS "Found Sqlite3: ${SQLITE3_LIBRARY}")
42+
ENDIF (NOT SQLITE3_FIND_QUIETLY)
43+
44+
ELSE (SQLITE3_FOUND)
45+
46+
IF (SQLITE3_FIND_REQUIRED)
47+
MESSAGE(FATAL_ERROR "Could not find Sqlite3")
48+
ENDIF (SQLITE3_FIND_REQUIRED)
49+
50+
ENDIF (SQLITE3_FOUND)

‎debian/changelog

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
qgis (1.3.0) UNRELEASED; urgency=low
22

3-
* new development version after 1.2 branch
3+
* new upstream release
44
* add analysis library and raster terrain analysis plugin
55
* alternativly depend on libgdal1-1.6.0-grass
6+
* include CONTRIBUTORS, TRANSLATORS and DONORS
7+
* reverse order of libgdal1-*-grass dependencies
68

7-
-- Jürgen E. Fischer <jef@norbit.de> Sat, 05 Sep 2009 17:45:21 +0200
9+
-- Jürgen E. Fischer <jef@norbit.de> Sat, 12 Sep 2009 22:09:18 +0200
810

911
qgis (1.2.0) UNRELEASED; urgency=low
1012

‎debian/control

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Description: Quantum GIS - development files
7070

7171
Package: qgis-plugin-grass
7272
Architecture: any
73-
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.4.0-grass | libgdal1-1.5.0-grass | libgdal1-1.6.0-grass
73+
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.6.0-grass | libgdal1-1.5.0-grass | libgdal1-1.4.0-grass
7474
Description: GRASS plugin for Quantum GIS
7575
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
7676
and display databases of geographic information.

‎debian/qgis-common.install

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ usr/share/qgis/doc/index.html
44
usr/share/qgis/doc/qgisdoc.css
55
usr/share/qgis/doc/AUTHORS
66
usr/share/qgis/doc/SPONSORS
7+
usr/share/qgis/doc/CONTRIBUTORS
8+
usr/share/qgis/doc/TRANSLATORS
9+
usr/share/qgis/doc/DONORS
710
usr/share/qgis/doc/images
811
usr/share/qgis/i18n/*
912
usr/share/qgis/images/*

0 commit comments

Comments
 (0)