debian packaging update

qgis · Sep 22, 2015 · 6a6adc9 · 6a6adc9
1 parent 32dc02c
commit 6a6adc9
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 38 deletions.
diff --git a/debian/control.in b/debian/control.in
@@ -71,7 +71,7 @@ Depends:
  qgis-providers (= ${binary:Version}),
  qgis-common (= ${source:Version})
 Recommends:
-#grass6# qgis-plugin-grass,
+ qgis-plugin-grass,
  qgis-provider-grass,
  qgis-plugin-globe,
  python-qgis
@@ -273,46 +273,43 @@ Depends:
  qgis (= ${binary:Version}),
  ${shlibs:Depends},
  ${misc:Depends}
-#grass7#Breaks: qgis-plugin-grass
-#grass7#Replaces: qgis-plugin-grass
-#grass6#Breaks: qgis-plugin-grass (<< 1:2.11.0+git20150906)
 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.
 
-#grass6#Package: qgis-plugin-grass
-#grass6#Architecture: any
-#grass6#Depends:
-#grass6# qgis (= ${binary:Version}),
-#grass6# qgis-plugin-grass-common (= ${source:Version}),
-#grass6# qgis-provider-grass (= ${source:Version}),
-#grass6# ${shlibs:Depends},
-#grass6# ${misc:Depends},
-#grass6##!precise# grass-core (<< 7)
-#grass6##precise# grass (<< 7)
-#grass6#Description: GRASS plugin for QGIS
-#grass6# QGIS is a Geographic Information System (GIS) which manages, analyzes and
-#grass6# display databases of geographic information.
-#grass6# .
-#grass6# This plugin enables GRASS data access in QGIS.
-#grass6#
-#grass6#Package: qgis-plugin-grass-common
-#grass6#Architecture: all
-#grass6#Depends:
-#grass6##saucy trusty# python2.7,
-#grass6##precise# python,
-#grass6# ${misc:Depends}
-#grass6#Breaks: qgis-common (<< 1.5)
-#grass6#Replaces: qgis-common (<< 1.5)
-#grass6#Description: GRASS plugin for QGIS - architecture-independent data
-#grass6# QGIS is a Geographic Information System (GIS) which manages, analyzes and
-#grass6# display databases of geographic information.
-#grass6# .
-#grass6# This package contains architecture-independent supporting data files for use
-#grass6# with the QGIS GRASS plugin.
-#grass6#
+Package: qgis-plugin-grass
+Architecture: any
+Depends:
+ qgis (= ${binary:Version}),
+ qgis-plugin-grass-common (= ${source:Version}),
+ qgis-provider-grass (= ${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 QGIS.
+
+Package: qgis-plugin-grass-common
+Architecture: all
+Depends:
+#saucy trusty# python2.7,
+#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.
+
 Package: qgis-plugin-globe
 Architecture: any
 Depends:

diff --git a/debian/qgis-common.install b/debian/qgis-common.install
@@ -14,7 +14,9 @@ usr/share/qgis/doc/images
 usr/share/qgis/doc/index.html
 usr/share/qgis/doc/news
 usr/share/qgis/doc/news.html
+usr/share/qgis/doc/whatsnew.html
 usr/share/qgis/doc/style.css
 usr/share/qgis/i18n/*
 usr/share/qgis/images/*
 usr/share/qgis/resources/spatialite.db
+usr/share/qgis/resources/themes/*
diff --git a/debian/qgis-plugin-grass-common.install b/debian/qgis-plugin-grass-common.install
@@ -4,3 +4,4 @@ usr/share/qgis/grass/modules/*.qgm
 usr/share/qgis/grass/modules/*.svg
 usr/share/qgis/grass/modules/default.qgc
 usr/share/qgis/grass/scripts/*.py
+usr/share/qgis/grass/qtermwidget/*
diff --git a/debian/qgis-provider-grass.install.in b/debian/qgis-provider-grass.install.in
@@ -1,4 +1,6 @@
 usr/lib/qgis/grass/modules/qgis.d.rast{GRASSVER}
 usr/lib/qgis/grass/modules/qgis.g.info{GRASSVER}
+usr/lib/qgis/grass/modules/qgis.r.in{GRASSVER}
+usr/lib/qgis/grass/modules/qgis.v.in{GRASSVER}
 usr/lib/qgis/plugins/libgrassprovider{GRASSVER}.so
 usr/lib/qgis/plugins/libgrassrasterprovider{GRASSVER}.so
diff --git a/debian/rules b/debian/rules
@@ -115,9 +115,6 @@ endif
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CMAKE_OPTS += -DCMAKE_BUILD_TYPE=Debug
-ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	CMAKE_OPTS += -DENABLE_COVERAGE=TRUE
-endif
 endif
 
 ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))