sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-18 00:03:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix #2410

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@12898 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jef 2010-02-07 21:43:31 +00:00
parent f46c6f6636
commit d240f03125
3 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
debian/control vendored
View File

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

5
debian/rules vendored
View File

@ -31,11 +31,6 @@ CMAKE_OPTS := \
-D WITH_SPATIALITE=TRUE \ -D WITH_SPATIALITE=TRUE \
-D WITH_INTERNAL_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")) ifneq (,$(findstring $(DISTRIBUTION),"hardy intrepid"))
LDFLAGS += -Wl,--as-needed -Wl,--no-undefined LDFLAGS += -Wl,--as-needed -Wl,--no-undefined
endif endif

3
src/providers/spatialite/qgsspatialiteprovider.cpp
View File

@ -1198,6 +1198,9 @@ bool QgsSpatiaLiteProvider::addAttributes( const QList<QgsField> &attributes )
goto abort; goto abort;
} }
// reload columns
rewind();
return true; return true;
abort: abort: