Skip to content

Commit bbfd155

Browse files
author
jef
committedAug 22, 2009
update version number to 1.3.0 in trunk
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11484 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1final-1_7_0
1 parent 6b946af commit bbfd155

File tree

9 files changed

+29
-22
lines changed

9 files changed

+29
-22
lines changed
 

‎CMakeLists.txt

Lines changed: 3 additions & 3 deletions
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 "2")
2+
SET(CPACK_PACKAGE_VERSION_MINOR "3")
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 "Daphnis")
5+
SET(RELEASE_NAME "Unstable")
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 10200)
9+
SET(QGIS_VERSION_INT 10300)
1010

1111
# TODO:
1212
# - install includes for libs

‎debian/changelog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
qgis (1.3.0) UNRELEASED; urgency=low
2+
3+
* new development version after 1.2 branch
4+
5+
-- Jürgen E. Fischer <jef@norbit.de> Sat, 22 Aug 2009 17:28:29 +0200
6+
17
qgis (1.2.0) UNRELEASED; urgency=low
28

39
* new development version after 1.1 branch

‎debian/control

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
99
libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
1010
python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
1111
libsm-dev, pyqt4-dev-tools
12-
Build-Conflicts: libqgis1.2.0-dev, qgis-dev
12+
Build-Conflicts: libqgis1.3.0-dev, qgis-dev
1313
Standards-Version: 3.8.0
1414
XS-Python-Version: current
1515
Homepage: http://qgis.org/
@@ -39,7 +39,7 @@ Description: Quantum GIS - architecture-independent data
3939
This package contains architecture-independent supporting data files for use
4040
with Quantum GIS.
4141

42-
Package: libqgis1.2.0
42+
Package: libqgis1.3.0
4343
Architecture: any
4444
Depends: ${shlibs:Depends}, ${misc:Depends}
4545
Replaces: qgis (<=0.9.2rc1), libqgis-core1, libqgis-gui1, libqgis0, libqgis1
@@ -50,10 +50,10 @@ Description: Quantum GIS - shared libraries
5050
This package contains the shared core and gui library that provide an
5151
interface for plugins and stand-alone applications.
5252

53-
Package: libqgis1.2.0-dev
53+
Package: libqgis1.3.0-dev
5454
Architecture: any
5555
Section: libdevel
56-
Depends: libqgis1.2.0 (= ${binary:Version}), libgdal1-dev | libgdal1-1.3.2-dev,
56+
Depends: libqgis1.3.0 (= ${binary:Version}), libgdal1-dev | libgdal1-1.3.2-dev,
5757
libpq-dev | postgresql-dev, libgeos-dev (>= 2.0.1), grass-dev,
5858
libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, libqt4-core (>=4.2.0),
5959
libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0),

‎debian/libqgis1.2.0-dev.install renamed to ‎debian/libqgis1.3.0-dev.install

File renamed without changes.

‎debian/libqgis1.2.0.install renamed to ‎debian/libqgis1.3.0.install

File renamed without changes.

‎debian/libqgis1.lintian-overrides

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
libqgis1: shlib-calls-exit
2-
libqgis1: no-symbols-control-file usr/lib/libqgis_gui.so.1.2.0
3-
libqgis1: no-symbols-control-file usr/lib/libqgis_core.so.1.2.0
2+
libqgis1: no-symbols-control-file usr/lib/libqgis_gui.so.1.3.0
3+
libqgis1: no-symbols-control-file usr/lib/libqgis_core.so.1.3.0

‎ms-windows/osgeo4w/package.cmd

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@echo off
22
set GRASS_VERSION=6.4.0svn
33
set SVNVERSION=c:/cygwin/bin/svnversion
4+
set PACKAGENAME=qgis-dev
45

56
set BUILDDIR=%CD%\build
67
REM set BUILDDIR=%TEMP%\qgis_unstable
@@ -99,7 +100,7 @@ cmake -G "Visual Studio 9 2008" ^
99100
-D QT_HEADERS_DIR=%O4W_ROOT%/include/qt4 ^
100101
-D QT_ZLIB_LIBRARY=%O4W_ROOT%/lib/zlib.lib ^
101102
-D QT_PNG_LIBRARY=%O4W_ROOT%/lib/libpng13.lib ^
102-
-D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/qgis-dev ^
103+
-D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/%PACKAGENAME% ^
103104
-D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MD /ZI /Od /D NDEBUG" ^
104105
-D SVNVERSION="%SVNVERSION%" ^
105106
%SRCDIR%>>%LOG% 2>&1
@@ -126,31 +127,31 @@ if errorlevel 1 goto error
126127
echo PACKAGE: %DATE% %TIME%>>%LOG% 2>&1
127128

128129
cd ..
129-
copy postinstall.bat %OSGEO4W_ROOT%\etc\postinstall\qgis-dev.bat
130-
copy preremove.bat %OSGEO4W_ROOT%\etc\preremove\qgis-dev.bat
131-
copy qgis-dev.bat.tmpl %OSGEO4W_ROOT%\bin\qgis-dev.bat.tmpl
130+
copy postinstall.bat %OSGEO4W_ROOT%\etc\postinstall\%PACKAGENAME%.bat
131+
copy preremove.bat %OSGEO4W_ROOT%\etc\preremove\%PACKAGENAME%.bat
132+
copy %PACKAGENAME%.bat.tmpl %OSGEO4W_ROOT%\bin\%PACKAGENAME%.bat.tmpl
132133

133-
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
134+
sed -e 's/%OSGEO4W_ROOT:\=\\\\\\\\%/@osgeo4w@/' %OSGEO4W_ROOT%\apps\%PACKAGENAME%\python\qgis\qgisconfig.py >%OSGEO4W_ROOT%\apps\%PACKAGENAME%\python\qgis\qgisconfig.py.tmpl
134135
if errorlevel 1 goto error
135136

136-
del %OSGEO4W_ROOT%\apps\qgis-dev\python\qgis\qgisconfig.py
137+
del %OSGEO4W_ROOT%\apps\%PACKAGENAME%\python\qgis\qgisconfig.py
137138

138139
touch exclude
139140

140-
tar -C %OSGEO4W_ROOT% -cjf qgis-dev-%VERSION%-%PACKAGE%.tar.bz2 ^
141+
tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2 ^
141142
--exclude-from exclude ^
142-
apps/qgis-dev ^
143-
bin/qgis-dev.bat.tmpl ^
144-
etc/postinstall/qgis-dev.bat ^
145-
etc/preremove/qgis-dev.bat>>%LOG% 2>&1
143+
apps/%PACKAGENAME% ^
144+
bin/%PACKAGENAME%.bat.tmpl ^
145+
etc/postinstall/%PACKAGENAME%.bat ^
146+
etc/preremove/%PACKAGENAME%.bat>>%LOG% 2>&1
146147
if errorlevel 1 goto error
147148

148149
goto end
149150

150151
:error
151152
echo BUILD ERROR %ERRORLEVEL%: %DATE% %TIME%
152153
echo BUILD ERROR %ERRORLEVEL%: %DATE% %TIME%>>%LOG% 2>&1
153-
if exist qgis-dev-%VERSION%-%PACKAGE%.tar.bz2 del qgis-dev-%VERSION%-%PACKAGE%.tar.bz2
154+
if exist %PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2 del %PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2
154155

155156
:end
156157
echo FINISHED: %DATE% %TIME% >>%LOG% 2>&1

‎src/core/renderer/qgsuniquevaluerenderer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class CORE_EXPORT QgsUniqueValueRenderer: public QgsRenderer
4343
*/
4444
int readXML( const QDomNode& rnode, QgsVectorLayer& vl );
4545
/**Writes the contents of the renderer to a configuration file
46-
@ return true in case of success*/
46+
@return true in case of success*/
4747
virtual bool writeXML( QDomNode & layer_node, QDomDocument & document, const QgsVectorLayer& vl ) const;
4848
/** Returns true, if attribute values are used by the renderer and false otherwise*/
4949
bool needsAttributes() const;

0 commit comments

Comments
 (0)
Please sign in to comment.