Skip to content

Commit e263e9e

Browse files
committedOct 1, 2015
debian packaging update (take II on fixing #13310)
1 parent 32c5f55 commit e263e9e

File tree

8 files changed

+71
-46
lines changed

8 files changed

+71
-46
lines changed
 

‎debian/changelog

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ qgis (2.11.0) UNRELEASED; urgency=medium
33
* New development version 2.11 after branch of 2.10
44
* moved grass default.qgc from config to modules
55
* include grass7 plugin
6+
* move grass provider to separate package
7+
* add ubuntu wily
68

7-
-- Jürgen E. Fischer <jef@norbit.de> Tue, 25 Aug 2015 00:14:25 +0200
9+
-- Jürgen E. Fischer <jef@norbit.de> Wed, 30 Sep 2015 14:06:10 +0200
810

911
qgis (2.10.0) unstable; urgency=medium
1012

‎debian/compat.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
#stretch sid jessie trusty utopic vivid#9
1+
#stretch sid jessie trusty utopic vivid wily#9
22
#wheezy jessie#8
33
#precise#7

‎debian/control.in

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ Priority: optional
66
Build-Depends:
77
bison,
88
cmake (>= 2.8),
9-
#sid stretch jessie wheezy saucy trusty utopic vivid# debhelper (>= 9),
9+
#sid stretch jessie wheezy saucy trusty utopic vivid wily# debhelper (>= 9),
1010
#precise# debhelper (>= 7),
1111
flex,
1212
grass-dev,
1313
libexpat1-dev,
1414
libfcgi-dev,
15-
#sid stretch jessie trusty utopic vivid# libgdal-dev (>= 1.10.1-0~),
15+
#sid stretch jessie trusty utopic vivid wily# libgdal-dev (>= 1.10.1-0~),
1616
#precise# libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
1717
#saucy# libgdal-dev (>= 1.9.0),
1818
#wheezy# libgdal1-dev,
@@ -23,24 +23,27 @@ Build-Depends:
2323
libproj-dev,
2424
libqt4-dev (>= 4.7.0),
2525
libqt4-opengl-dev,
26-
libqca2-dev, libqca2-plugin-ossl,
26+
libqca2-dev,
27+
libqca2-plugin-ossl,
2728
libqtwebkit-dev,
2829
#stretch jessie wheezy# libqwt-dev,
29-
#precise saucy trusty utopic vivid stretch sid# libqwt5-qt4-dev,
30+
#precise saucy trusty utopic vivid wily stretch sid# libqwt5-qt4-dev,
3031
libspatialite-dev,
3132
libsqlite3-dev,
3233
libspatialindex-dev,
3334
pkg-config,
3435
pyqt4-dev-tools,
3536
python-qscintilla2,
37+
python-qt4 (>= 4.1.0),
38+
python-qt4-dev,
39+
python-qt4-sql,
3640
#precise saucy wheezy# python,
3741
#precise saucy# python-central (>= 0.5),
3842
#saucy wheezy# python-dev,
3943
#saucy# libpython2.7-dev,
40-
#sid stretch jessie trusty utopic vivid# python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
41-
#sid stretch jessie wheezy precise saucy trusty utopic vivid# python-qt4 (>= 4.1.0), python-qt4-dev,
44+
#sid stretch jessie trusty utopic vivid wily# python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
4245
#sid stretch jessie# pyqt4.qsci-dev,
43-
#sid stretch jessie trusty utopic vivid# python-pyspatialite,
46+
#sid stretch jessie trusty utopic vivid wily# python-pyspatialite,
4447
#sid stretch# dh-python,
4548
python-sip (>= 4.5.0),
4649
python-sip-dev (>= 4.5.0),
@@ -57,11 +60,11 @@ Build-Depends:
5760
spawn-fcgi, lighttpd, poppler-utils, locales, qt4-doc-html,
5861
libqt4-sql-sqlite
5962
Build-Conflicts: libqgis-dev, qgis-dev
60-
#sid stretch jessie vivid#Standards-Version: 3.9.6
63+
#sid stretch jessie vivid wily#Standards-Version: 3.9.6
6164
#wheezy#Standards-Version: 3.9.3
6265
#precise saucy trusty utopic#Standards-Version: 3.8.4
6366
#sid stretch jessie#X-Python-Version: >= 2.7, << 2.8
64-
#wheezy precise saucy trusty utopic vivid#XS-Python-Version: current
67+
#wheezy precise saucy trusty utopic vivid wily#XS-Python-Version: current
6568
Vcs-Browser: https://github.com/qgis/QGIS/
6669
Vcs-Git: https://github.com/qgis/QGIS.git
6770
Homepage: http://qgis.org/
@@ -218,7 +221,7 @@ Section: libdevel
218221
Depends:
219222
grass-dev,
220223
libexpat1-dev,
221-
#sid stretch jessie trusty utopic vivid# libgdal-dev (>= 1.10.1-0~),
224+
#sid stretch jessie trusty utopic vivid wily# libgdal-dev (>= 1.10.1-0~),
222225
#precise# libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
223226
#saucy# libgdal-dev (>= 1.9.0),
224227
#wheezy# libgdal1-dev,
@@ -237,6 +240,7 @@ Depends:
237240
libsqlite3-dev,
238241
python-qt4 (>= 4.1.0),
239242
python-qt4-dev (>= 4.1.0),
243+
python-qt4-sql,
240244
qt4-designer,
241245
${misc:Depends}
242246
Recommends: libqgis-customwidgets
@@ -273,7 +277,6 @@ Description: QGIS - debugging symbols
273277
Package: qgis-provider-grass
274278
Architecture: any
275279
Depends:
276-
qgis (= ${binary:Version}),
277280
${shlibs:Depends},
278281
${misc:Depends}
279282
Description: GRASS plugin for QGIS
@@ -290,8 +293,10 @@ Depends:
290293
qgis-provider-grass (= ${source:Version}),
291294
${shlibs:Depends},
292295
${misc:Depends},
293-
#!precise# grass-core (<< 7)
294-
#precise# grass (<< 7)
296+
#!precise# grass-core
297+
#precise# grass
298+
Replaces: qgis-provider-grass (<< 1:2.11.0+git20151002)
299+
Conflicts: qgis-provider-grass (<< 1:2.11.0+git20151002)
295300
Description: GRASS plugin for QGIS
296301
QGIS is a Geographic Information System (GIS) which manages, analyzes and
297302
display databases of geographic information.
@@ -343,6 +348,7 @@ Architecture: any
343348
Section: python
344349
Depends:
345350
python-qt4,
351+
python-qt4-sql,
346352
python-sip,
347353
python-qgis-common (= ${source:Version}),
348354
python-psycopg2,
@@ -354,7 +360,7 @@ Depends:
354360
python-dateutil,
355361
python-tz,
356362
python-six,
357-
#sid stretch jessie trusty utopic vivid# python-pyspatialite,
363+
#sid stretch jessie trusty utopic vivid wily# python-pyspatialite,
358364
#jessie# liblwgeom-2.1.4,
359365
#stretch sid# liblwgeom-2.1.8,
360366
libqgispython{QGIS_ABI},
@@ -394,6 +400,7 @@ Pre-Depends: ${misc:Pre-Depends}
394400
Depends:
395401
qgis-providers-common (= ${source:Version}),
396402
libqt4-sql-sqlite,
403+
libqca2-plugin-ossl,
397404
${shlibs:Depends},
398405
${misc:Depends}
399406
Breaks: qgis (<= 1.6)

‎debian/qgis-plugin-grass.postrm

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" = "remove" ]; then
6+
for i in /usr/bin/qgis /usr/bin/qbrowser; do
7+
dpkg-divert --package qgis-plugin-grass --remove --rename --divert $i.bin $i
8+
done
9+
fi
10+
11+
#DEBHELPER#
12+
13+
exit 0

‎debian/qgis-plugin-grass.preinst

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#!/bin/sh
2+
3+
set -e
4+
5+
pkg=qgis-plugin-grass
6+
7+
if [ "$1" = "install" -o "$1" = "upgrade" ]; then
8+
div=$(dpkg-divert --listpackage /usr/bin/qgis)
9+
if [ -n "$div" -a "$div" != $pkg ]; then
10+
for i in /usr/bin/qgis /usr/bin/qbrowser; do
11+
if [ -e $i ] && ! [ -e $i.undiverted ]; then
12+
mv $i $i.undiverted
13+
fi
14+
dpkg-divert --package $div --remove --rename --divert $i.bin $i
15+
if [ -e $i.undiverted ]; then
16+
mv $i.undiverted $i
17+
fi
18+
done
19+
fi
20+
21+
for i in /usr/bin/qgis /usr/bin/qbrowser; do
22+
dpkg-divert --package $pkg --add --rename --divert $i.bin $i
23+
done
24+
fi
25+
26+
#DEBHELPER#
27+
28+
exit 0

‎debian/qgis-provider-grass.postrm

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

‎debian/qgis-provider-grass.preinst

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

‎debian/rules

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ifneq (,$(findstring -oracle,$(DISTRIBUTION)))
2929
WITH_ORACLE=1
3030
endif
3131

32-
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"wheezy jessie stretch precise trusty utopic vivid"))
32+
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"wheezy jessie stretch precise trusty utopic vivid wily"))
3333
DISTRIBUTION := sid
3434
endif
3535

@@ -102,7 +102,7 @@ ifneq (,$(findstring $(DISTRIBUTION),"sid"))
102102
-DGEOS_CPP_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libgeos.so
103103
endif
104104

105-
ifneq (,$(findstring $(DISTRIBUTION),"jessie stretch trusty utopic vivid sid"))
105+
ifneq (,$(findstring $(DISTRIBUTION),"jessie stretch trusty utopic vivid wily sid"))
106106
CMAKE_OPTS += -DPYTHON_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpython2.7.so
107107
endif
108108

@@ -263,9 +263,9 @@ override_dh_auto_install:
263263
$(RM) $(CURDIR)/debian/tmp/usr/bin/qbrowser
264264

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

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

0 commit comments

Comments
 (0)
Please sign in to comment.