[QGIS Commit] r12898 - in trunk/qgis: debian src/providers/spatialite

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-02-07 16:43:31 -0500 (Sun, 07 Feb 2010)
New Revision: 12898

Modified:
   trunk/qgis/debian/control
   trunk/qgis/debian/rules
   trunk/qgis/src/providers/spatialite/qgsspatialiteprovider.cpp
Log:
fix #2410

Modified: trunk/qgis/debian/control
===================================================================
--- trunk/qgis/debian/control	2010-02-07 21:03:03 UTC (rev 12897)
+++ trunk/qgis/debian/control	2010-02-07 21:43:31 UTC (rev 12898)
@@ -2,15 +2,15 @@
 Section: science
 Priority: extra
 Maintainer: Quantum GIS developers <qgis-developer at lists.osgeo.org>
-Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev, 
- libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, 
- 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.1.0), python-qt4-dev (>=4.1.0),
+Build-Depends: debhelper (>= 7), libgdal1-dev, libpq-dev, 
+ libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, libproj-dev, libexpat1-dev, 
+ flex, bison, python-dev, cmake (>= 2.6), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
+ sharutils, sip4 (>= 4.5), libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
+ libqt4-sql (>=4.4.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
+ libsm-dev, pyqt4-dev-tools, libqwt5-qt4-dev
 Build-Conflicts: libqgis-dev, qgis-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 XS-Python-Version: current
 Homepage: http://qgis.org/
 
@@ -31,7 +31,7 @@
 
 Package: qgis-common
 Architecture: all
-Depends: qgis (>= ${source:Version})
+Depends: qgis (>= ${binary:Version})
 Description: Quantum GIS - architecture-independent data
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.
@@ -39,7 +39,7 @@
  This package contains architecture-independent supporting data files for use 
  with Quantum GIS.
 
-Package: libqgis1.4.0
+Package: libqgis1.5.0
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: qgis (<=0.9.2rc1), libqgis-core1, libqgis-gui1, libqgis0, libqgis1
@@ -53,12 +53,11 @@
 Package: libqgis-dev
 Architecture: any
 Section: libdevel
-Depends: libqgis1.4.0 (= ${binary:Version}), libgdal1-dev,
+Depends: libqgis1.5.0 (= ${binary:Version}), libgdal1-dev,
  libpq-dev, libgeos-dev (>= 3.0.0), 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),
- libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
- qt4-designer (>=4.2.0)
+ libsqlite3-dev, libgsl0-dev, libproj-dev, libexpat1-dev, libqt4-core (>=4.4.0),
+ libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0), libqt4-sql (>=4.4.0),
+ python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0), qt4-designer (>=4.4.0)
 Provides: qgis-dev
 Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
 Description: Quantum GIS - development files
@@ -80,7 +79,7 @@
 
 Package: qgis-plugin-grass-common
 Architecture: all
-Depends: qgis-plugin-grass (>= ${source:Version}), python
+Depends: python
 Description: GRASS plugin for Quantum GIS - architecture-independent data
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.
@@ -103,7 +102,6 @@
 Package: python-qgis-common
 Section: python
 Architecture: all
-Depends: python-qgis (>= ${source:Version})
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Description: Python bindings to Quantum GIS - architecture-independent files

Modified: trunk/qgis/debian/rules
===================================================================
--- trunk/qgis/debian/rules	2010-02-07 21:03:03 UTC (rev 12897)
+++ trunk/qgis/debian/rules	2010-02-07 21:43:31 UTC (rev 12898)
@@ -31,11 +31,6 @@
 	-D WITH_SPATIALITE=TRUE \
 	-D WITH_INTERNAL_SPATIALITE=TRUE
 
-ifeq ($(DISTRIBUTION),sid)
-# use on python 2.5 while transition to python 2.6 is on
-CMAKE_OPTS += -D PYTHON_EXECUTABLE=/usr/bin/python2.5
-endif
-
 ifneq (,$(findstring $(DISTRIBUTION),"hardy intrepid"))
 LDFLAGS += -Wl,--as-needed -Wl,--no-undefined
 endif

Modified: trunk/qgis/src/providers/spatialite/qgsspatialiteprovider.cpp
===================================================================
--- trunk/qgis/src/providers/spatialite/qgsspatialiteprovider.cpp	2010-02-07 21:03:03 UTC (rev 12897)
+++ trunk/qgis/src/providers/spatialite/qgsspatialiteprovider.cpp	2010-02-07 21:43:31 UTC (rev 12898)
@@ -1198,6 +1198,9 @@
     goto abort;
   }
 
+  // reload columns
+  rewind();
+
   return true;
 
 abort: