update debian packaging to qt5/python3

This commit is contained in:
Juergen E. Fischer 2016-05-27 23:41:01 +02:00
parent 31df84aa6b
commit 724ea44caf
13 changed files with 338 additions and 229 deletions

3
debian/changelog vendored
View File

@ -1,6 +1,7 @@
qgis (2.999.0) UNRELEASED; urgency=medium qgis (2.99.0) UNRELEASED; urgency=medium
* New development version 2.999 after branch of 2.16 * New development version 2.999 after branch of 2.16
* move to qt5/python3
-- Jürgen E. Fischer <jef@norbit.de> Fri, 08 Jul 2016 14:12:36 +0200 -- Jürgen E. Fischer <jef@norbit.de> Fri, 08 Jul 2016 14:12:36 +0200

5
debian/compat.in vendored
View File

@ -1,3 +1,2 @@
#stretch sid jessie trusty wily xenial#9 #stretch sid jessie trusty xenial#9
#wheezy jessie#8 #jessie#8
#precise#7

247
debian/control vendored
View File

@ -16,21 +16,18 @@ Build-Depends:
libgsl0-dev, libgsl0-dev,
libpq-dev, libpq-dev,
libproj-dev, libproj-dev,
libqt4-dev (>= 4.7.0), qtbase5-dev,
libqt4-opengl-dev, libqca-qt5-2-dev,
libqca2-dev, libqca2-plugin-ossl, libqwt-qt5-dev,
libqtwebkit-dev,
libqwt5-qt4-dev | libqwt-dev,
libspatialite-dev, libspatialite-dev,
libsqlite3-dev, libsqlite3-dev,
libspatialindex-dev, libspatialindex-dev,
pkg-config, pkg-config,
pyqt4-dev-tools, pyqt5-dev,
python, python3-dev,
python-central (>=0.5) | python-all-dev, python3-all-dev,
python-dev, python3-sip,
python-qt4-dev (>= 4.1.0), python3-pyqt5,
python-sip-dev (>= 4.5.0) | python-sip4-dev (>= 4.5.0) | sip4 (>= 4.5),
libosgearth-dev, libosgearth-dev,
git, git,
txt2tags, txt2tags,
@ -47,9 +44,11 @@ Architecture: any
Depends: Depends:
${shlibs:Depends}, ${shlibs:Depends},
${misc:Depends}, ${misc:Depends},
python-qgis (= ${binary:Version}),
qgis-providers (= ${binary:Version}), qgis-providers (= ${binary:Version}),
qgis-common (= ${source:Version}) qgis-common (= ${source:Version})
Recommends: Recommends:
qgis-plugin-globe,
qgis-plugin-grass, qgis-plugin-grass,
python-qgis python-qgis
Suggests: gpsbabel Suggests: gpsbabel
@ -65,7 +64,8 @@ Description: Geographic Information System (GIS)
Package: qgis-common Package: qgis-common
Architecture: all Architecture: all
Depends: ${misc:Depends} Depends:
${misc:Depends}
Description: QGIS - architecture-independent data Description: QGIS - architecture-independent data
QGIS is a Geographic Information System (GIS) which manages, analyzes and QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information. display databases of geographic information.
@ -73,85 +73,115 @@ Description: QGIS - architecture-independent data
This package contains architecture-independent supporting data files for use This package contains architecture-independent supporting data files for use
with QGIS. with QGIS.
Package: libqgis-core2.3.0 Package: libqgis-app3.0.0
Architecture: any
Section: libs
Depends:
${shlibs:Depends},
${misc:Depends}
Replaces: libqgis{QGIS_ABI}
Description: QGIS - shared app library
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This package contains the shared app library.
Package: libqgis-core3.0.0
Architecture: any Architecture: any
Section: libs Section: libs
Depends: Depends:
${shlibs:Depends}, ${shlibs:Depends},
${misc:Depends} ${misc:Depends}
Replaces: libqgis2.3.0
Description: QGIS - shared core library Description: QGIS - shared core library
QGIS is a Geographic Information System (GIS) which manages, analyzes and QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information. display databases of geographic information.
. .
This package contains the shared core library. This package contains the shared core library.
Package: libqgis-gui2.3.0 Package: libqgis-gui3.0.0
Architecture: any Architecture: any
Section: libs Section: libs
Depends: Depends:
${shlibs:Depends}, ${shlibs:Depends},
${misc:Depends} ${misc:Depends}
Replaces:
libqgis2.3.0
Description: QGIS - shared gui library Description: QGIS - shared gui library
QGIS is a Geographic Information System (GIS) which manages, analyzes and QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information. display databases of geographic information.
. .
This package contains the shared gui library. This package contains the shared gui library.
Package: libqgis-analysis2.3.0 Package: libqgis-analysis3.0.0
Architecture: any Architecture: any
Section: libs Section: libs
Depends: Depends:
${shlibs:Depends}, ${shlibs:Depends},
${misc:Depends} ${misc:Depends}
Replaces: libqgis2.3.0
Description: QGIS - shared analysis library Description: QGIS - shared analysis library
QGIS is a Geographic Information System (GIS) which manages, analyzes and QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information. display databases of geographic information.
. .
This package contains the shared analysis library. This package contains the shared analysis library.
Package: libqgis-networkanalysis2.3.0 Package: libqgis-networkanalysis3.0.0
Architecture: any Architecture: any
Section: libs Section: libs
Depends: Depends:
${shlibs:Depends}, ${shlibs:Depends},
${misc:Depends} ${misc:Depends}
Replaces: libqgis2.3.0
Description: QGIS - shared network analysis library Description: QGIS - shared network analysis library
QGIS is a Geographic Information System (GIS) which manages, analyzes and QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information. display databases of geographic information.
. .
This package contains the shared network analysis library. This package contains the shared network analysis library.
Package: libqgisgrass2.3.0 Package: libqgisgrass3.0.0
Architecture: any Architecture: any
Section: libs Section: libs
Depends: Depends:
${shlibs:Depends}, ${shlibs:Depends},
${misc:Depends} ${misc:Depends}
Replaces: libqgis2.3.0
Description: QGIS - shared grass library Description: QGIS - shared grass library
QGIS is a Geographic Information System (GIS) which manages, analyzes and QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information. display databases of geographic information.
. .
This package contains the shared grass library. This package contains the shared grass library.
Package: libqgispython2.3.0 Package: libqgispython3.0.0
Architecture: any Architecture: any
Section: libs Section: libs
Depends: Depends:
${shlibs:Depends}, ${shlibs:Depends},
${misc:Depends} ${misc:Depends}
Replaces: libqgis2.3.0 Replaces: libqgis3.0.0
Description: QGIS - shared Python library Description: QGIS - shared Python library
QGIS is a Geographic Information System (GIS) which manages, analyzes and QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information. display databases of geographic information.
. .
This package contains the shared Python library. This package contains the shared Python library.
Package: libqgis-customwidgets
Architecture: any
Depends:
qttools5-dev-tools,
${shlibs:Depends},
${misc:Depends}
Description: QGIS custom widgets for Qt Designer
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This package contains a library to use specific QGIS widgets in Qt Designer.
Package: libqgis-server{QGIS_ABI}
Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends}
Description: QGIS - shared server library
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This package contains the shared server library.
Package: libqgis-dev Package: libqgis-dev
Architecture: any Architecture: any
Section: libdevel Section: libdevel
@ -163,14 +193,31 @@ Depends:
libgsl0-dev, libgsl0-dev,
libpq-dev, libpq-dev,
libproj-dev, libproj-dev,
libqgis1.8.0 (= ${binary:Version}), libqgis-app3.0.0 (= ${binary:Version}),
libqt4-dev (>=4.4.0), libqgis-core3.0.0 (= ${binary:Version}),
libqgis-gui3.0.0 (= ${binary:Version}),
libqgis-analysis3.0.0 (= ${binary:Version}),
libqgis-networkanalysis3.0.0 (= ${binary:Version}),
libqgisgrass7.0.4-3.0.0 (= ${binary:Version}),
libqgispython3.0.0 (= ${binary:Version}),
libsqlite3-dev, libsqlite3-dev,
python-qt4 (>=4.1.0), qtbase5-dev, python3-pyqt5, qttools5-dev,
python-qt4-dev (>=4.1.0), libqt5svg5-dev, pyqt5.qsci-dev,
qt4-designer (>=4.4.0) libqca-qt5-2-dev,
python3-dev,
libqt5scintilla2-dev,
libqt5webkit5-dev,
libqca-qt5-2-dev,
libqwt-qt5-dev,
qtscript5-dev,
qtpositioning5-dev,
pyqt5-dev-tools,
python3-pyqt5,
python3-pyqt5.qtsql,
python3-pyqt5.qsci,
${misc:Depends}
Recommends: libqgis-customwidgets
Provides: qgis-dev Provides: qgis-dev
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
Description: QGIS - development files Description: QGIS - development files
QGIS is a Geographic Information System (GIS) which manages, analyzes and QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information. display databases of geographic information.
@ -178,20 +225,59 @@ Description: QGIS - development files
This package contains the headers and libraries needed to develop plugins for This package contains the headers and libraries needed to develop plugins for
QGIS. QGIS.
Package: qgis-dbg
Architecture: any
Section: debug
Priority: extra
Depends:
libqgis-app{QGIS_ABI} (= ${binary:Version}),
libqgis-core{QGIS_ABI} (= ${binary:Version}),
libqgis-gui{QGIS_ABI} (= ${binary:Version}),
libqgis-analysis{QGIS_ABI} (= ${binary:Version}),
libqgis-networkanalysis{QGIS_ABI} (= ${binary:Version}),
libqgisgrass{GRASSVER}-{QGIS_ABI} (= ${binary:Version}),
libqgispython{QGIS_ABI} (= ${binary:Version}),
${misc:Depends}
Suggests: gdb
Description: QGIS - debugging symbols
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This package contains debugging symbols.
Package: qgis-provider-grass
Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends}
Description: GRASS provider for QGIS
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This provider enables GRASS data access in QGIS.
Package: qgis-plugin-grass Package: qgis-plugin-grass
Architecture: any Architecture: any
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, grass Depends:
qgis (= ${binary:Version}),
qgis-plugin-grass-common (= ${source:Version}),
qgis-provider-grass (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends},
grass-core
Description: GRASS plugin for QGIS Description: GRASS plugin for QGIS
QGIS is a Geographic Information System (GIS) which manages, analyzes and QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information. display databases of geographic information.
. .
This plugin enables GRASS data access in the QGIS geographic data viewer. This plugin enables GRASS data access in QGIS.
Package: qgis-plugin-grass-common Package: qgis-plugin-grass-common
Architecture: all Architecture: all
Depends: python Depends:
Replaces: qgis-common (<< 1.5) ${python:Depends},
${misc:Depends}
Breaks: qgis-common (<< 1.5) Breaks: qgis-common (<< 1.5)
Replaces: qgis-common (<< 1.5)
Description: GRASS plugin for QGIS - architecture-independent data Description: GRASS plugin for QGIS - architecture-independent data
QGIS is a Geographic Information System (GIS) which manages, analyzes and QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information. display databases of geographic information.
@ -199,17 +285,59 @@ Description: GRASS plugin for QGIS - architecture-independent data
This package contains architecture-independent supporting data files for use This package contains architecture-independent supporting data files for use
with the QGIS GRASS plugin. with the QGIS GRASS plugin.
Package: qgis-plugin-globe
Architecture: any
Depends:
qgis (= ${binary:Version}),
qgis-plugin-globe-common (= ${source:Version}),
openscenegraph-plugin-osgearth,
${shlibs:Depends},
${misc:Depends}
Description: OSG globe plugin for QGIS
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This plugin enables 3D viewing using OSG globe in the QGIS.
Package: qgis-plugin-globe-common
Architecture: all
Depends:
osgearth-data,
${misc:Depends}
Description: OSG globe plugin for 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
with the QGIS GLOBE plugin.
Package: python-qgis Package: python-qgis
Architecture: any Architecture: any
Section: python Section: python
Depends: Depends:
python-qt4, python3-pyqt5,
python-sip, python3-pyqt5.qtsql,
python3-sip,
python-qgis-common (= ${source:Version}), python-qgis-common (= ${source:Version}),
python3-psycopg2,
python3-pyqt5.qsci,
python3-httplib2,
python3-jinja2,
python3-markupsafe,
python3-pygments,
python3-requests,
python3-dateutil,
python3-tz,
python3-six,
python3-yaml,
python3-future,
libqgispython3.0.0,
${shlibs:Depends}, ${shlibs:Depends},
${misc:Depends} ${python:Depends},
${misc:Depends},
${sip:Depends}
Provides: ${python:Provides} Provides: ${python:Provides}
XB-Python-Version: ${python:Versions} Recommends: liblwgeom-dev
Description: Python bindings to QGIS Description: Python bindings to QGIS
QGIS is a Geographic Information System (GIS) which manages, analyzes and QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information. display databases of geographic information.
@ -222,8 +350,11 @@ Section: python
Provides: ${python:Provides} Provides: ${python:Provides}
Depends: Depends:
gdal-bin, gdal-bin,
python-gdal, python3-gdal,
python-matplotlib python3-matplotlib,
python3-shapely,
libqgis-customwidgets,
${misc:Depends}
XB-Python-Version: ${python:Versions} XB-Python-Version: ${python:Versions}
Description: Python bindings to QGIS - architecture-independent files Description: Python bindings to QGIS - architecture-independent files
QGIS is a Geographic Information System (GIS) which manages, analyzes and QGIS is a Geographic Information System (GIS) which manages, analyzes and
@ -237,7 +368,7 @@ Architecture: any
Pre-Depends: ${misc:Pre-Depends} Pre-Depends: ${misc:Pre-Depends}
Depends: Depends:
qgis-providers-common (= ${source:Version}), qgis-providers-common (= ${source:Version}),
libqt4-sql-sqlite, libqt5sql5-sqlite, libqca-qt5-2-plugins,
${shlibs:Depends}, ${shlibs:Depends},
${misc:Depends} ${misc:Depends}
Breaks: qgis (<= 1.6) Breaks: qgis (<= 1.6)
@ -251,8 +382,8 @@ Description: collection of data providers to QGIS
Package: qgis-providers-common Package: qgis-providers-common
Architecture: all Architecture: all
Depends: ${misc:Depends} Depends: ${misc:Depends}
Replaces: qgis-common (<= 1.6)
Breaks: qgis-common (<= 1.6) Breaks: qgis-common (<= 1.6)
Replaces: qgis-common (<= 1.6)
Description: collection of data providers to QGIS - architecture-independent files Description: collection of data providers to QGIS - architecture-independent files
QGIS is a Geographic Information System (GIS) which manages, analyzes and QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information. display databases of geographic information.
@ -261,26 +392,40 @@ Description: collection of data providers to QGIS - architecture-independent fil
Package: qgis-server Package: qgis-server
Architecture: any Architecture: any
Provides: qgis-mapserver
Replaces: qgis-mapserver
Depends: Depends:
qgis-providers (= ${binary:Version}), qgis-providers (= ${binary:Version}),
${shlibs:Depends}, ${shlibs:Depends},
${misc:Depends} ${misc:Depends}
Conflicts: qgis-mapserver
Provides: qgis-mapserver
Replaces: qgis-mapserver
Description: QGIS server providing various OGC services Description: QGIS server providing various OGC services
QGIS is a Geographic Information System (GIS) which manages, analyzes and QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information. display databases of geographic information.
. .
This package contains the QGIS server. This package contains the QGIS server.
Package: libqgis-customwidgets Package: qgis-api-doc
Architecture: any Architecture: all
Section: doc
Depends: Depends:
qt4-designer, libjs-jquery,
${shlibs:Depends},
${misc:Depends} ${misc:Depends}
Description: QGIS custom widgets for Qt Designer Recommends:
qt5-doc-html
Description: QGIS API documentation
QGIS is a Geographic Information System (GIS) which manages, analyzes and QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information. display databases of geographic information.
. .
This package contains a library to use specific QGIS widgets in Qt Designer. This package contains the QGIS API documentation.
#oracle#Package: qgis-oracle-provider
#oracle#Architecture: any
#oracle#Depends: ${shlibs:Depends}, ${misc:Depends}
#oracle#Section: contrib/database
#oracle#Description: QGIS oracle provider
#oracle# QGIS is a Geographic Information System (GIS) which manages, analyzes and
#oracle# display databases of geographic information.
#oracle# .
#oracle# This package contains the QGIS oracle provider.
#oracle#

222
debian/control.in vendored
View File

@ -6,72 +6,54 @@ Priority: optional
Build-Depends: Build-Depends:
bison, bison,
cmake (>= 2.8), cmake (>= 2.8),
#wily# cmake (<< 3.3.2), #sid stretch jessie trusty xenial# debhelper (>= 9),
#sid stretch jessie wheezy trusty wily xenial# debhelper (>= 9), #sid stretch jessie trusty xenial# dh-python,
#sid stretch jessie trusty wily xenial# dh-python,
#precise# debhelper (>= 7),
flex, flex,
grass-dev, grass-dev,
libexpat1-dev, libexpat1-dev,
libfcgi-dev, libfcgi-dev,
#sid stretch jessie trusty wily xenial# libgdal-dev (>= 1.10.1-0~), #sid stretch jessie trusty xenial# libgdal-dev (>= 1.10.1-0~),
#precise# libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
#wheezy# libgdal1-dev,
gdal-bin,
python-gdal,
libgeos-dev (>= 3.0.0), libgeos-dev (>= 3.0.0),
#jessie wheezy precise trusty wily# libgsl0-dev, #jessie trusty# libgsl0-dev,
#sid stretch xenial# libgsl-dev, #sid stretch xenial# libgsl-dev,
libpq-dev, libpq-dev,
libproj-dev, libproj-dev,
libqt4-dev (>= 4.7.0), qtbase5-dev,
libqt4-opengl-dev, libqca-qt5-2-dev,
libqca2-dev, libqwt-qt5-dev,
libqca2-plugin-ossl,
#wheezy jessie precise trusty utopic vivid wily xenial# libqtwebkit-dev,
#stretch jessie wheezy# libqwt-dev,
#precise trusty wily xenial sid# libqwt5-qt4-dev,
#sid stretch jessie wheezy trusty wily xenial# libqjson-dev,
libspatialite-dev, libspatialite-dev,
libsqlite3-dev, libsqlite3-dev,
libspatialindex-dev, libspatialindex-dev,
pkg-config, pkg-config,
pyqt4-dev-tools, pyqt5-dev,
python-qscintilla2, python3-dev,
python-qt4 (>= 4.1.0), python3-all-dev,
python-qt4-dev, python3-sip,
python-qt4-sql, python3-pyqt5,
python-yaml, python-mock,
#stretch sid wily xenial# python-future,
#precise wheezy# python,
#precise# python-central (>= 0.5),
#wheezy# python-dev,
#sid stretch jessie trusty wily xenial# python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
#sid stretch jessie wily xenial# pyqt4.qsci-dev,
#sid stretch jessie trusty wily xenial# python-pyspatialite,
#sid wheezy jessie stretch trusty wily xenial# python-nose2,
python-sip (>= 4.5.0),
python-sip-dev (>= 4.5.0),
libosgearth-dev, libosgearth-dev,
libopenscenegraph-dev,
libqscintilla2-dev,
git, git,
doxygen,
graphviz,
txt2tags, txt2tags,
doxygen,
gdal-bin,
spawn-fcgi, lighttpd, poppler-utils,
graphviz,
xvfb, xauth, xvfb, xauth,
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable, xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
libqt5svg5-dev, libqt5xmlpatterns5-dev,
pyqt5.qsci-dev,
libqt5webkit5-dev, qttools5-dev, qtscript5-dev,
libqt5scintilla2-dev, pyqt5-dev-tools, python3-pyqt5.qtsql, qtpositioning5-dev, libqt5opengl5-dev,
python3-pyqt5.qsci,
pyqt5.qsci-dev, python3-nose2,
python3-gdal, python3-yaml, python3-mock, python3-psycopg2, python3-future, python3-termcolor,
#oracle# oracle-instantclient12.1-devel, #oracle# oracle-instantclient12.1-devel,
spawn-fcgi, lighttpd, poppler-utils, locales, qt4-doc-html, locales
qt4-dev-tools,
libqt4-sql-sqlite, python-psycopg2
Build-Conflicts: libqgis-dev, qgis-dev Build-Conflicts: libqgis-dev, qgis-dev
#sid stretch xenial#Standards-Version: 3.9.7 #sid stretch xenial#Standards-Version: 3.9.7
#jessie wily#Standards-Version: 3.9.6 #jessie#Standards-Version: 3.9.6
#wheezy#Standards-Version: 3.9.3 #trusty#Standards-Version: 3.8.4
#precise trusty#Standards-Version: 3.8.4
#sid stretch jessie#X-Python-Version: >= 2.7, << 2.8 #sid stretch jessie#X-Python-Version: >= 2.7, << 2.8
#wheezy precise trusty wily xenial#XS-Python-Version: current #trusty xenial#XS-Python-Version: current
Vcs-Browser: https://github.com/qgis/QGIS/ Vcs-Browser: https://github.com/qgis/QGIS/
Vcs-Git: https://github.com/qgis/QGIS.git Vcs-Git: https://github.com/qgis/QGIS.git
Homepage: http://qgis.org/ Homepage: http://qgis.org/
@ -87,7 +69,7 @@ Depends:
Recommends: Recommends:
#globe# qgis-plugin-globe, #globe# qgis-plugin-globe,
qgis-plugin-grass, qgis-plugin-grass,
qgis-provider-grass python-qgis
Suggests: gpsbabel Suggests: gpsbabel
Conflicts: uim-qt3 Conflicts: uim-qt3
Description: Geographic Information System (GIS) Description: Geographic Information System (GIS)
@ -131,7 +113,6 @@ Section: libs
Depends: Depends:
${shlibs:Depends}, ${shlibs:Depends},
${misc:Depends} ${misc:Depends}
Replaces: libqgis{QGIS_ABI}
Description: QGIS - shared core library Description: QGIS - shared core library
QGIS is a Geographic Information System (GIS) which manages, analyzes and QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information. display databases of geographic information.
@ -144,7 +125,6 @@ Section: libs
Depends: Depends:
${shlibs:Depends}, ${shlibs:Depends},
${misc:Depends} ${misc:Depends}
Replaces: libqgis{QGIS_ABI}
Description: QGIS - shared gui library Description: QGIS - shared gui library
QGIS is a Geographic Information System (GIS) which manages, analyzes and QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information. display databases of geographic information.
@ -157,7 +137,6 @@ Section: libs
Depends: Depends:
${shlibs:Depends}, ${shlibs:Depends},
${misc:Depends} ${misc:Depends}
Replaces: libqgis{QGIS_ABI}
Description: QGIS - shared analysis library Description: QGIS - shared analysis library
QGIS is a Geographic Information System (GIS) which manages, analyzes and QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information. display databases of geographic information.
@ -170,7 +149,6 @@ Section: libs
Depends: Depends:
${shlibs:Depends}, ${shlibs:Depends},
${misc:Depends} ${misc:Depends}
Replaces: libqgis{QGIS_ABI}
Description: QGIS - shared network analysis library Description: QGIS - shared network analysis library
QGIS is a Geographic Information System (GIS) which manages, analyzes and QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information. display databases of geographic information.
@ -183,7 +161,6 @@ Section: libs
Depends: Depends:
${shlibs:Depends}, ${shlibs:Depends},
${misc:Depends} ${misc:Depends}
Replaces: libqgis{QGIS_ABI}, libqgisgrass{QGIS_ABI}
Description: QGIS - shared grass library Description: QGIS - shared grass library
QGIS is a Geographic Information System (GIS) which manages, analyzes and QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information. display databases of geographic information.
@ -206,49 +183,35 @@ Description: QGIS - shared Python library
Package: libqgis-customwidgets Package: libqgis-customwidgets
Architecture: any Architecture: any
Depends: Depends:
qt4-designer, qttools5-dev-tools,
${shlibs:Depends}, ${shlibs:Depends},
${misc:Depends} ${misc:Depends}
Replaces:
libqgis-customwidgets2.4.0,
libqgis-customwidgets2.6.0,
libqgis-customwidgets2.6.1
Conflicts:
libqgis-customwidgets2.4.0,
libqgis-customwidgets2.6.0,
libqgis-customwidgets2.6.1
Provides:
libqgis-customwidgets2.4.0,
libqgis-customwidgets2.6.0,
libqgis-customwidgets2.6.1
Description: QGIS custom widgets for Qt Designer Description: QGIS custom widgets for Qt Designer
QGIS is a Geographic Information System (GIS) which manages, analyzes and QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information. display databases of geographic information.
. .
This package contains a library to use specific QGIS widgets in Qt Designer. This package contains a library to use specific QGIS widgets in Qt Designer.
Package: libqgis-server{QGIS_ABI} #server#Package: libqgis-server{QGIS_ABI}
Architecture: any #server#Architecture: any
Depends: #server#Depends:
${shlibs:Depends}, #server# ${shlibs:Depends},
${misc:Depends} #server# ${misc:Depends}
Description: QGIS - shared server library #server#Description: QGIS - shared server library
QGIS is a Geographic Information System (GIS) which manages, analyzes and #server# QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information. #server# display databases of geographic information.
. #server# .
This package contains the shared server library. #server# This package contains the shared server library.
#server#
Package: libqgis-dev Package: libqgis-dev
Architecture: any Architecture: any
Section: libdevel Section: libdevel
Depends: Depends:
grass-dev, grass-dev,
libexpat1-dev, libexpat1-dev,
#sid stretch jessie trusty wily xenial# libgdal-dev (>= 1.10.1-0~), #sid stretch jessie trusty xenial# libgdal-dev (>= 1.10.1-0~),
#precise# libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
#wheezy# libgdal1-dev,
libgeos-dev (>= 3.0.0), libgeos-dev (>= 3.0.0),
#jessie wheezy precise trusty wily# libgsl0-dev, #jessie trusty# libgsl0-dev,
#sid stretch xenial# libgsl-dev, #sid stretch xenial# libgsl-dev,
libpq-dev, libpq-dev,
libproj-dev, libproj-dev,
@ -257,20 +220,26 @@ Depends:
libqgis-gui{QGIS_ABI} (= ${binary:Version}), libqgis-gui{QGIS_ABI} (= ${binary:Version}),
libqgis-analysis{QGIS_ABI} (= ${binary:Version}), libqgis-analysis{QGIS_ABI} (= ${binary:Version}),
libqgis-networkanalysis{QGIS_ABI} (= ${binary:Version}), libqgis-networkanalysis{QGIS_ABI} (= ${binary:Version}),
libqgis-server{QGIS_ABI} (= ${binary:Version}),
libqgisgrass{GRASSVER}-{QGIS_ABI} (= ${binary:Version}), libqgisgrass{GRASSVER}-{QGIS_ABI} (= ${binary:Version}),
libqgispython{QGIS_ABI} (= ${binary:Version}), libqgispython{QGIS_ABI} (= ${binary:Version}),
libqt4-dev (>= 4.7.0),
libsqlite3-dev, libsqlite3-dev,
python-qt4 (>= 4.1.0), qtbase5-dev, python3-pyqt5, qttools5-dev,
python-qt4-dev (>= 4.1.0), libqt5svg5-dev, pyqt5.qsci-dev,
python-qt4-sql, libqca-qt5-2-dev,
qt4-designer, python3-dev,
libqt5scintilla2-dev,
libqt5webkit5-dev,
libqca-qt5-2-dev,
libqwt-qt5-dev,
qtscript5-dev,
qtpositioning5-dev,
pyqt5-dev-tools,
python3-pyqt5,
python3-pyqt5.qtsql,
python3-pyqt5.qsci,
${misc:Depends} ${misc:Depends}
Recommends: libqgis-customwidgets Recommends: libqgis-customwidgets
Provides: qgis-dev Provides: qgis-dev
Replaces:
libqgis1-dev
Description: QGIS - development files Description: QGIS - development files
QGIS is a Geographic Information System (GIS) which manages, analyzes and QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information. display databases of geographic information.
@ -288,7 +257,6 @@ Depends:
libqgis-gui{QGIS_ABI} (= ${binary:Version}), libqgis-gui{QGIS_ABI} (= ${binary:Version}),
libqgis-analysis{QGIS_ABI} (= ${binary:Version}), libqgis-analysis{QGIS_ABI} (= ${binary:Version}),
libqgis-networkanalysis{QGIS_ABI} (= ${binary:Version}), libqgis-networkanalysis{QGIS_ABI} (= ${binary:Version}),
libqgis-server{QGIS_ABI} (= ${binary:Version}),
libqgisgrass{GRASSVER}-{QGIS_ABI} (= ${binary:Version}), libqgisgrass{GRASSVER}-{QGIS_ABI} (= ${binary:Version}),
libqgispython{QGIS_ABI} (= ${binary:Version}), libqgispython{QGIS_ABI} (= ${binary:Version}),
${misc:Depends} ${misc:Depends}
@ -318,10 +286,7 @@ Depends:
qgis-provider-grass (= ${binary:Version}), qgis-provider-grass (= ${binary:Version}),
${shlibs:Depends}, ${shlibs:Depends},
${misc:Depends}, ${misc:Depends},
#!precise# grass-core grass-core
#precise# grass
Replaces: qgis-provider-grass (<< 1:2.11.0+git20151002)
Conflicts: qgis-provider-grass (<< 1:2.11.0+git20151002)
Description: GRASS plugin for QGIS Description: GRASS plugin for QGIS
QGIS is a Geographic Information System (GIS) which manages, analyzes and QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information. display databases of geographic information.
@ -372,23 +337,22 @@ Package: python-qgis
Architecture: any Architecture: any
Section: python Section: python
Depends: Depends:
python-qt4, python3-pyqt5,
python-qt4-sql, python3-pyqt5.qtsql,
python-sip, python3-sip,
python-qgis-common (= ${source:Version}), python-qgis-common (= ${source:Version}),
python-psycopg2, python3-psycopg2,
python-qscintilla2, python3-pyqt5.qsci,
python-httplib2, python3-httplib2,
python-jinja2, python3-jinja2,
python-markupsafe, python3-markupsafe,
python-pygments, python3-pygments,
python-requests, python3-requests,
python-dateutil, python3-dateutil,
python-tz, python3-tz,
python-six, python3-six,
python-yaml, python3-yaml,
#stretch sid wily xenial# python-future, python3-future,
#sid stretch jessie trusty wily xenial# python-pyspatialite,
libqgispython{QGIS_ABI}, libqgispython{QGIS_ABI},
${shlibs:Depends}, ${shlibs:Depends},
${python:Depends}, ${python:Depends},
@ -396,7 +360,6 @@ Depends:
${sip:Depends} ${sip:Depends}
Provides: ${python:Provides} Provides: ${python:Provides}
Recommends: liblwgeom-dev Recommends: liblwgeom-dev
#wheezy precise#XB-Python-Version: ${python:Versions}
Description: Python bindings to QGIS Description: Python bindings to QGIS
QGIS is a Geographic Information System (GIS) which manages, analyzes and QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information. display databases of geographic information.
@ -409,9 +372,9 @@ Section: python
Provides: ${python:Provides} Provides: ${python:Provides}
Depends: Depends:
gdal-bin, gdal-bin,
python-gdal, python3-gdal,
python-matplotlib, python3-matplotlib,
python-shapely, python3-shapely,
libqgis-customwidgets, libqgis-customwidgets,
${misc:Depends} ${misc:Depends}
XB-Python-Version: ${python:Versions} XB-Python-Version: ${python:Versions}
@ -427,8 +390,7 @@ Architecture: any
Pre-Depends: ${misc:Pre-Depends} Pre-Depends: ${misc:Pre-Depends}
Depends: Depends:
qgis-providers-common (= ${source:Version}), qgis-providers-common (= ${source:Version}),
libqt4-sql-sqlite, libqt5sql5-sqlite, libqca-qt5-2-plugins,
libqca2-plugin-ossl,
${shlibs:Depends}, ${shlibs:Depends},
${misc:Depends} ${misc:Depends}
Breaks: qgis (<= 1.6) Breaks: qgis (<= 1.6)
@ -450,21 +412,21 @@ Description: collection of data providers to QGIS - architecture-independent fil
. .
This package contains architecture-independent files for the QGIS providers. This package contains architecture-independent files for the QGIS providers.
Package: qgis-server #server#Package: qgis-server
Architecture: any #server#Architecture: any
Depends: #server#Depends:
qgis-providers (= ${binary:Version}), #server# qgis-providers (= ${binary:Version}),
${shlibs:Depends}, #server# ${shlibs:Depends},
${misc:Depends} #server# ${misc:Depends}
Conflicts: qgis-mapserver #server#Conflicts: qgis-mapserver
Provides: qgis-mapserver #server#Provides: qgis-mapserver
Replaces: qgis-mapserver #server#Replaces: qgis-mapserver
Description: QGIS server providing various OGC services #server#Description: QGIS server providing various OGC services
QGIS is a Geographic Information System (GIS) which manages, analyzes and #server# QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information. #server# display databases of geographic information.
. #server# .
This package contains the QGIS server. #server# This package contains the QGIS server.
#server#
Package: qgis-api-doc Package: qgis-api-doc
Architecture: all Architecture: all
Section: doc Section: doc
@ -472,7 +434,7 @@ Depends:
libjs-jquery, libjs-jquery,
${misc:Depends} ${misc:Depends}
Recommends: Recommends:
qt4-doc-html qt5-doc-html
Description: QGIS API documentation Description: QGIS API documentation
QGIS is a Geographic Information System (GIS) which manages, analyzes and QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information. display databases of geographic information.

View File

@ -1 +1 @@
{QT_PLUGIN_DIR}/designer/libqgis_customwidgets.so* {QT_PLUGINS_DIR}/designer/libqgis_customwidgets.so*

View File

@ -4,7 +4,7 @@ usr/lib/libqgis_core.so
usr/lib/libqgis_gui.so usr/lib/libqgis_gui.so
usr/lib/libqgis_analysis.so usr/lib/libqgis_analysis.so
usr/lib/libqgis_networkanalysis.so usr/lib/libqgis_networkanalysis.so
usr/lib/libqgis_server.so #server#usr/lib/libqgis_server.so
usr/lib/libqgisgrass{GRASSVER}.so usr/lib/libqgisgrass{GRASSVER}.so
usr/lib/libqgispython.so usr/lib/libqgispython.so
usr/share/qgis/FindQGIS.cmake usr/share/qgis/FindQGIS.cmake

View File

@ -1,2 +1,2 @@
usr/share/qgis/python/* usr/share/qgis/python/*
usr/lib/python*/*-packages/PyQt4/uic/widget-plugins/qgis_customwidgets.py usr/lib/python*/*-packages/PyQt?/uic/widget-plugins/qgis_customwidgets.py

View File

@ -5,7 +5,6 @@ usr/lib/python*/*-packages/qgis/gui/*
usr/lib/python*/*-packages/qgis/analysis/* usr/lib/python*/*-packages/qgis/analysis/*
usr/lib/python*/*-packages/qgis/networkanalysis/* usr/lib/python*/*-packages/qgis/networkanalysis/*
usr/lib/python*/*-packages/qgis/PyQt/* usr/lib/python*/*-packages/qgis/PyQt/*
usr/lib/python*/*-packages/qgis/server/*
usr/lib/python*/*-packages/qgis/testing/* usr/lib/python*/*-packages/qgis/testing/*
#wheezy precise#usr/lib/python*/*-packages/pyspatialite/*.py usr/lib/python*/*-packages/pyspatialite/*
#wheezy precise#usr/lib/python*/*-packages/pyspatialite/*.so #server#usr/lib/python*/*-packages/qgis/server/*

View File

@ -12,6 +12,7 @@ usr/share/qgis/doc/images
usr/share/qgis/doc/index.html usr/share/qgis/doc/index.html
usr/share/qgis/doc/news usr/share/qgis/doc/news
usr/share/qgis/doc/news.html usr/share/qgis/doc/news.html
usr/share/qgis/doc/release-sponsors.html
usr/share/qgis/doc/style.css usr/share/qgis/doc/style.css
usr/share/qgis/i18n/* usr/share/qgis/i18n/*
usr/share/qgis/images/* usr/share/qgis/images/*

View File

@ -1,2 +1,2 @@
usr/lib/qgis/plugins/liboracleprovider.so usr/lib/qgis/plugins/liboracleprovider.so
{QT_PLUGIN_DIR}/sqldrivers/libqsqlocispatial.so {QT_PLUGINS_DIR}/sqldrivers/libqsqlocispatial.so

View File

@ -17,6 +17,6 @@ usr/lib/qgis/plugins/libvirtuallayerprovider.so
usr/lib/qgis/plugins/libwcsprovider.so usr/lib/qgis/plugins/libwcsprovider.so
usr/lib/qgis/plugins/libwfsprovider.so usr/lib/qgis/plugins/libwfsprovider.so
usr/lib/qgis/plugins/libwmsprovider.so usr/lib/qgis/plugins/libwmsprovider.so
#sid stretch jessie wheezy trusty wily xenial#usr/lib/qgis/plugins/libarcgismapserverprovider.so usr/lib/qgis/plugins/libarcgismapserverprovider.so
#sid stretch jessie wheezy trusty wily xenial#usr/lib/qgis/plugins/libarcgisfeatureserverprovider.so usr/lib/qgis/plugins/libarcgisfeatureserverprovider.so
{QT_PLUGIN_DIR}/sqldrivers/libqsqlspatialite.so {QT_PLUGINS_DIR}/sqldrivers/libqsqlspatialite.so

66
debian/rules vendored
View File

@ -16,7 +16,6 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
DEB_BUILD_MULTIARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH) DEB_BUILD_MULTIARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
QT_PLUGIN_DIR = usr/lib/$(DEB_BUILD_MULTIARCH)/qt4/plugins
DEB_TEST_TARGET ?= Experimental DEB_TEST_TARGET ?= Experimental
QGIS_BUILDDIR ?= debian/build QGIS_BUILDDIR ?= debian/build
@ -34,7 +33,14 @@ ifneq (,$(findstring -oracle,$(DISTRIBUTION)))
WITH_ORACLE=1 WITH_ORACLE=1
endif endif
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"wheezy jessie stretch precise trusty wily xenial")) ifneq (,$(findstring -server,$(DISTRIBUTION)))
DISTRIBUTION := $(subst -oracle,,$(DISTRIBUTION))
WITH_SERVER=1
endif
QT_PLUGINS_DIR = usr/lib/$(DEB_BUILD_MULTIARCH)/qt5/plugins
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"jessie stretch trusty xenial"))
DISTRIBUTION := sid DISTRIBUTION := sid
endif endif
@ -53,18 +59,14 @@ QGIS_ABI=$(QGIS_MAJOR).$(QGIS_MINOR).$(QGIS_PATCH)
GRASS=grass$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2)) GRASS=grass$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2))
GRASSVER=$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1)) GRASSVER=$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1))
WITH_GLOBE=$(shell dpkg --compare-versions "$$(dpkg-query -W --showformat='$${Version}' libosgearth-dev)" ge 2.7 && echo 1)
CMAKE_OPTS := \ CMAKE_OPTS := \
-DBUILDNAME=$(DEB_BUILD_NAME) \ -DBUILDNAME=$(DEB_BUILD_NAME) \
-DCMAKE_VERBOSE_MAKEFILE=1 \ -DCMAKE_VERBOSE_MAKEFILE=1 \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
-DBINDINGS_GLOBAL_INSTALL=TRUE \ -DBINDINGS_GLOBAL_INSTALL=TRUE \
-DPEDANTIC=TRUE \ -DPEDANTIC=TRUE \
-DWITH_QSPATIALITE=TRUE \
-DWITH_SERVER=TRUE \
-DWITH_SERVER_PLUGINS=TRUE \
-DSERVER_SKIP_ECW=TRUE \ -DSERVER_SKIP_ECW=TRUE \
-DSUPPRESS_SIP_WARNINGS=TRUE \
-DQGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \ -DQGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
-DWITH_APIDOC=TRUE \ -DWITH_APIDOC=TRUE \
-DGENERATE_QHP=TRUE \ -DGENERATE_QHP=TRUE \
@ -77,8 +79,18 @@ CMAKE_OPTS := \
-DWITH_INTERNAL_DATEUTIL=FALSE \ -DWITH_INTERNAL_DATEUTIL=FALSE \
-DWITH_INTERNAL_PYTZ=FALSE \ -DWITH_INTERNAL_PYTZ=FALSE \
-DWITH_INTERNAL_YAML=FALSE \ -DWITH_INTERNAL_YAML=FALSE \
-DQT_TAG_FILE=/usr/share/qt4/doc/html/qt.tags \ -DWITH_INTERNAL_NOSE2=FALSE \
-DQT_DOC_URL=/usr/share/qt4/doc/html/ -DWITH_INTERNAL_SIX=FALSE \
-DQT_TAG_FILE=/usr/share/qt5/doc/html/qt.tags \
-DQT_DOC_URL=/usr/share/qt5/doc/qtdoc/ \
-DWITH_GLOBE=FALSE \
-DWITH_SERVER=FALSE \
-DWITH_SERVER_PLUGINS=FALSE \
-DWITH_QWTPOLAR=FALSE \
-DWITH_QSPATIALITE=TRUE \
-DWITH_PYSPATIALITE=TRUE \
-DQT_PLUGINS_DIR=$(QT_PLUGINS_DIR) \
-DPYTHON_LIBRARY=$(shell python3-config --ldflags | sed -e 's\#-L\(.*\) -L/usr/lib -l\([^ ]*\) .*$$\#\1/lib\2.so\#')
ifneq ($(SHA),) ifneq ($(SHA),)
CMAKE_OPTS += -DSHA=$(SHA) CMAKE_OPTS += -DSHA=$(SHA)
@ -101,13 +113,8 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS) MAKEFLAGS += -j$(NUMJOBS)
endif endif
ifneq (,$(findstring $(DISTRIBUTION),"precise"))
CMAKE_OPTS += -DWITH_INTERNAL_NOSE2=TRUE -DWITH_INTERNAL_SIX=TRUE
else
CMAKE_OPTS += -DWITH_INTERNAL_NOSE2=FALSE -DWITH_INTERNAL_SIX=FALSE
endif
ifeq (,$(findstring $(DISTRIBUTION),"stretch sid wily xenial")) ifeq (,$(findstring $(DISTRIBUTION),"stretch sid xenial"))
CMAKE_OPTS += -DWITH_INTERNAL_FUTURE=TRUE CMAKE_OPTS += -DWITH_INTERNAL_FUTURE=TRUE
else else
CMAKE_OPTS += -DWITH_INTERNAL_FUTURE=FALSE CMAKE_OPTS += -DWITH_INTERNAL_FUTURE=FALSE
@ -117,25 +124,14 @@ ifneq (,$(WITH_GLOBE))
CMAKE_OPTS += -DWITH_GLOBE=TRUE CMAKE_OPTS += -DWITH_GLOBE=TRUE
endif endif
ifneq (,$(findstring $(DISTRIBUTION),"wheezy precise"))
CMAKE_OPTS += -DWITH_PYSPATIALITE=TRUE
endif
ifneq (,$(findstring $(DISTRIBUTION),"sid stretch")) ifneq (,$(findstring $(DISTRIBUTION),"sid stretch"))
CMAKE_OPTS += -DPOSTGRES_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpq.so CMAKE_OPTS += -DPOSTGRES_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpq.so
endif endif
ifneq (,$(findstring $(DISTRIBUTION),"sid stretch"))
CMAKE_OPTS += -DWITH_QTWEBKIT=FALSE
endif
ifneq (,$(findstring $(DISTRIBUTION),"sid")) ifneq (,$(findstring $(DISTRIBUTION),"sid"))
CMAKE_OPTS += -DGEOS_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libgeos_c.so CMAKE_OPTS += -DGEOS_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libgeos_c.so
endif endif
ifneq (,$(findstring $(DISTRIBUTION),"jessie stretch trusty wily xenial sid"))
CMAKE_OPTS += -DPYTHON_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpython2.7.so
endif
ifneq (,$(WITH_ORACLE)) ifneq (,$(WITH_ORACLE))
ifeq ($(DEB_BUILD_ARCH),amd64) ifeq ($(DEB_BUILD_ARCH),amd64)
@ -146,7 +142,6 @@ ifeq ($(DEB_BUILD_ARCH),i386)
ORACLE_INCLUDEDIR=/usr/include/oracle/12.1/client/ ORACLE_INCLUDEDIR=/usr/include/oracle/12.1/client/
ORACLE_LIBDIR=/usr/lib/oracle/12.1/client/lib/ ORACLE_LIBDIR=/usr/lib/oracle/12.1/client/lib/
endif endif
CMAKE_OPTS += \ CMAKE_OPTS += \
-DWITH_ORACLE=TRUE \ -DWITH_ORACLE=TRUE \
-DORACLE_LIBDIR=$(ORACLE_LIBDIR) \ -DORACLE_LIBDIR=$(ORACLE_LIBDIR) \
@ -171,7 +166,7 @@ else
CMAKE_OPTS += -DENABLE_TESTS=TRUE CMAKE_OPTS += -DENABLE_TESTS=TRUE
endif endif
ifneq (,$(findstring $(DISTRIBUTION),"wheezy jessie stretch trusty sid")) ifneq (,$(findstring $(DISTRIBUTION),"jessie stretch trusty sid"))
CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS) CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS) CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
@ -213,6 +208,10 @@ ifneq (,$(WITH_ORACLE))
CONTROL_EXPRESSIONS += oracle CONTROL_EXPRESSIONS += oracle
endif endif
ifneq (,$(WITH_SERVER))
CONTROL_EXPRESSIONS += server
endif
define gentemplate define gentemplate
$(2): $(1) $(2): $(1)
sed -r \ sed -r \
@ -221,7 +220,7 @@ $(2): $(1)
-e 's/#([^#]+ |)![^#]+( [^#]*|)#//g' \ -e 's/#([^#]+ |)![^#]+( [^#]*|)#//g' \
-e '/^#/d' \ -e '/^#/d' \
-e "s/\{DEB_BUILD_GNU_TYPE\}/$(DEB_BUILD_GNU_TYPE)/g" \ -e "s/\{DEB_BUILD_GNU_TYPE\}/$(DEB_BUILD_GNU_TYPE)/g" \
-e "s#\{QT_PLUGIN_DIR\}#$(QT_PLUGIN_DIR)#g" \ -e "s#\{QT_PLUGINS_DIR\}#$(QT_PLUGINS_DIR)#g" \
-e "s/\{QGIS_ABI\}/$(QGIS_ABI)/g" \ -e "s/\{QGIS_ABI\}/$(QGIS_ABI)/g" \
-e "s/\{GRASS\}/$(GRASS)/g" \ -e "s/\{GRASS\}/$(GRASS)/g" \
-e "s/\{GRASSVER\}/$(GRASSVER)/g" \ -e "s/\{GRASSVER\}/$(GRASSVER)/g" \
@ -243,7 +242,7 @@ cleantemplates:
$(MAKE) -f debian/rules debian/control debian/compat $(MAKE) -f debian/rules debian/control debian/compat
binary binary-arch binary-indep build build-arch build-indep clean install install-arch install-indep: templates binary binary-arch binary-indep build build-arch build-indep clean install install-arch install-indep: templates
dh $@ --with python2 --parallel --builddirectory=$(QGIS_BUILDDIR) dh $@ --with python3 --parallel --builddirectory=$(QGIS_BUILDDIR)
override_dh_clean: cleantemplates override_dh_clean: cleantemplates
dh_clean qgis.bin.1 qbrowser.bin.1 dh_clean qgis.bin.1 qbrowser.bin.1
@ -381,9 +380,10 @@ override_dh_installman:
override_dh_installmime: override_dh_installmime:
dh_installmime -pqgis dh_installmime -pqgis
override_dh_python2:
dh_python2 --no-guessing-versions override_dh_python3:
dh_python2 --no-guessing-versions usr/share/qgis/grass/scripts dh_python3
dh_python3 usr/share/qgis/grass/scripts
dh_sip -ppython-qgis dh_sip -ppython-qgis
override_dh_compress: override_dh_compress:

View File

@ -38,7 +38,9 @@ void CPL_STDCALL showError( CPLErr errClass, int errNo, const char *msg )
int main( int argc, char ** argv ) int main( int argc, char ** argv )
{ {
QgsApplication a( argc, argv, false ); QCoreApplication app( argc, argv );
QgsApplication::init();
if ( !QgsApplication::isRunningFromBuildDir() ) if ( !QgsApplication::isRunningFromBuildDir() )
{ {