[QGIS Commit] r11484 - in trunk/qgis: . debian ms-windows/osgeo4w
src/core/renderer
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sat Aug 22 11:32:29 EDT 2009
Author: jef
Date: 2009-08-22 11:32:29 -0400 (Sat, 22 Aug 2009)
New Revision: 11484
Added:
trunk/qgis/debian/libqgis1.3.0-dev.README.Debian
trunk/qgis/debian/libqgis1.3.0-dev.install
trunk/qgis/debian/libqgis1.3.0.install
Removed:
trunk/qgis/debian/libqgis1.2.0-dev.README.Debian
trunk/qgis/debian/libqgis1.2.0-dev.install
trunk/qgis/debian/libqgis1.2.0.install
Modified:
trunk/qgis/CMakeLists.txt
trunk/qgis/debian/changelog
trunk/qgis/debian/control
trunk/qgis/debian/libqgis1.lintian-overrides
trunk/qgis/ms-windows/osgeo4w/package.cmd
trunk/qgis/src/core/renderer/qgsuniquevaluerenderer.h
Log:
update version number to 1.3.0 in trunk
Modified: trunk/qgis/CMakeLists.txt
===================================================================
--- trunk/qgis/CMakeLists.txt 2009-08-22 15:24:11 UTC (rev 11483)
+++ trunk/qgis/CMakeLists.txt 2009-08-22 15:32:29 UTC (rev 11484)
@@ -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
Modified: trunk/qgis/debian/changelog
===================================================================
--- trunk/qgis/debian/changelog 2009-08-22 15:24:11 UTC (rev 11483)
+++ trunk/qgis/debian/changelog 2009-08-22 15:32:29 UTC (rev 11484)
@@ -1,3 +1,9 @@
+qgis (1.3.0) UNRELEASED; urgency=low
+
+ * new development version after 1.2 branch
+
+ -- Jürgen E. Fischer <jef at norbit.de> Sat, 22 Aug 2009 17:28:29 +0200
+
qgis (1.2.0) UNRELEASED; urgency=low
* new development version after 1.1 branch
Modified: trunk/qgis/debian/control
===================================================================
--- trunk/qgis/debian/control 2009-08-22 15:24:11 UTC (rev 11483)
+++ trunk/qgis/debian/control 2009-08-22 15:32:29 UTC (rev 11484)
@@ -9,7 +9,7 @@
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 @@
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 @@
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),
Deleted: trunk/qgis/debian/libqgis1.2.0-dev.README.Debian
===================================================================
--- trunk/qgis/debian/libqgis1.2.0-dev.README.Debian 2009-08-22 15:24:11 UTC (rev 11483)
+++ trunk/qgis/debian/libqgis1.2.0-dev.README.Debian 2009-08-22 15:32:29 UTC (rev 11484)
@@ -1,8 +0,0 @@
-QGIS for Debian
----------------
-
-Before building a QGIS plugin you'll need to tell it where to look for Qt:
-
- export QTDIR=/usr/share/qt3
-
- -- Steve Halasz <debian at adkgis.org> Thu, 14 Apr 2005 11:03:20 -0400
Deleted: trunk/qgis/debian/libqgis1.2.0-dev.install
===================================================================
--- trunk/qgis/debian/libqgis1.2.0-dev.install 2009-08-22 15:24:11 UTC (rev 11483)
+++ trunk/qgis/debian/libqgis1.2.0-dev.install 2009-08-22 15:32:29 UTC (rev 11484)
@@ -1,3 +0,0 @@
-usr/include/qgis/*
-usr/lib/libqgis_gui.so
-usr/lib/libqgis_core.so
Deleted: trunk/qgis/debian/libqgis1.2.0.install
===================================================================
--- trunk/qgis/debian/libqgis1.2.0.install 2009-08-22 15:24:11 UTC (rev 11483)
+++ trunk/qgis/debian/libqgis1.2.0.install 2009-08-22 15:32:29 UTC (rev 11484)
@@ -1,2 +0,0 @@
-usr/lib/libqgis_core.so.*.*.*
-usr/lib/libqgis_gui.so.*.*.*
Copied: trunk/qgis/debian/libqgis1.3.0-dev.README.Debian (from rev 11477, trunk/qgis/debian/libqgis1.2.0-dev.README.Debian)
===================================================================
--- trunk/qgis/debian/libqgis1.3.0-dev.README.Debian (rev 0)
+++ trunk/qgis/debian/libqgis1.3.0-dev.README.Debian 2009-08-22 15:32:29 UTC (rev 11484)
@@ -0,0 +1,8 @@
+QGIS for Debian
+---------------
+
+Before building a QGIS plugin you'll need to tell it where to look for Qt:
+
+ export QTDIR=/usr/share/qt3
+
+ -- Steve Halasz <debian at adkgis.org> Thu, 14 Apr 2005 11:03:20 -0400
Copied: trunk/qgis/debian/libqgis1.3.0-dev.install (from rev 11477, trunk/qgis/debian/libqgis1.2.0-dev.install)
===================================================================
--- trunk/qgis/debian/libqgis1.3.0-dev.install (rev 0)
+++ trunk/qgis/debian/libqgis1.3.0-dev.install 2009-08-22 15:32:29 UTC (rev 11484)
@@ -0,0 +1,3 @@
+usr/include/qgis/*
+usr/lib/libqgis_gui.so
+usr/lib/libqgis_core.so
Copied: trunk/qgis/debian/libqgis1.3.0.install (from rev 11477, trunk/qgis/debian/libqgis1.2.0.install)
===================================================================
--- trunk/qgis/debian/libqgis1.3.0.install (rev 0)
+++ trunk/qgis/debian/libqgis1.3.0.install 2009-08-22 15:32:29 UTC (rev 11484)
@@ -0,0 +1,2 @@
+usr/lib/libqgis_core.so.*.*.*
+usr/lib/libqgis_gui.so.*.*.*
Modified: trunk/qgis/debian/libqgis1.lintian-overrides
===================================================================
--- trunk/qgis/debian/libqgis1.lintian-overrides 2009-08-22 15:24:11 UTC (rev 11483)
+++ trunk/qgis/debian/libqgis1.lintian-overrides 2009-08-22 15:32:29 UTC (rev 11484)
@@ -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
Modified: trunk/qgis/ms-windows/osgeo4w/package.cmd
===================================================================
--- trunk/qgis/ms-windows/osgeo4w/package.cmd 2009-08-22 15:24:11 UTC (rev 11483)
+++ trunk/qgis/ms-windows/osgeo4w/package.cmd 2009-08-22 15:32:29 UTC (rev 11484)
@@ -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 @@
-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 @@
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 @@
: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
Modified: trunk/qgis/src/core/renderer/qgsuniquevaluerenderer.h
===================================================================
--- trunk/qgis/src/core/renderer/qgsuniquevaluerenderer.h 2009-08-22 15:24:11 UTC (rev 11483)
+++ trunk/qgis/src/core/renderer/qgsuniquevaluerenderer.h 2009-08-22 15:32:29 UTC (rev 11484)
@@ -43,7 +43,7 @@
*/
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;
More information about the QGIS-commit
mailing list