[qgis] 04/06: Update GRASS plugin & provider for GRASS 6.4 in jessie.
Bas Couwenberg
sebastic at debian.org
Sun Jul 24 23:37:26 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch jessie-backports
in repository qgis.
commit 60479cc13fb745afd399067d11c62c9a66ef8a79
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Jul 24 18:23:03 2016 +0200
Update GRASS plugin & provider for GRASS 6.4 in jessie.
---
debian/changelog | 1 +
debian/control | 6 +++---
debian/libqgis-dev.install | 2 +-
debian/libqgisgrass6-2.14.4.install | 1 +
...tian-overrides => libqgisgrass6-2.14.4.lintian-overrides} | 2 +-
...gisgrass7-2.14.4.symbols => libqgisgrass6-2.14.4.symbols} | 2 +-
debian/libqgisgrass7-2.14.4.install | 1 -
debian/qgis-plugin-grass.install | 4 ++--
debian/qgis-provider-grass.install | 12 ++++++------
debian/qgis.sh | 4 ++--
10 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9c5d0f1..07863b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qgis (2.14.4+dfsg-1~bpo8+1) jessie-backports; urgency=medium
* Rebuild for jessie-backports.
* Re-enable globe plugin, still supports osgEarth 2.5 in jessie.
* Re-enable QtWebKit support, still available in Qt4 for jessie.
+ * Update GRASS plugin & provider for GRASS 6.4 in jessie.
-- Bas Couwenberg <sebastic at debian.org> Sun, 24 Jul 2016 16:41:17 +0200
diff --git a/debian/control b/debian/control
index 8e83c84..5a6b1fd 100644
--- a/debian/control
+++ b/debian/control
@@ -162,7 +162,7 @@ Description: QGIS - shared network analysis library
.
This package contains the shared network analysis library.
-Package: libqgisgrass7-2.14.4
+Package: libqgisgrass6-2.14.4
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
@@ -230,7 +230,7 @@ Depends: grass-dev,
libqgis-analysis2.14.4 (= ${binary:Version}),
libqgis-networkanalysis2.14.4 (= ${binary:Version}),
libqgis-server2.14.4 (= ${binary:Version}),
- libqgisgrass7-2.14.4 (= ${binary:Version}),
+ libqgisgrass6-2.14.4 (= ${binary:Version}),
libqgispython2.14.4 (= ${binary:Version}),
libqt4-dev (>= 4.7.0),
libsqlite3-dev,
@@ -259,7 +259,7 @@ Depends: libqgis-app2.14.4 (= ${binary:Version}),
libqgis-analysis2.14.4 (= ${binary:Version}),
libqgis-networkanalysis2.14.4 (= ${binary:Version}),
libqgis-server2.14.4 (= ${binary:Version}),
- libqgisgrass7-2.14.4 (= ${binary:Version}),
+ libqgisgrass6-2.14.4 (= ${binary:Version}),
libqgispython2.14.4 (= ${binary:Version}),
${misc:Depends}
Suggests: gdb
diff --git a/debian/libqgis-dev.install b/debian/libqgis-dev.install
index 82783f5..7f2a23a 100644
--- a/debian/libqgis-dev.install
+++ b/debian/libqgis-dev.install
@@ -5,6 +5,6 @@ usr/lib/libqgis_gui.so
usr/lib/libqgis_analysis.so
usr/lib/libqgis_networkanalysis.so
usr/lib/libqgis_server.so
-usr/lib/libqgisgrass7.so
+usr/lib/libqgisgrass?.so
usr/lib/libqgispython.so
usr/share/qgis/FindQGIS.cmake
diff --git a/debian/libqgisgrass6-2.14.4.install b/debian/libqgisgrass6-2.14.4.install
new file mode 100644
index 0000000..b09ea24
--- /dev/null
+++ b/debian/libqgisgrass6-2.14.4.install
@@ -0,0 +1 @@
+usr/lib/libqgisgrass?.so.*
diff --git a/debian/libqgisgrass7-2.14.4.lintian-overrides b/debian/libqgisgrass6-2.14.4.lintian-overrides
similarity index 70%
rename from debian/libqgisgrass7-2.14.4.lintian-overrides
rename to debian/libqgisgrass6-2.14.4.lintian-overrides
index 859cd40..b949185 100644
--- a/debian/libqgisgrass7-2.14.4.lintian-overrides
+++ b/debian/libqgisgrass6-2.14.4.lintian-overrides
@@ -1,4 +1,4 @@
# Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports:
# Fortify Source functions: no, only unprotected functions found!
-libqgisgrass7-2.14.4: hardening-no-fortify-functions *
+libqgisgrass6-2.14.4: hardening-no-fortify-functions *
diff --git a/debian/libqgisgrass7-2.14.4.symbols b/debian/libqgisgrass6-2.14.4.symbols
similarity index 99%
rename from debian/libqgisgrass7-2.14.4.symbols
rename to debian/libqgisgrass6-2.14.4.symbols
index 3476a1b..64e9bdd 100644
--- a/debian/libqgisgrass7-2.14.4.symbols
+++ b/debian/libqgisgrass6-2.14.4.symbols
@@ -1,5 +1,5 @@
# SymbolsHelper-Confirmed: 2.14.4 amd64 arm64 armel armhf mips mips64el mipsel powerpc ppc64el s390x
-libqgisgrass7.so.2.14.4 #PACKAGE# #MINVER#
+libqgisgrass6.so.2.14.4 #PACKAGE# #MINVER#
Vect_delete_line_function_pointer at Base 2.14.0
Vect_rewrite_line_function_pointer at Base 2.14.0
_Z23qStringComparisonHelperRK7QStringPKc at Base 2.8.4
diff --git a/debian/libqgisgrass7-2.14.4.install b/debian/libqgisgrass7-2.14.4.install
deleted file mode 100644
index d6a1342..0000000
--- a/debian/libqgisgrass7-2.14.4.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libqgisgrass7.so.*
diff --git a/debian/qgis-plugin-grass.install b/debian/qgis-plugin-grass.install
index 577b47b..9476195 100644
--- a/debian/qgis-plugin-grass.install
+++ b/debian/qgis-plugin-grass.install
@@ -1,2 +1,2 @@
-usr/lib/qgis/grass/bin/qgis.g.browser7
-usr/lib/qgis/plugins/libgrassplugin7.so
+usr/lib/qgis/grass/bin/qgis.g.browser?
+usr/lib/qgis/plugins/libgrassplugin?.so
diff --git a/debian/qgis-provider-grass.install b/debian/qgis-provider-grass.install
index c431392..f0f15a3 100644
--- a/debian/qgis-provider-grass.install
+++ b/debian/qgis-provider-grass.install
@@ -1,6 +1,6 @@
-usr/lib/qgis/grass/modules/qgis.d.rast7
-usr/lib/qgis/grass/modules/qgis.g.info7
-usr/lib/qgis/grass/modules/qgis.r.in7
-usr/lib/qgis/grass/modules/qgis.v.in7
-usr/lib/qgis/plugins/libgrassprovider7.so
-usr/lib/qgis/plugins/libgrassrasterprovider7.so
+usr/lib/qgis/grass/modules/qgis.d.rast?
+usr/lib/qgis/grass/modules/qgis.g.info?
+usr/lib/qgis/grass/modules/qgis.r.in?
+usr/lib/qgis/grass/modules/qgis.v.in?
+usr/lib/qgis/plugins/libgrassprovider?.so
+usr/lib/qgis/plugins/libgrassrasterprovider?.so
diff --git a/debian/qgis.sh b/debian/qgis.sh
index a709000..b7e81b7 100644
--- a/debian/qgis.sh
+++ b/debian/qgis.sh
@@ -2,9 +2,9 @@
if dpkg -s qgis-plugin-grass >/dev/null 2>&1; then
if [ "$LD_LIBRARY_PATH" = "" ]; then
- LD_LIBRARY_PATH=/usr/lib/grass70/lib
+ LD_LIBRARY_PATH=/usr/lib/grass64/lib
else
- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/grass70/lib
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/grass64/lib
fi
fi
--
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