[qgis] 08/14: Re-enable GRASS support for qgis-provider-grass.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Tue Dec 1 22:36:56 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository qgis.
commit 45bb1b8d28100e3828fc27bfbe29de3a5322791c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Nov 30 18:33:01 2015 +0100
Re-enable GRASS support for qgis-provider-grass.
Changes:
- Re-enable grass-dev & libqgisgrass (build) dependencies
- Add qgis-provider-grass package
- Update lintian overrides for move to provider package.
---
debian/control | 43 ++++++++++++++++++----------
debian/libqgis-dev.install | 2 +-
debian/qgis-provider-grass.install | 4 +++
debian/qgis-provider-grass.lintian-overrides | 2 --
debian/rules | 4 ---
debian/source.lintian-overrides | 6 ++--
6 files changed, 36 insertions(+), 25 deletions(-)
diff --git a/debian/control b/debian/control
index b0d8ecd..ea5a977 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: bison,
cmake (>= 2.8),
debhelper (>= 9),
flex,
-# grass-dev (<< 7),
+ grass-dev,
libexpat1-dev,
libfcgi-dev,
libgdal-dev (>= 1.10.1-0~),
@@ -69,6 +69,7 @@ Depends: ${shlibs:Depends},
qgis-common (= ${source:Version})
Recommends:
# qgis-plugin-grass,
+ qgis-provider-grass,
qgis-plugin-globe
Suggests: gpsbabel
Conflicts: uim-qt3
@@ -137,16 +138,16 @@ Description: QGIS - shared network analysis library
.
This package contains the shared network analysis library.
-#Package: libqgisgrass2.8.4
-#Architecture: any
-#Section: libs
-#Depends: ${shlibs:Depends},
-# ${misc:Depends}
-#Description: QGIS - shared grass library
-# QGIS is a Geographic Information System (GIS) which manages, analyzes and
-# display databases of geographic information.
-# .
-# This package contains the shared grass library.
+Package: libqgisgrass2.8.4
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Description: QGIS - shared grass library
+ QGIS is a Geographic Information System (GIS) which manages, analyzes and
+ display databases of geographic information.
+ .
+ This package contains the shared grass library.
Package: libqgispython2.8.4
Architecture: any
@@ -192,8 +193,7 @@ Description: QGIS - shared server library
Package: libqgis-dev
Architecture: any
Section: libdevel
-Depends:
-# grass-dev (<< 7),
+Depends: grass-dev,
libexpat1-dev,
libgdal-dev (>= 1.10.1-0~),
libgeos-dev (>= 3.0.0),
@@ -205,7 +205,7 @@ Depends:
libqgis-analysis2.8.4 (= ${binary:Version}),
libqgis-networkanalysis2.8.4 (= ${binary:Version}),
libqgis-server2.8.4 (= ${binary:Version}),
-# libqgisgrass2.8.4 (= ${binary:Version}),
+ libqgisgrass2.8.4 (= ${binary:Version}),
libqgispython2.8.4 (= ${binary:Version}),
libqt4-dev (>= 4.7.0),
libsqlite3-dev,
@@ -232,7 +232,7 @@ Depends: libqgis-core2.8.4 (= ${binary:Version}),
libqgis-analysis2.8.4 (= ${binary:Version}),
libqgis-networkanalysis2.8.4 (= ${binary:Version}),
libqgis-server2.8.4 (= ${binary:Version}),
-# libqgisgrass2.8.4 (= ${binary:Version}),
+ libqgisgrass2.8.4 (= ${binary:Version}),
libqgispython2.8.4 (= ${binary:Version}),
${misc:Depends}
Suggests: gdb
@@ -242,6 +242,19 @@ Description: QGIS - debugging symbols
.
This package contains debugging symbols.
+Package: qgis-provider-grass
+Architecture: any
+Depends: qgis (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends}
+Breaks: qgis-plugin-grass (<< 2.8.4)
+Replaces: qgis-plugin-grass (<< 2.8.4)
+Description: GRASS plugin for QGIS
+ QGIS is a Geographic Information System (GIS) which manages, analyzes and
+ display databases of geographic information.
+ .
+ This provider enables GRASS data access in QGIS.
+
#Package: qgis-plugin-grass
#Architecture: any
#Depends: qgis (= ${binary:Version}),
diff --git a/debian/libqgis-dev.install b/debian/libqgis-dev.install
index 6b4d980..a6fdc2f 100644
--- a/debian/libqgis-dev.install
+++ b/debian/libqgis-dev.install
@@ -4,6 +4,6 @@ usr/lib/libqgis_gui.so
usr/lib/libqgis_analysis.so
usr/lib/libqgis_networkanalysis.so
usr/lib/libqgis_server.so
-#usr/lib/libqgisgrass.so
+usr/lib/libqgisgrass.so
usr/lib/libqgispython.so
usr/share/qgis/FindQGIS.cmake
diff --git a/debian/qgis-provider-grass.install b/debian/qgis-provider-grass.install
new file mode 100644
index 0000000..7ca434b
--- /dev/null
+++ b/debian/qgis-provider-grass.install
@@ -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
diff --git a/debian/qgis-provider-grass.lintian-overrides b/debian/qgis-provider-grass.lintian-overrides
deleted file mode 100644
index d830446..0000000
--- a/debian/qgis-provider-grass.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-qgis-plugin-grass: package-name-doesnt-match-sonames
-qgis-plugin-grass: no-symbols-control-file
diff --git a/debian/rules b/debian/rules
index 953a856..ed2fa48 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,10 +80,6 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
endif
-ifneq (,$(findstring $(DISTRIBUTION),"sid"))
- CMAKE_OPTS += -DWITH_GRASS=FALSE
-endif
-
ifneq (,$(findstring $(DISTRIBUTION),"wheezy precise"))
CMAKE_OPTS += -DWITH_PYSPATIALITE=TRUE
endif
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
index 5078a06..2703c1a 100644
--- a/debian/source.lintian-overrides
+++ b/debian/source.lintian-overrides
@@ -1,4 +1,4 @@
-# False positive, the qgis-plugin-grass maintainer scripts use dpkg-divert to
+# False positive, the qgis-provider-grass maintainer scripts use dpkg-divert to
# use its LD_PRELOAD wrappers instead.
-qgis source: binaries-have-file-conflict qgis qgis-plugin-grass usr/bin/qbrowser
-qgis source: binaries-have-file-conflict qgis qgis-plugin-grass usr/bin/qgis
+qgis source: binaries-have-file-conflict qgis qgis-provider-grass usr/bin/qbrowser
+qgis source: binaries-have-file-conflict qgis qgis-provider-grass usr/bin/qgis
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git
More information about the Pkg-grass-devel
mailing list