Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
debian packaging update
(cherry picked from commit e62d8fe)
  • Loading branch information
jef-n committed Mar 9, 2016
1 parent 49ce2fa commit 7baedaf
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 13 deletions.
5 changes: 5 additions & 0 deletions debian/changelog
@@ -1,7 +1,12 @@
qgis (2.14.0) UNRELEASED; urgency=medium

[ Jürgen E. Fischer ]
* Release of 2.14.0

[ Bas Couwenberg ]
* Fix removal of obsolete diversions for bother the grass plugin & provider.
(closes: #817176)

-- Jürgen E. Fischer <jef@norbit.de> Fri, 26 Feb 2016 13:23:48 +0100

qgis (2.13.0) unstable; urgency=medium
Expand Down
20 changes: 7 additions & 13 deletions debian/qgis.preinst
Expand Up @@ -3,19 +3,13 @@
set -e

if [ "$1" = "install" -o "$1" = "upgrade" ]; then
# Fix bad diversions
div=$(dpkg-divert --listpackage /usr/bin/qgis)
if [ -n "$div" -a "$div" = qgis-plugin-grass ]; then
for i in /usr/bin/qgis /usr/bin/qbrowser; do
if [ -e $i ] && ! [ -e $i.undiverted ]; then
mv $i $i.undiverted
fi
dpkg-divert --package qgis-plugin-grass --remove --rename --divert $i.bin $i
if [ -e $i.undiverted ]; then
mv $i.undiverted $i
fi
done
fi
# 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#
Expand Down

0 comments on commit 7baedaf

Please sign in to comment.