This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qgis.
commit 0c2e4f7bc01e64c883d73b9bf8c3463781a30d15 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sat Sep 17 19:59:52 2016 +0200 Remove obsolete diversions in qgis.preinst again, but don't rename. (closes: #836993) --- debian/changelog | 2 ++ debian/{qgis.postinst => qgis.preinst} | 4 ++-- debian/qgis.prerm | 17 ----------------- 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/debian/changelog b/debian/changelog index dae0a77..eb46ee9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ qgis (2.14.6+dfsg-4) UNRELEASED; urgency=medium * Add patch to fix 'columns' typo. + * Remove obsolete diversions in qgis.preinst again, but don't rename. + (closes: #836993) -- Bas Couwenberg <sebas...@debian.org> Sat, 17 Sep 2016 19:57:33 +0200 diff --git a/debian/qgis.postinst b/debian/qgis.preinst similarity index 73% rename from debian/qgis.postinst rename to debian/qgis.preinst index 859d2aa..04d4844 100644 --- a/debian/qgis.postinst +++ b/debian/qgis.preinst @@ -2,12 +2,12 @@ set -e -if [ "$1" = "configure" ]; then +if [ "$1" = "install" -o "$1" = "upgrade" ]; then # Remove obsolete diversions for i in /usr/bin/qgis /usr/bin/qbrowser; do pkg=$(dpkg-divert --listpackage $i) if [ -n "$pkg" -a "$pkg" = qgis-plugin-grass -o "$pkg" = qgis-provider-grass ]; then - dpkg-divert --package $pkg --rename --remove $i + dpkg-divert --package $pkg --remove $i fi done fi diff --git a/debian/qgis.prerm b/debian/qgis.prerm deleted file mode 100644 index 3d3f8cf..0000000 --- a/debian/qgis.prerm +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "remove" -o "$1" = "upgrade" ]; then - # Remove obsolete diversions - for i in /usr/bin/qgis /usr/bin/qbrowser; do - pkg=$(dpkg-divert --listpackage $i) - if [ -n "$pkg" -a "$pkg" = qgis-plugin-grass -o "$pkg" = qgis-provider-grass ]; then - dpkg-divert --package $pkg --rename --remove $i - fi - done -fi - -#DEBHELPER# - -exit 0 -- 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