Skip to content

Commit 09fba27

Browse files
jef-njef-n
committedAug 25, 2015
debian packaging update (grass7)
1 parent 1a342fa commit 09fba27

10 files changed

+104
-61
lines changed
 

‎debian/changelog

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
qgis (2.10.1-1) UNRELEASED; urgency=medium
2+
3+
* split grass provider off into a separate package.
4+
* disable grass plugin on sid (because of GRASS7)
5+
6+
-- Jürgen E. Fischer <jef@norbit.de> Tue, 25 Aug 2015 23:49:41 +0200
7+
18
qgis (2.10.1) UNRELEASED; urgency=medium
29

310
* Release of 2.10.1

‎debian/control.in

Lines changed: 42 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Build-Depends:
99
#sid stretch jessie wheezy saucy sid-oracle trusty utopic vivid# debhelper (>= 9),
1010
#precise# debhelper (>= 7),
1111
flex,
12-
grass-dev (<< 7),
12+
grass-dev,
1313
libexpat1-dev,
1414
libfcgi-dev,
1515
#sid stretch jessie sid-oracle trusty utopic vivid# libgdal-dev (>= 1.10.1-0~),
@@ -23,8 +23,8 @@ Build-Depends:
2323
libqt4-dev (>= 4.7.0),
2424
libqt4-opengl-dev,
2525
libqtwebkit-dev,
26-
#sid stretch jessie wheezy sid-oracle# libqwt-dev,
27-
#precise saucy trusty utopic vivid# libqwt5-qt4-dev,
26+
#jessie wheezy# libqwt-dev,
27+
#precise saucy trusty utopic vivid stretch sid sid-oracle# libqwt5-qt4-dev,
2828
libspatialite-dev,
2929
libsqlite3-dev,
3030
libspatialindex-dev,
@@ -71,7 +71,8 @@ Depends:
7171
qgis-providers (= ${binary:Version}),
7272
qgis-common (= ${source:Version})
7373
Recommends:
74-
qgis-plugin-grass,
74+
#!sid# qgis-plugin-grass,
75+
qgis-provider-grass,
7576
qgis-plugin-globe,
7677
python-qgis
7778
Suggests: gpsbabel
@@ -212,7 +213,7 @@ Package: libqgis-dev
212213
Architecture: any
213214
Section: libdevel
214215
Depends:
215-
grass-dev (<< 7),
216+
grass-dev,
216217
libexpat1-dev,
217218
#sid stretch jessie sid-oracle trusty utopic vivid# libgdal-dev (>= 1.10.1-0~),
218219
#precise# libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
@@ -266,36 +267,51 @@ Description: QGIS - debugging symbols
266267
.
267268
This package contains debugging symbols.
268269

269-
Package: qgis-plugin-grass
270+
Package: qgis-provider-grass
270271
Architecture: any
271272
Depends:
272273
qgis (= ${binary:Version}),
273-
qgis-plugin-grass-common (= ${source:Version}),
274274
${shlibs:Depends},
275-
${misc:Depends},
276-
#!precise# grass-core (<< 7)
277-
#precise# grass (<< 7)
275+
${misc:Depends}
276+
#sid#Breaks: qgis-plugin-grass
277+
#sid#Replaces: qgis-plugin-grass
278278
Description: GRASS plugin for QGIS
279279
QGIS is a Geographic Information System (GIS) which manages, analyzes and
280280
display databases of geographic information.
281281
.
282-
This plugin enables GRASS data access in the QGIS geographic data viewer.
282+
This provider enables GRASS data access in QGIS.
283283

284-
Package: qgis-plugin-grass-common
285-
Architecture: all
286-
Depends:
287-
#sid stretch jessie saucy sid-oracle trusty# python2.7,
284+
#!sid#Package: qgis-plugin-grass
285+
#!sid#Architecture: any
286+
#!sid#Depends:
287+
#!sid# qgis (= ${binary:Version}),
288+
#!sid# qgis-plugin-grass-common (= ${source:Version}),
289+
#!sid# qgis-provider-grass (= ${source:Version}),
290+
#!sid# ${shlibs:Depends},
291+
#!sid# ${misc:Depends},
292+
#!sid !precise# grass-core
293+
#precise# grass
294+
#!sid#Description: GRASS plugin for QGIS
295+
#!sid# QGIS is a Geographic Information System (GIS) which manages, analyzes and
296+
#!sid# display databases of geographic information.
297+
#!sid# .
298+
#!sid# This plugin enables GRASS data access in QGIS.
299+
#!sid#
300+
#!sid#Package: qgis-plugin-grass-common
301+
#!sid#Architecture: all
302+
#!sid#Depends:
303+
#jessie saucy trusty# python2.7,
288304
#wheezy precise# python,
289-
${misc:Depends}
290-
Breaks: qgis-common (<< 1.5)
291-
Replaces: qgis-common (<< 1.5)
292-
Description: GRASS plugin for QGIS - architecture-independent data
293-
QGIS is a Geographic Information System (GIS) which manages, analyzes and
294-
display databases of geographic information.
295-
.
296-
This package contains architecture-independent supporting data files for use
297-
with the QGIS GRASS plugin.
298-
305+
#!sid# ${misc:Depends}
306+
#!sid#Breaks: qgis-common (<< 1.5)
307+
#!sid#Replaces: qgis-common (<< 1.5)
308+
#!sid#Description: GRASS plugin for QGIS - architecture-independent data
309+
#!sid# QGIS is a Geographic Information System (GIS) which manages, analyzes and
310+
#!sid# display databases of geographic information.
311+
#!sid# .
312+
#!sid# This package contains architecture-independent supporting data files for use
313+
#!sid# with the QGIS GRASS plugin.
314+
#!sid#
299315
Package: qgis-plugin-globe
300316
Architecture: any
301317
Depends:
@@ -338,8 +354,8 @@ Depends:
338354
python-tz,
339355
python-six,
340356
#sid stretch jessie trusty utopic vivid sid-oracle# python-pyspatialite,
341-
#sid stretch# liblwgeom-2.1.7,
342357
#jessie# liblwgeom-2.1.4,
358+
#stretch sid# liblwgeom-2.1.8,
343359
libqgispython{QGIS_ABI},
344360
${shlibs:Depends},
345361
${python:Depends},

‎debian/qgis-plugin-grass.install.in

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
1-
usr/lib/qgis/grass/modules/qgis.d.rast{GRASSVER}
2-
usr/lib/qgis/grass/modules/qgis.g.info{GRASSVER}
31
usr/lib/qgis/grass/bin/qgis.g.browser{GRASSVER}
42
usr/lib/qgis/plugins/libgrassplugin{GRASSVER}.so
5-
usr/lib/qgis/plugins/libgrassprovider{GRASSVER}.so
6-
usr/lib/qgis/plugins/libgrassrasterprovider{GRASSVER}.so

‎debian/qgis-plugin-grass.postrm

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎debian/qgis-plugin-grass.preinst

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎debian/qgis-provider-grass.install.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
usr/lib/qgis/grass/modules/qgis.d.rast{GRASSVER}
2+
usr/lib/qgis/grass/modules/qgis.g.info{GRASSVER}
3+
usr/lib/qgis/plugins/libgrassprovider{GRASSVER}.so
4+
usr/lib/qgis/plugins/libgrassrasterprovider{GRASSVER}.so

‎debian/qgis-provider-grass.lintian-overrides

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
qgis-plugin-grass: package-name-doesnt-match-sonames
2+
qgis-plugin-grass: no-symbols-control-file

‎debian/qgis-provider-grass.postrm

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/sh
2+
3+
set -e
4+
5+
if [ "$1" = "remove" ]; then
6+
dpkg-divert --package qgis-provider-grass --remove --rename --divert /usr/bin/qgis.bin /usr/bin/qgis
7+
dpkg-divert --package qgis-provider-grass --remove --rename --divert /usr/bin/qbrowser.bin /usr/bin/qbrowser
8+
fi
9+
10+
#DEBHELPER#
11+
12+
exit 0

‎debian/qgis-provider-grass.preinst

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/sh
2+
3+
set -e
4+
5+
if [ "$1" = "install" -o "$1" = "upgrade" ]; then
6+
dpkg-divert --package qgis-provider-grass --add --rename --divert /usr/bin/qgis.bin /usr/bin/qgis
7+
dpkg-divert --package qgis-provider-grass --add --rename --divert /usr/bin/qbrowser.bin /usr/bin/qbrowser
8+
fi
9+
10+
#DEBHELPER#
11+
12+
exit 0
13+

‎debian/rules

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,11 @@ CMAKE_OPTS := \
4747
-DBUILDNAME=$(DEB_BUILD_NAME) \
4848
-DCMAKE_VERBOSE_MAKEFILE=1 \
4949
-DCMAKE_INSTALL_PREFIX=/usr \
50-
-DGRASS_PREFIX=/usr/lib/$(GRASS) \
5150
-DBINDINGS_GLOBAL_INSTALL=TRUE \
5251
-DPEDANTIC=TRUE \
5352
-DWITH_QSPATIALITE=TRUE \
5453
-DWITH_SERVER=TRUE \
5554
-DWITH_SERVER_PLUGINS=TRUE \
56-
-DWITH_GRASS7=FALSE \
5755
-DSERVER_SKIP_ECW=TRUE \
5856
-DQGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
5957
-DWITH_APIDOC=TRUE \
@@ -69,6 +67,18 @@ CMAKE_OPTS := \
6967
-DQT_TAG_FILE=/usr/share/qt4/doc/html/qt.tags \
7068
-DQT_DOC_URL=/usr/share/qt4/doc/html/
7169

70+
ifeq ($(GRASSVER),7)
71+
CMAKE_OPTS += \
72+
-DWITH_GRASS=FALSE \
73+
-DWITH_GRASS7=TRUE \
74+
-DGRASS_PREFIX7=/usr/lib/$(GRASS)
75+
else
76+
CMAKE_OPTS += \
77+
-DWITH_GRASS=TRUE \
78+
-DWITH_GRASS7=FALSE \
79+
-DGRASS_PREFIX=/usr/lib/$(GRASS)
80+
endif
81+
7282
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
7383
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
7484
MAKEFLAGS += -j$(NUMJOBS)
@@ -132,11 +142,19 @@ ifneq (,$(findstring profile,$(DEB_BUILD_OPTIONS)))
132142
LDFLAGS += -pg
133143
endif
134144

145+
# multi distribution support:
146+
# - remove prefixes for current distribution
147+
# - remove lines that exclude current distribution
148+
# - remove prefixes that exclude other distributions
149+
# - remove remaining comments
150+
135151
define gentemplate
136152
$(2): $(1)
137153
sed -r \
138154
-e 's/^#(.* |)$(DISTRIBUTION)( .*|)#//' \
139-
-e '/^#($|[^!])/d' \
155+
-e '/^#(.* |)!$(DISTRIBUTION)( .*|)#/d' \
156+
-e 's/^#(.* |)![^ ]*( .*|)#//' \
157+
-e '/^#/d' \
140158
-e "s/\{DEB_BUILD_GNU_TYPE\}/$(DEB_BUILD_GNU_TYPE)/g" \
141159
-e "s#\{QT_PLUGIN_DIR\}#$(QT_PLUGIN_DIR)#g" \
142160
-e "s/\{QGIS_ABI\}/$(QGIS_ABI)/g" \
@@ -232,9 +250,9 @@ override_dh_auto_install:
232250
$(RM) $(CURDIR)/debian/tmp/usr/bin/qbrowser
233251

234252
# qgis binary wrappers
235-
install -o root -g root -m 755 -d $(CURDIR)/debian/qgis-plugin-grass/usr/bin
236-
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qgis
237-
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qbrowser
253+
install -o root -g root -m 755 -d $(CURDIR)/debian/qgis-provider-grass/usr/bin
254+
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-provider-grass/usr/bin/qgis
255+
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-provider-grass/usr/bin/qbrowser
238256

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

0 commit comments

Comments
 (0)
Please sign in to comment.