Skip to content

Commit

Permalink
debian packaging:
Browse files Browse the repository at this point in the history 
* remove xenial & stretch support
* remove globe plugin
* always enable 3d
  • Loading branch information
@jef-n
jef-n committed Feb 25, 2019
1 parent aeec6df commit 206cc96
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 81 deletions.
2 changes: 0 additions & 2 deletions debian/control
View file
Expand Up @@ -18,7 +18,6 @@ Build-Depends:
libgdal-dev (>= 1.11),
libgeos-dev (>= 3.0.0),
libgsl-dev,
libosgearth-dev,
libpq-dev,
libproj-dev,
libqca-qt5-2-dev,
Expand Down Expand Up @@ -233,7 +232,6 @@ Section: libs
Depends:
${shlibs:Depends},
${misc:Depends}
Replaces: libqgis2.99.0
Description: QGIS - shared Python library
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
Expand Down
84 changes: 28 additions & 56 deletions debian/control.in
View file
Expand Up @@ -17,8 +17,7 @@ Build-Depends:
libfcgi-dev,
libgdal-dev (>= 1.11),
libgeos-dev (>= 3.0.0),
#sid buster stretch xenial bionic cosmic# libgsl-dev,
#sid buster bionic cosmic# libosgearth-dev,
libgsl-dev,
libpq-dev,
libproj-dev,
libqca-qt5-2-dev,
Expand Down Expand Up @@ -61,14 +60,14 @@ Build-Depends:
python3-sip,
python3-termcolor,
python3-yaml,
#sid buster bionic cosmic# qt3d5-dev,
#sid buster bionic cosmic# qt3d-assimpsceneimport-plugin,
#sid buster bionic cosmic# qt3d-defaultgeometryloader-plugin,
#sid buster bionic cosmic# qt3d-gltfsceneio-plugin,
#sid buster bionic cosmic# qt3d-scene2d-plugin,
qt3d5-dev,
qt3d-assimpsceneimport-plugin,
qt3d-defaultgeometryloader-plugin,
qt3d-gltfsceneio-plugin,
qt3d-scene2d-plugin,
qt5keychain-dev,
qtbase5-dev,
#!xenial# qtbase5-private-dev,
qtbase5-private-dev,
qtpositioning5-dev,
qttools5-dev-tools,
qttools5-dev,
Expand All @@ -90,7 +89,7 @@ Build-Depends:
Build-Conflicts:
libqgis-dev,
qgis-dev
#sid buster stretch xenial bionic cosmic#Standards-Version: 3.9.7
Standards-Version: 3.9.7
Vcs-Browser: https://github.com/qgis/QGIS/
Vcs-Git: https://github.com/qgis/QGIS.git
Homepage: https://qgis.org/
Expand All @@ -104,7 +103,6 @@ Depends:
qgis-providers (= ${binary:Version}),
qgis-common (= ${source:Version})
Recommends:
#globe# qgis-plugin-globe,
qgis-plugin-grass
Suggests: gpsbabel
Conflicts: uim-qt3
Expand All @@ -122,7 +120,7 @@ Architecture: all
Depends:
libjs-jquery,
libjs-leaflet,
#sid buster bionic cosmic# qml-module-qtcharts,
qml-module-qtcharts,
${misc:Depends}
Description: QGIS - architecture-independent data
QGIS is a Geographic Information System (GIS) which manages, analyzes and
Expand All @@ -131,22 +129,22 @@ Description: QGIS - architecture-independent data
This package contains architecture-independent supporting data files for use
with QGIS.

#sid buster bionic cosmic#Package: libqgis-3d{QGIS_ABI}
#sid buster bionic cosmic#Architecture: any
#sid buster bionic cosmic#Section: libs
#sid buster bionic cosmic#Depends:
#sid buster bionic cosmic# qt3d-assimpsceneimport-plugin,
#sid buster bionic cosmic# qt3d-defaultgeometryloader-plugin,
#sid buster bionic cosmic# qt3d-gltfsceneio-plugin,
#sid buster bionic cosmic# qt3d-scene2d-plugin,
#sid buster bionic cosmic# ${shlibs:Depends},
#sid buster bionic cosmic# ${misc:Depends}
#sid buster bionic cosmic#Description: QGIS - shared 3d library
#sid buster bionic cosmic# QGIS is a Geographic Information System (GIS) which manages, analyzes and
#sid buster bionic cosmic# display databases of geographic information.
#sid buster bionic cosmic# .
#sid buster bionic cosmic# This package contains the shared 3d library.
#sid buster bionic cosmic#
Package: libqgis-3d{QGIS_ABI}
Architecture: any
Section: libs
Depends:
qt3d-assimpsceneimport-plugin,
qt3d-defaultgeometryloader-plugin,
qt3d-gltfsceneio-plugin,
qt3d-scene2d-plugin,
${shlibs:Depends},
${misc:Depends}
Description: QGIS - shared 3d library
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This package contains the shared 3d library.

Package: libqgis-analysis{QGIS_ABI}
Architecture: any
Section: libs
Expand Down Expand Up @@ -266,11 +264,11 @@ Depends:
libexpat1-dev,
libgdal-dev (>= 1.11),
libgeos-dev (>= 3.0.0),
#sid buster stretch xenial bionic cosmic# libgsl-dev,
libgsl-dev,
libpq-dev,
libproj-dev,
libqca-qt5-2-dev,
#sid buster bionic cosmic# libqgis-3d{QGIS_ABI} (= ${binary:Version}),
libqgis-3d{QGIS_ABI} (= ${binary:Version}),
libqgis-analysis{QGIS_ABI} (= ${binary:Version}),
libqgis-app{QGIS_ABI} (= ${binary:Version}),
libqgis-core{QGIS_ABI} (= ${binary:Version}),
Expand Down Expand Up @@ -308,7 +306,7 @@ Architecture: any
Section: debug
Priority: extra
Depends:
#sid buster bionic cosmic# libqgis-3d{QGIS_ABI} (= ${binary:Version}),
libqgis-3d{QGIS_ABI} (= ${binary:Version}),
libqgis-analysis{QGIS_ABI} (= ${binary:Version}),
libqgis-app{QGIS_ABI} (= ${binary:Version}),
libqgis-core{QGIS_ABI} (= ${binary:Version}),
Expand Down Expand Up @@ -366,32 +364,6 @@ Description: GRASS plugin for QGIS - architecture-independent data
This package contains architecture-independent supporting data files for use
with the QGIS GRASS plugin.

#globe#Package: qgis-plugin-globe
#globe#Architecture: any
#globe#Depends:
#globe# qgis (= ${binary:Version}),
#globe# qgis-plugin-globe-common (= ${source:Version}),
#globe# openscenegraph-plugin-osgearth,
#globe# ${shlibs:Depends},
#globe# ${misc:Depends}
#globe#Description: OSG globe plugin for QGIS
#globe# QGIS is a Geographic Information System (GIS) which manages, analyzes and
#globe# display databases of geographic information.
#globe# .
#globe# This plugin enables 3D viewing using OSG globe in the QGIS.
#globe#
#globe#Package: qgis-plugin-globe-common
#globe#Architecture: all
#globe#Depends:
#globe# osgearth-data,
#globe# ${misc:Depends}
#globe#Description: OSG globe plugin for QGIS - architecture-independent data
#globe# QGIS is a Geographic Information System (GIS) which manages, analyzes and
#globe# display databases of geographic information.
#globe# .
#globe# This package contains architecture-independent supporting data files for use
#globe# with the QGIS GLOBE plugin.
#globe#
Package: python3-qgis
Architecture: any
Section: python
Expand Down
1 change: 0 additions & 1 deletion debian/qgis-plugin-globe-common.install
View file

This file was deleted.

1 change: 0 additions & 1 deletion debian/qgis-plugin-globe-common.links
View file

This file was deleted.

1 change: 0 additions & 1 deletion debian/qgis-plugin-globe-common.lintian-overrides
View file

This file was deleted.

1 change: 0 additions & 1 deletion debian/qgis-plugin-globe.install
View file

This file was deleted.

24 changes: 5 additions & 19 deletions debian/rules
View file
Expand Up @@ -40,7 +40,7 @@ endif

QT_PLUGINS_DIR = usr/lib/$(DEB_BUILD_MULTIARCH)/qt5/plugins

ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"stretch buster xenial bionic cosmic"))
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"buster bionic cosmic"))
DISTRIBUTION := sid
endif

Expand Down Expand Up @@ -91,7 +91,8 @@ CMAKE_OPTS := \
-DWITH_QWTPOLAR=FALSE \
-DQT_PLUGINS_DIR=$(QT_PLUGINS_DIR) \
-DPYTHON_LIBRARY=$(shell python3-config --ldflags | sed -e 's\#-L\(.*\) -L/usr/lib -l\([^ ]*\) .*$$\#\1/lib\2.so\#') \
-DDOXYGEN_ON_DEMAND=TRUE
-DDOXYGEN_ON_DEMAND=TRUE \
-DWITH_QSPATIALITE=TRUE

ifneq ($(SHA),)
CMAKE_OPTS += -DSHA=$(SHA)
Expand All @@ -104,15 +105,7 @@ ifeq ($(GRASSVER),7)
-DGRASS_PREFIX7=/usr/lib/$(GRASS)
endif

ifneq ($(DISTRIBUTION),xenial)
CMAKE_OPTS += -DWITH_QSPATIALITE=TRUE
endif

ifneq (,$(WITH_GLOBE))
CMAKE_OPTS += -DWITH_GLOBE=TRUE
endif

ifneq (,$(findstring $(DISTRIBUTION),"sid buster stretch"))
ifneq (,$(findstring $(DISTRIBUTION),"sid buster"))
CMAKE_OPTS += -DPOSTGRES_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpq.so
endif

Expand Down Expand Up @@ -145,7 +138,7 @@ endif
-DORACLE_INCLUDEDIR=$(ORACLE_INCLUDEDIR)
endif

ifneq (,$(findstring $(DISTRIBUTION),"sid buster stretch"))
ifneq (,$(findstring $(DISTRIBUTION),"sid buster"))
CMAKE_OPTS += -DSPATIALINDEX_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libspatialindex.so
endif

Expand Down Expand Up @@ -195,10 +188,6 @@ endif

CONTROL_EXPRESSIONS = $(DISTRIBUTION) grass$(GRASSVER)

ifneq (,$(WITH_GLOBE))
CONTROL_EXPRESSIONS += globe
endif

ifneq (,$(WITH_ORACLE))
CONTROL_EXPRESSIONS += oracle
endif
Expand Down Expand Up @@ -287,9 +276,6 @@ override_dh_auto_install:
-e 's#http://.*/leaflet.css#leaflet/leaflet.css#;s#http://.*/leaflet.js#leaflet/leaflet.js#;s#http://.*/jquery-.*.min.js#jquery-min.js#' \
$(CURDIR)/debian/tmp/usr/share/qgis/doc/developersmap.html

# Use /usr/bin/python2.7 explicitly for Python Policy compliance
perl -i -pe 's=#!/usr/bin/env python=#!/usr/bin/python2.7=;' $$(find debian/tmp -name "*.py")

# Don't include a copy of the world.tif also included in osgearth-data
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/globe/world.tif

Expand Down

0 comments on commit 206cc96

Please sign in to comment.