Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
debian packaging update (grass7)
  • Loading branch information
jef-n committed Aug 25, 2015
1 parent 78c506e commit 2890181
Show file tree
Hide file tree
Showing 10 changed files with 91 additions and 58 deletions.
7 changes: 7 additions & 0 deletions debian/changelog
@@ -1,3 +1,10 @@
qgis (2.8.3-1) UNRELEASED; urgency=medium

* split grass provider off into a separate package.
* disable grass plugin on sid (because of GRASS7)

-- Jürgen E. Fischer <jef@norbit.de> Tue, 25 Aug 2015 21:47:32 +0200

qgis (2.8.3) UNRELEASED; urgency=medium

* Release of 2.8.3
Expand Down
66 changes: 41 additions & 25 deletions debian/control.in
Expand Up @@ -9,7 +9,7 @@ Build-Depends:
#sid jessie wheezy saucy sid-oracle trusty utopic vivid# debhelper (>= 9),
#precise# debhelper (>= 7),
flex,
grass-dev (<< 7),
grass-dev,
libexpat1-dev,
libfcgi-dev,
#sid jessie sid-oracle trusty utopic vivid# libgdal-dev (>= 1.10.1-0~),
Expand All @@ -23,8 +23,8 @@ Build-Depends:
libqt4-dev (>= 4.7.0),
libqt4-opengl-dev,
libqtwebkit-dev,
#sid jessie wheezy sid-oracle# libqwt-dev,
#precise saucy trusty utopic vivid# libqwt5-qt4-dev,
#jessie wheezy# libqwt-dev,
#sid sid-oracle precise saucy trusty utopic vivid# libqwt5-qt4-dev,
libspatialite-dev,
libsqlite3-dev,
libspatialindex-dev,
Expand Down Expand Up @@ -69,7 +69,8 @@ Depends:
qgis-providers (= ${binary:Version}),
qgis-common (= ${source:Version})
Recommends:
qgis-plugin-grass,
#!sid# qgis-plugin-grass,
qgis-provider-grass,
qgis-plugin-globe,
python-qgis
Suggests: gpsbabel
Expand Down Expand Up @@ -210,7 +211,7 @@ Package: libqgis-dev
Architecture: any
Section: libdevel
Depends:
grass-dev (<< 7),
grass-dev,
libexpat1-dev,
#sid jessie sid-oracle trusty utopic vivid# libgdal-dev (>= 1.10.1-0~),
#precise# libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
Expand Down Expand Up @@ -244,36 +245,51 @@ Description: QGIS - development files
This package contains the headers and libraries needed to develop plugins for
QGIS.

Package: qgis-plugin-grass
Package: qgis-provider-grass
Architecture: any
Depends:
qgis (= ${binary:Version}),
qgis-plugin-grass-common (= ${source:Version}),
${shlibs:Depends},
${misc:Depends},
#!precise# grass-core (<< 7)
#precise# grass (<< 7)
${misc:Depends}
#sid#Breaks: qgis-plugin-grass
#sid#Replaces: qgis-plugin-grass
Description: GRASS plugin for QGIS
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This plugin enables GRASS data access in the QGIS geographic data viewer.
This provider enables GRASS data access in QGIS.

Package: qgis-plugin-grass-common
Architecture: all
Depends:
#sid jessie saucy sid-oracle trusty# python2.7,
#!sid#Package: qgis-plugin-grass
#!sid#Architecture: any
#!sid#Depends:
#!sid# qgis (= ${binary:Version}),
#!sid# qgis-plugin-grass-common (= ${source:Version}),
#!sid# qgis-provider-grass (= ${source:Version}),
#!sid# ${shlibs:Depends},
#!sid# ${misc:Depends},
#!sid !precise# grass-core
#precise# grass
#!sid#Description: GRASS plugin for QGIS
#!sid# QGIS is a Geographic Information System (GIS) which manages, analyzes and
#!sid# display databases of geographic information.
#!sid# .
#!sid# This plugin enables GRASS data access in QGIS.
#!sid#
#!sid#Package: qgis-plugin-grass-common
#!sid#Architecture: all
#!sid#Depends:
#jessie saucy trusty# python2.7,
#wheezy precise# python,
${misc:Depends}
Breaks: qgis-common (<< 1.5)
Replaces: qgis-common (<< 1.5)
Description: GRASS 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 GRASS plugin.

#!sid# ${misc:Depends}
#!sid#Breaks: qgis-common (<< 1.5)
#!sid#Replaces: qgis-common (<< 1.5)
#!sid#Description: GRASS plugin for QGIS - architecture-independent data
#!sid# QGIS is a Geographic Information System (GIS) which manages, analyzes and
#!sid# display databases of geographic information.
#!sid# .
#!sid# This package contains architecture-independent supporting data files for use
#!sid# with the QGIS GRASS plugin.
#!sid#
Package: qgis-plugin-globe
Architecture: any
Depends:
Expand Down
4 changes: 0 additions & 4 deletions debian/qgis-plugin-grass.install.in
@@ -1,6 +1,2 @@
usr/lib/qgis/grass/modules/qgis.d.rast
usr/lib/qgis/grass/modules/qgis.g.info
usr/lib/qgis/grass/bin/qgis.g.browser
usr/lib/qgis/plugins/libgrassplugin.so
usr/lib/qgis/plugins/libgrassprovider.so
usr/lib/qgis/plugins/libgrassrasterprovider.so
12 changes: 0 additions & 12 deletions debian/qgis-plugin-grass.postrm

This file was deleted.

13 changes: 0 additions & 13 deletions debian/qgis-plugin-grass.preinst

This file was deleted.

4 changes: 4 additions & 0 deletions debian/qgis-provider-grass.install.in
@@ -0,0 +1,4 @@
usr/lib/qgis/grass/modules/qgis.d.rast
usr/lib/qgis/grass/modules/qgis.g.info
usr/lib/qgis/plugins/libgrassprovider.so
usr/lib/qgis/plugins/libgrassrasterprovider.so
2 changes: 2 additions & 0 deletions debian/qgis-provider-grass.lintian-overrides
@@ -0,0 +1,2 @@
qgis-plugin-grass: package-name-doesnt-match-sonames
qgis-plugin-grass: no-symbols-control-file
12 changes: 12 additions & 0 deletions debian/qgis-provider-grass.postrm
@@ -0,0 +1,12 @@
#!/bin/sh

set -e

if [ "$1" = "remove" ]; then
dpkg-divert --package qgis-provider-grass --remove --rename --divert /usr/bin/qgis.bin /usr/bin/qgis
dpkg-divert --package qgis-provider-grass --remove --rename --divert /usr/bin/qbrowser.bin /usr/bin/qbrowser
fi

#DEBHELPER#

exit 0
13 changes: 13 additions & 0 deletions debian/qgis-provider-grass.preinst
@@ -0,0 +1,13 @@
#!/bin/sh

set -e

if [ "$1" = "install" -o "$1" = "upgrade" ]; then
dpkg-divert --package qgis-provider-grass --add --rename --divert /usr/bin/qgis.bin /usr/bin/qgis
dpkg-divert --package qgis-provider-grass --add --rename --divert /usr/bin/qbrowser.bin /usr/bin/qbrowser
fi

#DEBHELPER#

exit 0

16 changes: 12 additions & 4 deletions debian/rules
Expand Up @@ -127,11 +127,19 @@ ifneq (,$(findstring profile,$(DEB_BUILD_OPTIONS)))
LDFLAGS += -pg
endif

# multi distribution support:
# - remove prefixes for current distribution
# - remove lines that exclude current distribution
# - remove prefixes that exclude other distributions
# - remove remaining comments

define gentemplate
$(2): $(1)
sed -r \
-e 's/^#(.* |)$(DISTRIBUTION)( .*|)#//' \
-e '/^#($|[^!])/d' \
-e '/^#(.* |)!$(DISTRIBUTION)( .*|)#/d' \
-e 's/^#(.* |)![^ ]*( .*|)#//' \
-e '/^#/d' \
-e "s/\{DEB_BUILD_GNU_TYPE\}/$(DEB_BUILD_GNU_TYPE)/g" \
-e "s#\{QT_PLUGIN_DIR\}#$(QT_PLUGIN_DIR)#g" \
-e "s/\{QGIS_ABI\}/$(QGIS_ABI)/g" \
Expand Down Expand Up @@ -221,9 +229,9 @@ override_dh_auto_install:
$(RM) $(CURDIR)/debian/tmp/usr/bin/qbrowser

# qgis binary wrappers
install -o root -g root -m 755 -d $(CURDIR)/debian/qgis-plugin-grass/usr/bin
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qgis
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qbrowser
install -o root -g root -m 755 -d $(CURDIR)/debian/qgis-provider-grass/usr/bin
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-provider-grass/usr/bin/qgis
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-provider-grass/usr/bin/qbrowser

override_dh_install:
# Don't ship srs.db, automatically updated in postinst with crssync
Expand Down

0 comments on commit 2890181

Please sign in to comment.