From c080e311cb1b98f196c3f8e98d9b716512ed1461 Mon Sep 17 00:00:00 2001 From: jef Date: Sat, 22 Aug 2009 15:32:29 +0000 Subject: [PATCH] update version number to 1.3.0 in trunk git-svn-id: http://svn.osgeo.org/qgis/trunk@11484 c8812cc2-4d05-0410-92ff-de0c093fc19c --- CMakeLists.txt | 6 ++--- debian/changelog | 6 +++++ debian/control | 8 +++--- ....Debian => libqgis1.3.0-dev.README.Debian} | 0 ...0-dev.install => libqgis1.3.0-dev.install} | 0 ...qgis1.2.0.install => libqgis1.3.0.install} | 0 debian/libqgis1.lintian-overrides | 4 +-- ms-windows/osgeo4w/package.cmd | 25 ++++++++++--------- src/core/renderer/qgsuniquevaluerenderer.h | 2 +- 9 files changed, 29 insertions(+), 22 deletions(-) rename debian/{libqgis1.2.0-dev.README.Debian => libqgis1.3.0-dev.README.Debian} (100%) rename debian/{libqgis1.2.0-dev.install => libqgis1.3.0-dev.install} (100%) rename debian/{libqgis1.2.0.install => libqgis1.3.0.install} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 15de3495987..606d5b59af0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,12 +1,12 @@ SET(CPACK_PACKAGE_VERSION_MAJOR "1") -SET(CPACK_PACKAGE_VERSION_MINOR "2") +SET(CPACK_PACKAGE_VERSION_MINOR "3") SET(CPACK_PACKAGE_VERSION_PATCH "0") SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}) -SET(RELEASE_NAME "Daphnis") +SET(RELEASE_NAME "Unstable") SET(PROJECT_VERSION ${COMPLETE_VERSION}) PROJECT(qgis${PROJECT_VERSION}) # Note the version no is Mmmpp for Major/minor/patch, 0-padded, thus '10100' for 1.1.0 -SET(QGIS_VERSION_INT 10200) +SET(QGIS_VERSION_INT 10300) # TODO: # - install includes for libs diff --git a/debian/changelog b/debian/changelog index 8025262cab1..251fd517ecb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +qgis (1.3.0) UNRELEASED; urgency=low + + * new development version after 1.2 branch + + -- Jürgen E. Fischer Sat, 22 Aug 2009 17:28:29 +0200 + qgis (1.2.0) UNRELEASED; urgency=low * new development version after 1.1 branch diff --git a/debian/control b/debian/control index 32c2766ea5c..438556ca5a1 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev, libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0), python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev, libsm-dev, pyqt4-dev-tools -Build-Conflicts: libqgis1.2.0-dev, qgis-dev +Build-Conflicts: libqgis1.3.0-dev, qgis-dev Standards-Version: 3.8.0 XS-Python-Version: current Homepage: http://qgis.org/ @@ -39,7 +39,7 @@ Description: Quantum GIS - architecture-independent data This package contains architecture-independent supporting data files for use with Quantum GIS. -Package: libqgis1.2.0 +Package: libqgis1.3.0 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: qgis (<=0.9.2rc1), libqgis-core1, libqgis-gui1, libqgis0, libqgis1 @@ -50,10 +50,10 @@ Description: Quantum GIS - shared libraries This package contains the shared core and gui library that provide an interface for plugins and stand-alone applications. -Package: libqgis1.2.0-dev +Package: libqgis1.3.0-dev Architecture: any Section: libdevel -Depends: libqgis1.2.0 (= ${binary:Version}), libgdal1-dev | libgdal1-1.3.2-dev, +Depends: libqgis1.3.0 (= ${binary:Version}), libgdal1-dev | libgdal1-1.3.2-dev, libpq-dev | postgresql-dev, libgeos-dev (>= 2.0.1), grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0), diff --git a/debian/libqgis1.2.0-dev.README.Debian b/debian/libqgis1.3.0-dev.README.Debian similarity index 100% rename from debian/libqgis1.2.0-dev.README.Debian rename to debian/libqgis1.3.0-dev.README.Debian diff --git a/debian/libqgis1.2.0-dev.install b/debian/libqgis1.3.0-dev.install similarity index 100% rename from debian/libqgis1.2.0-dev.install rename to debian/libqgis1.3.0-dev.install diff --git a/debian/libqgis1.2.0.install b/debian/libqgis1.3.0.install similarity index 100% rename from debian/libqgis1.2.0.install rename to debian/libqgis1.3.0.install diff --git a/debian/libqgis1.lintian-overrides b/debian/libqgis1.lintian-overrides index e7a4866537d..91e8d32b3d7 100644 --- a/debian/libqgis1.lintian-overrides +++ b/debian/libqgis1.lintian-overrides @@ -1,3 +1,3 @@ libqgis1: shlib-calls-exit -libqgis1: no-symbols-control-file usr/lib/libqgis_gui.so.1.2.0 -libqgis1: no-symbols-control-file usr/lib/libqgis_core.so.1.2.0 +libqgis1: no-symbols-control-file usr/lib/libqgis_gui.so.1.3.0 +libqgis1: no-symbols-control-file usr/lib/libqgis_core.so.1.3.0 diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd index 0ac0d811d9d..cd2a4dcc86e 100755 --- a/ms-windows/osgeo4w/package.cmd +++ b/ms-windows/osgeo4w/package.cmd @@ -1,6 +1,7 @@ @echo off set GRASS_VERSION=6.4.0svn set SVNVERSION=c:/cygwin/bin/svnversion +set PACKAGENAME=qgis-dev set BUILDDIR=%CD%\build REM set BUILDDIR=%TEMP%\qgis_unstable @@ -99,7 +100,7 @@ cmake -G "Visual Studio 9 2008" ^ -D QT_HEADERS_DIR=%O4W_ROOT%/include/qt4 ^ -D QT_ZLIB_LIBRARY=%O4W_ROOT%/lib/zlib.lib ^ -D QT_PNG_LIBRARY=%O4W_ROOT%/lib/libpng13.lib ^ - -D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/qgis-dev ^ + -D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/%PACKAGENAME% ^ -D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MD /ZI /Od /D NDEBUG" ^ -D SVNVERSION="%SVNVERSION%" ^ %SRCDIR%>>%LOG% 2>&1 @@ -126,23 +127,23 @@ if errorlevel 1 goto error echo PACKAGE: %DATE% %TIME%>>%LOG% 2>&1 cd .. -copy postinstall.bat %OSGEO4W_ROOT%\etc\postinstall\qgis-dev.bat -copy preremove.bat %OSGEO4W_ROOT%\etc\preremove\qgis-dev.bat -copy qgis-dev.bat.tmpl %OSGEO4W_ROOT%\bin\qgis-dev.bat.tmpl +copy postinstall.bat %OSGEO4W_ROOT%\etc\postinstall\%PACKAGENAME%.bat +copy preremove.bat %OSGEO4W_ROOT%\etc\preremove\%PACKAGENAME%.bat +copy %PACKAGENAME%.bat.tmpl %OSGEO4W_ROOT%\bin\%PACKAGENAME%.bat.tmpl -sed -e 's/%OSGEO4W_ROOT:\=\\\\\\\\%/@osgeo4w@/' %OSGEO4W_ROOT%\apps\qgis-dev\python\qgis\qgisconfig.py >%OSGEO4W_ROOT%\apps\qgis-dev\python\qgis\qgisconfig.py.tmpl +sed -e 's/%OSGEO4W_ROOT:\=\\\\\\\\%/@osgeo4w@/' %OSGEO4W_ROOT%\apps\%PACKAGENAME%\python\qgis\qgisconfig.py >%OSGEO4W_ROOT%\apps\%PACKAGENAME%\python\qgis\qgisconfig.py.tmpl if errorlevel 1 goto error -del %OSGEO4W_ROOT%\apps\qgis-dev\python\qgis\qgisconfig.py +del %OSGEO4W_ROOT%\apps\%PACKAGENAME%\python\qgis\qgisconfig.py touch exclude -tar -C %OSGEO4W_ROOT% -cjf qgis-dev-%VERSION%-%PACKAGE%.tar.bz2 ^ +tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2 ^ --exclude-from exclude ^ - apps/qgis-dev ^ - bin/qgis-dev.bat.tmpl ^ - etc/postinstall/qgis-dev.bat ^ - etc/preremove/qgis-dev.bat>>%LOG% 2>&1 + apps/%PACKAGENAME% ^ + bin/%PACKAGENAME%.bat.tmpl ^ + etc/postinstall/%PACKAGENAME%.bat ^ + etc/preremove/%PACKAGENAME%.bat>>%LOG% 2>&1 if errorlevel 1 goto error goto end @@ -150,7 +151,7 @@ goto end :error echo BUILD ERROR %ERRORLEVEL%: %DATE% %TIME% echo BUILD ERROR %ERRORLEVEL%: %DATE% %TIME%>>%LOG% 2>&1 -if exist qgis-dev-%VERSION%-%PACKAGE%.tar.bz2 del qgis-dev-%VERSION%-%PACKAGE%.tar.bz2 +if exist %PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2 del %PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2 :end echo FINISHED: %DATE% %TIME% >>%LOG% 2>&1 diff --git a/src/core/renderer/qgsuniquevaluerenderer.h b/src/core/renderer/qgsuniquevaluerenderer.h index b20b64cf785..ca59d9c214b 100644 --- a/src/core/renderer/qgsuniquevaluerenderer.h +++ b/src/core/renderer/qgsuniquevaluerenderer.h @@ -43,7 +43,7 @@ class CORE_EXPORT QgsUniqueValueRenderer: public QgsRenderer */ int readXML( const QDomNode& rnode, QgsVectorLayer& vl ); /**Writes the contents of the renderer to a configuration file - @ return true in case of success*/ + @return true in case of success*/ virtual bool writeXML( QDomNode & layer_node, QDomDocument & document, const QgsVectorLayer& vl ) const; /** Returns true, if attribute values are used by the renderer and false otherwise*/ bool needsAttributes() const;