Skip to content

Commit d07cad9

Browse files
author
Andrew McAninch
committedAug 28, 2015
Merge remote-tracking branch 'upstream/master'
2 parents a16ad98 + 0099f22 commit d07cad9

File tree

140 files changed

+2059
-628
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+2059
-628
lines changed
 

‎debian/control.in

Lines changed: 60 additions & 44 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 sid-oracle trusty utopic vivid# debhelper (>= 9),
9+
#sid stretch jessie wheezy saucy trusty utopic vivid# debhelper (>= 9),
1010
#precise# debhelper (>= 7),
1111
flex,
1212
grass-dev,
1313
libexpat1-dev,
1414
libfcgi-dev,
15-
#sid stretch jessie sid-oracle trusty utopic vivid# libgdal-dev (>= 1.10.1-0~),
15+
#sid stretch jessie trusty utopic vivid# 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,8 +23,8 @@ Build-Depends:
2323
libqt4-dev (>= 4.7.0),
2424
libqt4-opengl-dev,
2525
libqtwebkit-dev,
26-
#stretch jessie wheezy sid-oracle# libqwt-dev,
27-
#precise saucy trusty utopic vivid sid# libqwt5-qt4-dev,
26+
#stretch jessie wheezy# libqwt-dev,
27+
#precise saucy trusty utopic vivid stretch sid# libqwt5-qt4-dev,
2828
libspatialite-dev,
2929
libsqlite3-dev,
3030
libspatialindex-dev,
@@ -35,10 +35,10 @@ Build-Depends:
3535
#precise saucy# python-central (>= 0.5),
3636
#saucy wheezy# python-dev,
3737
#saucy# libpython2.7-dev,
38-
#sid stretch jessie sid-oracle trusty utopic vivid# python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
38+
#sid stretch jessie trusty utopic vivid# python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
3939
#sid stretch jessie wheezy precise saucy sid-oracle trusty utopic vivid# python-qt4 (>= 4.1.0), python-qt4-dev,
4040
#sid stretch jessie# pyqt4.qsci-dev,
41-
#sid stretch jessie trusty utopic vivid sid-oracle# python-pyspatialite,
41+
#sid stretch jessie trusty utopic vivid# python-pyspatialite,
4242
python-sip (>= 4.5.0),
4343
python-sip-dev (>= 4.5.0),
4444
libosgearth-dev,
@@ -50,14 +50,14 @@ Build-Depends:
5050
txt2tags,
5151
xvfb, xauth,
5252
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
53-
#sid-oracle# oracle-instantclient11.2-devel,
53+
#oracle# oracle-instantclient11.2-devel,
5454
spawn-fcgi, lighttpd, poppler-utils, locales, qt4-doc-html,
5555
libqt4-sql-sqlite
5656
Build-Conflicts: libqgis-dev, qgis-dev
5757
#sid stretch jessie sid-oracle vivid#Standards-Version: 3.9.6
5858
#wheezy#Standards-Version: 3.9.3
5959
#precise saucy trusty utopic#Standards-Version: 3.8.4
60-
#sid stretch jessie sid-oracle#X-Python-Version: >= 2.7, << 2.8
60+
#sid stretch jessie#X-Python-Version: >= 2.7, << 2.8
6161
#wheezy precise saucy trusty utopic vivid#XS-Python-Version: current
6262
Vcs-Browser: https://github.com/qgis/QGIS/
6363
Vcs-Git: https://github.com/qgis/QGIS.git
@@ -71,7 +71,8 @@ Depends:
7171
qgis-providers (= ${binary:Version}),
7272
qgis-common (= ${source:Version})
7373
Recommends:
74-
qgis-plugin-grass,
74+
#grass6# qgis-plugin-grass,
75+
qgis-provider-grass,
7576
qgis-plugin-globe,
7677
python-qgis
7778
Suggests: gpsbabel
@@ -212,9 +213,9 @@ Package: libqgis-dev
212213
Architecture: any
213214
Section: libdevel
214215
Depends:
215-
grass-dev (<< 7),
216+
grass-dev,
216217
libexpat1-dev,
217-
#sid stretch jessie sid-oracle trusty utopic vivid# libgdal-dev (>= 1.10.1-0~),
218+
#sid stretch jessie trusty utopic vivid# libgdal-dev (>= 1.10.1-0~),
218219
#precise# libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
219220
#saucy# libgdal-dev (>= 1.9.0),
220221
#wheezy# libgdal1-dev,
@@ -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
277-
#precise# grass (<< 7)
278-
Description: GRASS plugin for QGIS
279-
QGIS is a Geographic Information System (GIS) which manages, analyzes and
280-
display databases of geographic information.
281-
.
282-
This plugin enables GRASS data access in the QGIS geographic data viewer.
283-
284-
Package: qgis-plugin-grass-common
285-
Architecture: all
286-
Depends:
287-
#sid stretch jessie saucy sid-oracle trusty# python2.7,
288-
#wheezy precise# python,
289275
${misc:Depends}
290-
Breaks: qgis-common (<< 1.5)
291-
Replaces: qgis-common (<< 1.5)
292-
Description: GRASS plugin for QGIS - architecture-independent data
276+
#grass7#Breaks: qgis-plugin-grass
277+
#grass7#Replaces: qgis-plugin-grass
278+
Description: GRASS plugin for QGIS
293279
QGIS is a Geographic Information System (GIS) which manages, analyzes and
294280
display databases of geographic information.
295281
.
296-
This package contains architecture-independent supporting data files for use
297-
with the QGIS GRASS plugin.
282+
This provider enables GRASS data access in QGIS.
298283

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

430-
#sid-oracle#Package: qgis-oracle-provider
431-
#sid-oracle#Architecture: any
432-
#sid-oracle#Depends: ${shlibs:Depends}, ${misc:Depends}
433-
#sid-oracle#Section: contrib/database
434-
#sid-oracle#Description: QGIS oracle provider
435-
#sid-oracle# QGIS is a Geographic Information System (GIS) which manages, analyzes and
436-
#sid-oracle# display databases of geographic information.
437-
#sid-oracle# .
438-
#sid-oracle# This package contains the QGIS oracle provider.
439-
#sid-oracle#
446+
#oracle#Package: qgis-oracle-provider
447+
#oracle#Architecture: any
448+
#oracle#Depends: ${shlibs:Depends}, ${misc:Depends}
449+
#oracle#Section: contrib/database
450+
#oracle#Description: QGIS oracle provider
451+
#oracle# QGIS is a Geographic Information System (GIS) which manages, analyzes and
452+
#oracle# display databases of geographic information.
453+
#oracle# .
454+
#oracle# This package contains the QGIS oracle provider.
455+
#oracle#

‎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

0 commit comments

Comments
 (0)