This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository qgis.
commit 476dd3592255634b2c7c49c2ace0a835191787ea
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Sun Aug 23 14:09:14 2015 +0200
Disable GRASS plugin, doesn't support GRASS 7.
---
debian/changelog | 1 +
debian/control | 82 +++++++++++++++++++++---------------------
debian/control.in | 88 +++++++++++++++++++++++-----------------------
debian/libqgis-dev.install | 2 +-
debian/rules | 6 ++++
5 files changed, 94 insertions(+), 85 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2eb2c0e..637995d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qgis (2.8.3+dfsg-1~exp2) UNRELEASED; urgency=medium
* Update symbols for other architectures.
* Use upstream-ltr branch in gbp.conf.
+ * Disable GRASS plugin, doesn't support GRASS 7.
-- Bas Couwenberg <sebas...@debian.org> Sat, 01 Aug 2015 11:28:25 +0200
diff --git a/debian/control b/debian/control
index d662817..ef42565 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 (<< 7),
libexpat1-dev,
libfcgi-dev,
libgdal-dev (>= 1.10.1-0~),
@@ -66,7 +66,8 @@ Depends: ${shlibs:Depends},
python-qgis (= ${binary:Version}),
qgis-providers (= ${binary:Version}),
qgis-common (= ${source:Version})
-Recommends: qgis-plugin-grass,
+Recommends:
+# qgis-plugin-grass,
qgis-plugin-globe
Suggests: gpsbabel
Conflicts: uim-qt3
@@ -135,16 +136,16 @@ Description: QGIS - shared network analysis library
.
This package contains the shared network analysis library.
-Package: libqgisgrass2.8.3
-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.3
+#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.3
Architecture: any
@@ -190,7 +191,8 @@ Description: QGIS - shared server library
Package: libqgis-dev
Architecture: any
Section: libdevel
-Depends: grass-dev (<< 7),
+Depends:
+# grass-dev (<< 7),
libexpat1-dev,
libgdal-dev (>= 1.10.1-0~),
libgeos-dev (>= 3.0.0),
@@ -202,7 +204,7 @@ Depends: grass-dev (<< 7),
libqgis-analysis2.8.3 (= ${binary:Version}),
libqgis-networkanalysis2.8.3 (= ${binary:Version}),
libqgis-server2.8.3 (= ${binary:Version}),
- libqgisgrass2.8.3 (= ${binary:Version}),
+# libqgisgrass2.8.3 (= ${binary:Version}),
libqgispython2.8.3 (= ${binary:Version}),
libqt4-dev (>= 4.7.0),
libsqlite3-dev,
@@ -229,7 +231,7 @@ Depends: libqgis-core2.8.3 (= ${binary:Version}),
libqgis-analysis2.8.3 (= ${binary:Version}),
libqgis-networkanalysis2.8.3 (= ${binary:Version}),
libqgis-server2.8.3 (= ${binary:Version}),
- libqgisgrass2.8.3 (= ${binary:Version}),
+# libqgisgrass2.8.3 (= ${binary:Version}),
libqgispython2.8.3 (= ${binary:Version}),
${misc:Depends}
Suggests: gdb
@@ -239,31 +241,31 @@ Description: QGIS - debugging symbols
.
This package contains debugging symbols.
-Package: qgis-plugin-grass
-Architecture: any
-Depends: qgis (= ${binary:Version}),
- qgis-plugin-grass-common (= ${source:Version}),
- ${shlibs:Depends},
- ${misc:Depends},
- grass-core (<< 7)
-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.
-
-Package: qgis-plugin-grass-common
-Architecture: all
-Depends: python2.7,
- ${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.
+#Package: qgis-plugin-grass
+#Architecture: any
+#Depends: qgis (= ${binary:Version}),
+# qgis-plugin-grass-common (= ${source:Version}),
+# ${shlibs:Depends},
+# ${misc:Depends},
+# grass-core (<< 7)
+#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.
+#
+#Package: qgis-plugin-grass-common
+#Architecture: all
+#Depends: python2.7,
+# ${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.
Package: qgis-plugin-globe
Architecture: any
diff --git a/debian/control.in b/debian/control.in
index 8c38153..a2192b1 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -9,7 +9,7 @@ Build-Depends:
#sid jessie wheezy saucy sid-oracle trusty utopic vivid# debhelper (>= 9),
#precise# debhelper (>= 7),
flex,
- grass-dev (<< 7),
+#!sid# grass-dev,
libexpat1-dev,
libfcgi-dev,
#sid jessie sid-oracle trusty utopic vivid# libgdal-dev (>= 1.10.1-0~),
@@ -70,7 +70,7 @@ Depends:
qgis-providers (= ${binary:Version}),
qgis-common (= ${source:Version})
Recommends:
- qgis-plugin-grass,
+#!sid# qgis-plugin-grass,
qgis-plugin-globe
Suggests: gpsbabel
Conflicts: uim-qt3
@@ -145,18 +145,18 @@ Description: QGIS - shared network analysis library
.
This package contains the shared network analysis library.
-Package: libqgisgrass{QGIS_ABI}
-Architecture: any
-Section: libs
-Depends:
- ${shlibs:Depends},
- ${misc:Depends}
-Replaces: libqgis{QGIS_ABI}
-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.
+#!sid#Package: libqgisgrass{QGIS_ABI}
+#!sid#Architecture: any
+#!sid#Section: libs
+#!sid#Depends:
+#!sid# ${shlibs:Depends},
+#!sid# ${misc:Depends}
+#!sid#Replaces: libqgis{QGIS_ABI}
+#!sid#Description: QGIS - shared grass library
+#!sid# QGIS is a Geographic Information System (GIS) which manages, analyzes
and
+#!sid# display databases of geographic information.
+#!sid# .
+#!sid# This package contains the shared grass library.
Package: libqgispython{QGIS_ABI}
Architecture: any
@@ -210,7 +210,7 @@ Package: libqgis-dev
Architecture: any
Section: libdevel
Depends:
- grass-dev (<< 7),
+#!sid# 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),
@@ -225,7 +225,7 @@ Depends:
libqgis-analysis{QGIS_ABI} (= ${binary:Version}),
libqgis-networkanalysis{QGIS_ABI} (= ${binary:Version}),
libqgis-server{QGIS_ABI} (= ${binary:Version}),
- libqgisgrass{QGIS_ABI} (= ${binary:Version}),
+#!sid# libqgisgrass{QGIS_ABI} (= ${binary:Version}),
libqgispython{QGIS_ABI} (= ${binary:Version}),
libqt4-dev (>= 4.7.0),
libsqlite3-dev,
@@ -254,7 +254,7 @@ Depends:
libqgis-analysis{QGIS_ABI} (= ${binary:Version}),
libqgis-networkanalysis{QGIS_ABI} (= ${binary:Version}),
libqgis-server{QGIS_ABI} (= ${binary:Version}),
- libqgisgrass{QGIS_ABI} (= ${binary:Version}),
+#!sid# libqgisgrass{QGIS_ABI} (= ${binary:Version}),
libqgispython{QGIS_ABI} (= ${binary:Version}),
${misc:Depends}
Suggests: gdb
@@ -264,35 +264,35 @@ Description: QGIS - debugging symbols
.
This package contains debugging symbols.
-Package: qgis-plugin-grass
-Architecture: any
-Depends:
- qgis (= ${binary:Version}),
- qgis-plugin-grass-common (= ${source:Version}),
- ${shlibs:Depends},
- ${misc:Depends},
-#!precise# grass-core (<< 7)
-#precise# grass (<< 7)
-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.
+#!sid#Package: qgis-plugin-grass
+#!sid#Architecture: any
+#!sid#Depends:
+#!sid# qgis (= ${binary:Version}),
+#!sid# qgis-plugin-grass-common (= ${source:Version}),
+#!sid# ${shlibs:Depends},
+#!sid# ${misc:Depends},
+#!sid !precise# grass-core (<< 7)
+#!sid precise# grass (<< 7)
+#!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 the QGIS geographic data
viewer.
-Package: qgis-plugin-grass-common
-Architecture: all
-Depends:
-#sid jessie saucy sid-oracle trusty# python2.7,
+#!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.
Package: qgis-plugin-globe
Architecture: any
diff --git a/debian/libqgis-dev.install b/debian/libqgis-dev.install
index a6fdc2f..6b4d980 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/rules b/debian/rules
index 95ec62a..d62a73b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,6 +72,10 @@ 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
@@ -225,10 +229,12 @@ override_dh_auto_install:
$(RM) $(CURDIR)/debian/tmp/usr/bin/qgis
$(RM) $(CURDIR)/debian/tmp/usr/bin/qbrowser
+ifeq (,$(findstring $(DISTRIBUTION),"sid"))
# 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
+endif
override_dh_auto_install-indep:
install -o root -g root -m 755 -d
$(CURDIR)/debian/tmp/usr/share/qgis/doc
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/qgis.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
