From 2e8ed99611b1eb26f0bc3275359d8d271a27e492 Mon Sep 17 00:00:00 2001 From: jef Date: Wed, 7 May 2008 20:13:22 +0000 Subject: [PATCH] merged Release-0.10.0 changes r8366:r8391 into the trunk. git-svn-id: http://svn.osgeo.org/qgis/trunk@8411 c8812cc2-4d05-0410-92ff-de0c093fc19c --- debian/changelog | 50 +++++++++++++++++-- debian/control | 39 +++++---------- debian/libqgis-core0.9.install | 1 - debian/libqgis-gui0.9.install | 1 - ...ss0.9.install => libqgisgrass0.10.install} | 1 + debian/python-qgis.install | 4 -- debian/qgis.install | 13 ++++- scripts/build_debian_package.sh | 2 +- 8 files changed, 73 insertions(+), 38 deletions(-) delete mode 100644 debian/libqgis-core0.9.install delete mode 100644 debian/libqgis-gui0.9.install rename debian/{libqgisgrass0.9.install => libqgisgrass0.10.install} (52%) delete mode 100644 debian/python-qgis.install diff --git a/debian/changelog b/debian/changelog index d527ee72e4b..54d9413fe82 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,52 @@ -qgis (0.9.2test2) unstable; urgency=low +qgis (0.10.0-2) gutsy; urgency=low + + * fix libgdal1 grass depenency for ubuntu gutsy/hardy (1.4.0 | 1.5.0) - * fixed various packaging bugs + -- Jürgen E. Fischer Wed, 30 Apr 2008 22:35:42 +0200 - -- Jürgen E. Fischer Sun, 13 Apr 2008 03:51:14 +0200 +qgis (0.10.0-1) gutsy; urgency=low + + * updated Maintainer field + * updated version for sip build dependency and removed old libgdal<1.5 + dependencies. + * removed explicit shared library dependency for qgis and qgis-grass-plugin. + * removed recommends for qt4-designer on libqgis1-dev, because there's also + a depends. + + -- Jürgen E. Fischer Mon, 28 Apr 2008 22:21:53 +0200 + +qgis (0.10.0) gutsy; urgency=low + + * This release includes over 120 bug fixes and enchancements + * over the QGIS 0.9.1 release. In addition we have added + * the following new features: + * Improvements to digitising capabilities. + * Supporting default and defined styles (.qml) files for file based + * vector layers. With styles you can save the symbolisation + * and other settings associated with a vector layer and they + * will be loaded whenever you load that layer. + * Improved support for transparency and contrast stretching + * in raster layers. Support for color ramps in raster layers. + * Support for non-north up rasters. Many other raster + * improvements 'under the hood'. + * Updated icons for improved visual consistancy. + * Support for migration of old projects to work in newer QGIS versions. + * This release includes over 120 bug fixes and enchancements + * over the QGIS 0.9.1 release. In addition we have added + * the following new features: + * Improvements to digitising capabilities. + * Supporting default and defined styles (.qml) files for file based + * vector layers. With styles you can save the symbolisation + * and other settings associated with a vector layer and they + * will be loaded whenever you load that layer. + * Improved support for transparency and contrast stretching + * in raster layers. Support for color ramps in raster layers. + * Support for non-north up rasters. Many other raster + * improvements 'under the hood'. + * Updated icons for improved visual consistancy. + * Support for migration of old projects to work in newer QGIS versions. + + -- Jürgen E. Fischer Fri, 18 Apr 2008 00:51:58 +0200 qgis (0.9.2test1) gutsy; urgency=low diff --git a/debian/control b/debian/control index b595a37cd8e..529a6366248 100644 --- a/debian/control +++ b/debian/control @@ -1,21 +1,21 @@ Source: qgis Section: science Priority: extra -Maintainer: Debian GIS Project -Uploaders: Francesco Paolo Lovergine -Build-Depends: debhelper (>= 5.0.0), libgdal1-dev | libgdal1-1.3.2-dev | libgdal1-1.4.0-dev , libpq-dev, +Maintainer: Quantum GIS developers +Build-Depends: debhelper (>= 5.0.0), libgdal1-dev, libpq-dev, libgeos-dev (>= 2.0.1-1), dpatch, grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, - flex, bison, python-dev, cmake (>=2.4.3) , python-sip4, python-sip4-dev, python-qt4-dev, - sharutils, sip4 (>= 4.4), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), - libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.0.0), python-qt4-dev (>=4.0.0) + flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python, + sharutils, sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), + libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.0.0), python-qt4-dev (>=4.0.0), + python-sip4-dev (>= 4.5.0) Standards-Version: 3.7.2 XS-Python-Version: current Homepage: http://qgis.org/ Package: qgis Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libqgis-core0.9, libqgis-gui0.9 -Suggests: qgis-plugin-grass, python-qgis +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: qgis-plugin-grass XB-Python-Version: ${python:Versions} Description: Geographic Information System (GIS) A Geographic Information System (GIS) manages, @@ -29,7 +29,7 @@ Description: Geographic Information System (GIS) Elevation Model (DEM) formats including GeoTIFF, Arc/Info ASCII Grid, and USGS ASCII DEM. -Package: libqgis-core0.9 +Package: libqgis-core0.10 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: qgis (<=0.9.2rc1) @@ -42,7 +42,7 @@ Description: QGIS Geographic Information System - shared core library This package contains the shared core library that provides an interface for plugins. -Package: libqgis-gui0.9 +Package: libqgis-gui0.10 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: qgis (<=0.9.2rc1) @@ -55,20 +55,6 @@ Description: QGIS Geographic Information System - shared gui library This package contains the shared gui library that provides an interface for plugins. -Package: python-qgis -Architecture: any -Section: python -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libqgis-core0.9, libqgis-gui0.9 -Provides: ${python:Provides} -XB-Python-Version: ${python:Versions} -Description: QGIS Geographic Information System - Python bindings and plugins - QGIS is a Geographic Information System (GIS) - which manages, analyzes and display databases of - geographic information. - . - This package contains the Python bindings and - plugins. - Package: libqgis1-dev Architecture: any Section: libdevel @@ -76,7 +62,6 @@ Depends: qgis (= ${binary:Version}), libgdal1-dev | libgdal1-1.3.2-dev , libpq-d Provides: libqgis-dev Conflicts: libqgis-dev, qgis-dev Replaces: qgis-dev -Suggests: qt4-designer Description: QGIS Geographic Information System - development files QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of @@ -87,12 +72,12 @@ Description: QGIS Geographic Information System - development files Package: qgis-plugin-grass Architecture: any -Depends: qgis (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.4.0-grass | libgdal1-1.3.2-grass, libqgisgrass0.9 +Depends: qgis (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.4.0-grass | libgdal1-1.5.0-grass Description: Plugin for accessing GRASS data from QGIS This plugin enables a GRASS data access toolbox in the QGIS geographic data viewer. -Package: libqgisgrass0.9 +Package: libqgisgrass0.10 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: QGIS Geographic Information System - shared grass library diff --git a/debian/libqgis-core0.9.install b/debian/libqgis-core0.9.install deleted file mode 100644 index fdecba8685c..00000000000 --- a/debian/libqgis-core0.9.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libqgis_core.so.* diff --git a/debian/libqgis-gui0.9.install b/debian/libqgis-gui0.9.install deleted file mode 100644 index 60205a819d9..00000000000 --- a/debian/libqgis-gui0.9.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libqgis_gui.so.* diff --git a/debian/libqgisgrass0.9.install b/debian/libqgisgrass0.10.install similarity index 52% rename from debian/libqgisgrass0.9.install rename to debian/libqgisgrass0.10.install index 4b3ca23b0f1..4a00b3fbf64 100644 --- a/debian/libqgisgrass0.9.install +++ b/debian/libqgisgrass0.10.install @@ -1 +1,2 @@ +usr/lib/libqgisgrass.so usr/lib/libqgisgrass.so.* diff --git a/debian/python-qgis.install b/debian/python-qgis.install deleted file mode 100644 index 1a81b223b9a..00000000000 --- a/debian/python-qgis.install +++ /dev/null @@ -1,4 +0,0 @@ -usr/share/qgis/python/* -usr/lib/python*/site-packages/qgis/__init__.py -usr/lib/python*/site-packages/qgis/qgisconfig.py -usr/lib/python*/site-packages/qgis/*.so diff --git a/debian/qgis.install b/debian/qgis.install index 76d0ea5d41e..6c1f35199b0 100644 --- a/debian/qgis.install +++ b/debian/qgis.install @@ -1,6 +1,13 @@ usr/bin/qgis usr/bin/qgis_help -usr/share/qgis/doc/AUTHORS usr/share/qgis/doc/SPONSORS usr/share/qgis/doc/CODING usr/share/qgis/doc/favicon.ico usr/share/qgis/doc/index.html usr/share/qgis/doc/qgisdoc.css usr/share/qgis/doc/userguide.pdf usr/share/qgis/doc/images usr/share/doc/qgis +usr/share/qgis/doc/CODING +usr/share/qgis/doc/favicon.ico +usr/share/qgis/doc/index.html +usr/share/qgis/doc/qgisdoc.css +usr/share/qgis/doc/AUTHORS +usr/share/qgis/doc/SPONSORS +usr/share/qgis/doc/images +usr/share/qgis/doc/userguide.pdf usr/share/doc/qgis usr/share/pixmaps/* usr/share/qgis/i18n/* usr/share/qgis/images/* @@ -24,3 +31,7 @@ usr/lib/qgis/libspitplugin.so usr/lib/qgis/libwfsplugin.so usr/lib/qgis/libwfsprovider.so usr/lib/qgis/libwmsprovider.so +usr/share/qgis/python/* +usr/lib/python*/site-packages/qgis/__init__.py +usr/lib/python*/site-packages/qgis/qgisconfig.py +usr/lib/python*/site-packages/qgis/*.so diff --git a/scripts/build_debian_package.sh b/scripts/build_debian_package.sh index c7d82e2420b..2b29c733c61 100755 --- a/scripts/build_debian_package.sh +++ b/scripts/build_debian_package.sh @@ -22,4 +22,4 @@ export DEBFULLNAME="Tim Sutton" export DEBEMAIL=tim@linfiniti.com #dch -v 0.9.1+svn`date +%Y%m%d` dch -v 0.9.2rc1 -fakeroot dpkg-buildpackage +fakeroot dpkg-buildpackage -kAA4D3BA997626237