Skip to content
Permalink
Browse files

debian packaging: missed some downstream changes in merge

  • Loading branch information
jef-n committed Apr 13, 2014
1 parent 5bd87c8 commit 4aafc88530c3238ce386d83f16e4ab7b15ad9e6f
Showing with 80 additions and 22 deletions.
  1. +62 −22 debian/control
  2. +1 −0 debian/qgis-plugin-globe-common.links
  3. +1 −0 debian/source/format
  4. +16 −0 debian/source/include-binaries
@@ -1,11 +1,12 @@
Source: qgis
Section: science
Priority: extra
Maintainer: QGIS developers <qgis-developer@lists.osgeo.org>
Uploaders: Jürgen E. Fischer <jef@norbit.de>
Section: science
Priority: optional
Build-Depends:
bison,
cmake (>= 2.8),
debhelper (>= 5.0.51~),
debhelper (>= 7),
flex,
grass-dev,
libexpat1-dev,
@@ -14,28 +15,41 @@ Build-Depends:
libgeos-dev (>= 3.0.0),
libgsl0-dev,
libpq-dev,
libqt4-dev (>=4.4.0),
libproj-dev,
libqt4-dev (>= 4.7.0),
libqt4-opengl-dev,
libqtwebkit-dev,
libqwt5-qt4-dev | libqwt-dev,
libspatialite-dev,
libsqlite3-dev,
proj (<< 4.7.0) | libproj-dev (>= 4.7.0),
libspatialindex-dev,
pkg-config,
pyqt4-dev-tools,
python,
python-central (>=0.5),
python-dev,
python-qt4-dev (>=4.1.0),
python-qt4-dev (>= 4.1.0),
python-sip-dev (>= 4.5.0) | python-sip4-dev (>= 4.5.0) | sip4 (>= 4.5),
git-core | git,
git,
txt2tags,
doxygen
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.4
XS-Python-Version: current
Vcs-Browser: https://github.com/qgis/QGIS/
Vcs-Git: https://github.com/qgis/QGIS.git
Homepage: http://qgis.org/

Package: qgis
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
Recommends: qgis-plugin-grass, python-qgis
Depends:
${shlibs:Depends},
${misc:Depends},
qgis-providers (= ${binary:Version}),
qgis-common (= ${source:Version})
Recommends:
qgis-plugin-grass,
python-qgis
Suggests: gpsbabel
Conflicts: uim-qt3
Description: Geographic Information System (GIS)
@@ -49,17 +63,26 @@ Description: Geographic Information System (GIS)

Package: qgis-common
Architecture: all
Depends: ${misc:Depends}
Description: QGIS - architecture-independent data
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This package contains architecture-independent supporting data files for use
This package contains architecture-independent supporting data files for use
with QGIS.

Package: libqgis1.8.0
Package: libqgis{QGIS_ABI}
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: qgis (<=0.9.2rc1), libqgis-core1, libqgis-gui1, libqgis0, libqgis1
Section: libs
Depends:
${shlibs:Depends},
${misc:Depends}
Replaces:
qgis (<=0.9.2rc1),
libqgis-core1,
libqgis-gui1,
libqgis0,
libqgis1
Description: QGIS - shared libraries
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
@@ -115,9 +138,14 @@ Description: GRASS plugin for QGIS - architecture-independent data
with the QGIS GRASS plugin.

Package: python-qgis
Section: python
Architecture: any
Depends: python-qt4 (>=4.1.0), python-sip4 (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
Section: python
Depends:
python-qt4,
python-sip4,
python-qgis-common (= ${source:Version}),
${shlibs:Depends},
${misc:Depends}
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Description: Python bindings to QGIS
@@ -127,10 +155,13 @@ Description: Python bindings to QGIS
This package contains the files for the Python support.

Package: python-qgis-common
Section: python
Architecture: all
Section: python
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal, python-matplotlib
Depends:
gdal-bin,
python-gdal,
python-matplotlib
XB-Python-Version: ${python:Versions}
Description: Python bindings to QGIS - architecture-independent files
QGIS is a Geographic Information System (GIS) which manages, analyzes and
@@ -141,9 +172,14 @@ Description: Python bindings to QGIS - architecture-independent files

Package: qgis-providers
Architecture: any
Depends: qgis-providers-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
Replaces: qgis (<= 1.6)
Pre-Depends: ${misc:Pre-Depends}
Depends:
qgis-providers-common (= ${source:Version}),
libqt4-sql-sqlite,
${shlibs:Depends},
${misc:Depends}
Breaks: qgis (<= 1.6)
Replaces: qgis (<= 1.6)
Description: collection of data providers to QGIS
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
@@ -152,6 +188,7 @@ Description: collection of data providers to QGIS

Package: qgis-providers-common
Architecture: all
Depends: ${misc:Depends}
Replaces: qgis-common (<= 1.6)
Breaks: qgis-common (<= 1.6)
Description: collection of data providers to QGIS - architecture-independent files
@@ -162,10 +199,13 @@ Description: collection of data providers to QGIS - architecture-independent fil

Package: qgis-mapserver
Architecture: any
Depends: qgis-providers (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Depends:
qgis-providers (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Description: QGIS mapserver
QGIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This package contains the QGIS mapserver.

@@ -0,0 +1 @@
usr/share/osgearth/data/world.tif usr/share/qgis/globe/world.tif
@@ -0,0 +1 @@
3.0 (quilt)
@@ -0,0 +1,16 @@
debian/qgis-icon8x8.png
debian/qgis-icon16x16.png
debian/qgis-icon22x22.png
debian/qgis-icon24x24.png
debian/qgis-icon32x32.png
debian/qgis-icon36x36.png
debian/qgis-icon42x42.png
debian/qgis-icon48x48.png
debian/qgis-icon64x64.png
debian/qgis-icon72x72.png
debian/qgis-icon80x80.png
debian/qgis-icon96x96.png
debian/qgis-icon128x128.png
debian/qgis-icon192x192.png
debian/qgis-icon256x256.png
debian/qgis-icon512x512.png

0 comments on commit 4aafc88

Please sign in to comment.
You can’t perform that action at this time.