Skip to content

Commit 0d74e28

Browse files
author
jef
committed
debian packaging update
git-svn-id: http://svn.osgeo.org/qgis/trunk@13958 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 90cda1e commit 0d74e28

File tree

7 files changed

+143
-23
lines changed

7 files changed

+143
-23
lines changed

‎debian/changelog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
qgis (1.6.0) UNRELEASED; urgency=low
2+
3+
* new development version after 1.6 branch
4+
5+
-- Jürgen E. Fischer <jef@norbit.de> Wed, 21 Jul 2010 10:12:48 +0200
6+
17
qgis (1.5.0) UNRELEASED; urgency=low
28

39
* new development version after 1.5 branch

‎debian/compat.maverick

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
7

‎debian/control

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ Source: qgis
22
Section: science
33
Priority: extra
44
Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
5-
Build-Depends: debhelper (>= 7), libgdal1-dev, libpq-dev,
6-
libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, libproj-dev, libexpat1-dev,
7-
flex, bison, python-dev, cmake (>= 2.6), python-sip (>= 4.5.0), python-central (>=0.5), python,
8-
libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
5+
Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
6+
libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj (<< 4.7.0) | libproj-dev (>= 4.7.0), libexpat1-dev,
7+
flex, bison, python-dev, cmake (>= 2.6), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
8+
sip4 (>= 4.5), libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
99
libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
10-
python-sip-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libspatialite-dev
10+
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev
1111
Build-Conflicts: libqgis-dev, qgis-dev
1212
Standards-Version: 3.8.4
1313
XS-Python-Version: current
@@ -68,7 +68,7 @@ Description: Quantum GIS - development files
6868

6969
Package: qgis-plugin-grass
7070
Architecture: any
71-
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, grass640+42329
71+
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, grass640-5+41380
7272
Description: GRASS plugin for Quantum GIS
7373
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
7474
and display databases of geographic information.
@@ -89,7 +89,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data
8989
Package: python-qgis
9090
Section: python
9191
Architecture: any
92-
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
92+
Depends: python-qt4 (>=4.1.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
9393
Provides: ${python:Provides}
9494
XB-Python-Version: ${python:Versions}
9595
Description: Python bindings to Quantum GIS
@@ -102,7 +102,6 @@ Package: python-qgis-common
102102
Section: python
103103
Architecture: all
104104
Provides: ${python:Provides}
105-
Depends: gdal-bin, python-gdal
106105
XB-Python-Version: ${python:Versions}
107106
Description: Python bindings to Quantum GIS - architecture-independent files
108107
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes

‎debian/control.maverick

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
Source: qgis
2+
Section: science
3+
Priority: extra
4+
Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
5+
Build-Depends: debhelper (>= 7), libgdal1-dev, libpq-dev,
6+
libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, libproj-dev, libexpat1-dev,
7+
flex, bison, python-dev, cmake (>= 2.6), python-sip (>= 4.5.0), python-central (>=0.5), python,
8+
libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
9+
libqt4-sql (>=4.4.0), libqt4-webkit-dev (>= 4.4.0),
10+
python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0), python-sip-dev (>= 4.5.0), pyqt4-dev-tools,
11+
libqwt5-qt4-dev, libspatialite-dev
12+
Build-Conflicts: libqgis-dev, qgis-dev
13+
Standards-Version: 3.8.4
14+
XS-Python-Version: current
15+
Homepage: http://qgis.org/
16+
17+
Package: qgis
18+
Architecture: any
19+
Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-common (= ${source:Version})
20+
Recommends: qgis-plugin-grass, python-qgis
21+
Suggests: gpsbabel
22+
Conflicts: uim-qt3
23+
Description: Geographic Information System (GIS)
24+
A Geographic Information System (GIS) manages, analyzes, and displays
25+
databases of geographic information. Quantum GIS (QGIS) supports shape file
26+
viewing and editing, spatial data storage with PostgreSQL/PostGIS, projection
27+
on-the-fly, map composition, and a number of other features via a plugin
28+
interface. QGIS also supports display of various georeferenced raster and
29+
Digital Elevation Model (DEM) formats including GeoTIFF, Arc/Info ASCII Grid,
30+
and USGS ASCII DEM.
31+
32+
Package: qgis-common
33+
Architecture: all
34+
Depends: qgis (>= ${binary:Version})
35+
Description: Quantum GIS - architecture-independent data
36+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
37+
and display databases of geographic information.
38+
.
39+
This package contains architecture-independent supporting data files for use
40+
with Quantum GIS.
41+
42+
Package: libqgis{QGIS_ABI}
43+
Architecture: any
44+
Depends: ${shlibs:Depends}, ${misc:Depends}
45+
Replaces: qgis (<=0.9.2rc1), libqgis-core1, libqgis-gui1, libqgis0, libqgis1
46+
Description: Quantum GIS - shared libraries
47+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
48+
and display databases of geographic information.
49+
.
50+
This package contains the shared core and gui library that provide an
51+
interface for plugins and stand-alone applications.
52+
53+
Package: libqgis-dev
54+
Architecture: any
55+
Section: libdevel
56+
Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
57+
libpq-dev, libgeos-dev (>= 3.0.0), grass-dev,
58+
libsqlite3-dev, libgsl0-dev, libproj-dev, libexpat1-dev, libqt4-core (>=4.4.0),
59+
libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0), libqt4-sql (>=4.4.0),
60+
python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0), qt4-designer (>=4.4.0)
61+
Provides: qgis-dev
62+
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
63+
Description: Quantum GIS - development files
64+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
65+
and display databases of geographic information.
66+
.
67+
This package contains the headers and libraries needed to develop plugins for
68+
Quantum GIS.
69+
70+
Package: qgis-plugin-grass
71+
Architecture: any
72+
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, grass{GRASS_ABI}
73+
Description: GRASS plugin for Quantum GIS
74+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
75+
and display databases of geographic information.
76+
.
77+
This plugin enables GRASS data access in the Quantum GIS geographic data
78+
viewer.
79+
80+
Package: qgis-plugin-grass-common
81+
Architecture: all
82+
Depends: python
83+
Description: GRASS plugin for Quantum GIS - architecture-independent data
84+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
85+
and display databases of geographic information.
86+
.
87+
This package contains architecture-independent supporting data files for use
88+
with the Quantum GIS GRASS plugin.
89+
90+
Package: python-qgis
91+
Section: python
92+
Architecture: any
93+
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
94+
Provides: ${python:Provides}
95+
XB-Python-Version: ${python:Versions}
96+
Description: Python bindings to Quantum GIS
97+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
98+
and display databases of geographic information.
99+
.
100+
This package contains the files for the Python support.
101+
102+
Package: python-qgis-common
103+
Section: python
104+
Architecture: all
105+
Provides: ${python:Provides}
106+
Depends: gdal-bin, python-gdal
107+
XB-Python-Version: ${python:Versions}
108+
Description: Python bindings to Quantum GIS - architecture-independent files
109+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
110+
and display databases of geographic information.
111+
.
112+
This package contains architecture-independent files for the Quantum GIS
113+
Python bindings.
114+

‎debian/rules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
1010
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
1111

1212
DISTRIBUTION := $(shell dpkg-parsechangelog --format rfc822 | sed -ne "s/^Distribution: //p")
13-
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"lenny squeeze hardy intrepid jaunty karmic lucid"))
13+
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"lenny squeeze hardy intrepid jaunty karmic lucid maverick"))
1414
DISTRIBUTION := sid
1515
endif
1616

@@ -30,7 +30,7 @@ CMAKE_OPTS := \
3030
-D PEDANTIC=TRUE \
3131
-D WITH_SPATIALITE=TRUE
3232

33-
ifeq (,$(findstring $(DISTRIBUTION),"squeeze lucid sid"))
33+
ifeq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick sid"))
3434
CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=TRUE
3535
else
3636
CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=FALSE

‎src/app/qgisapp.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,7 @@ void QgisApp::dropEvent( QDropEvent *event )
611611
else
612612
{
613613
QgsDebugMsg( "Adding " + fileName + " to the map canvas" );
614-
openLayer( fileName , true);
614+
openLayer( fileName, true );
615615
}
616616
}
617617
}
@@ -3408,23 +3408,23 @@ bool QgisApp::openLayer( const QString & fileName, bool allowInteractive )
34083408
QFileInfo fileInfo( fileName );
34093409

34103410
// try to load it as raster
3411-
bool ok(false);
3411+
bool ok( false );
34123412
CPLPushErrorHandler( CPLQuietErrorHandler );
34133413
if ( QgsRasterLayer::isValidRasterFileName( fileName ) )
3414+
{
3415+
ok = addRasterLayer( fileName, fileInfo.completeBaseName() );
3416+
}
3417+
else // nope - try to load it as a shape/ogr
3418+
{
3419+
if ( allowInteractive )
34143420
{
3415-
ok = (addRasterLayer( fileName, fileInfo.completeBaseName() ) != NULL);
3421+
ok = addVectorLayers( QStringList( fileName ), "System", "file" );
34163422
}
3417-
else // nope - try to load it as a shape/ogr
3423+
else
34183424
{
3419-
if (allowInteractive)
3420-
{
3421-
ok = addVectorLayers(QStringList(fileName), "System", "file");
3422-
}
3423-
else
3424-
{
3425-
ok = (addVectorLayer( fileName, fileInfo.completeBaseName(), "ogr" ) != NULL);
3426-
}
3425+
ok = addVectorLayer( fileName, fileInfo.completeBaseName(), "ogr" );
34273426
}
3427+
}
34283428

34293429
CPLPopErrorHandler();
34303430

‎src/app/qgisapp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ class QgisApp : public QMainWindow
144144
*/
145145
bool openLayer( const QString & fileName, bool allowInteractive = false );
146146
/** Open the specified file (project, vector, or raster); prompt to save
147-
previous project if necessary.
147+
previous project if necessary.
148148
Used to process a commandline argument, OpenDocument AppleEvent, or a
149149
file drag/drop event. Set interactive to true if it is ok to ask the
150150
user for information (mostly for when a vector layer has sublayers and

0 commit comments

Comments
 (0)