[X2Go-Commits] [x2gothinclient] 01/01: debian/x2gothinclient-minidesktop.postrm: We use dpkg-divert --rename --add in preinst, so let's use --rename also with dpkg-divert --remove. (See Debian bug #947683).

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gothinclient.

commit 3ed748a96c23b6e738a53aa053ba09c737ca81b4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jan 2 16:41:24 2020 +0100

    debian/x2gothinclient-minidesktop.postrm: We use dpkg-divert --rename --add in preinst, so let's use --rename also with dpkg-divert --remove. (See Debian bug #947683).
---
 debian/changelog                         | 3 +++
 debian/x2gothinclient-minidesktop.postrm | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e376482..eb36aa2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,9 @@ x2gothinclient (1.5.0.2-0x2go1) UNRELEASED; urgency=medium
       (see Debian bug #947618).
   * debian/control:
     + Add Ds (minidesktop): alsa-tools, pulseaudio, pavucontrol.
+  * debian/x2gothinclient-minidesktop.postrm:
+    + We use dpkg-divert --rename --add in preinst, so let's use --rename also
+      with dpkg-divert --remove. (See Debian bug #947683).
 
  -- X2Go Release Manager <git-admin at x2go.org>  Fri, 29 Nov 2019 08:26:12 +0100
 
diff --git a/debian/x2gothinclient-minidesktop.postrm b/debian/x2gothinclient-minidesktop.postrm
index 1205214..02ccc76 100755
--- a/debian/x2gothinclient-minidesktop.postrm
+++ b/debian/x2gothinclient-minidesktop.postrm
@@ -19,13 +19,13 @@ set -e
 case "$1" in
 	purge|remove)
 		if dpkg-divert --list | grep x2goclient.desktop.disabled-by-x2gotce 1>/dev/null 2>/dev/null; then
-			dpkg-divert --package x2gothinclient-minidesktop --remove /usr/share/applications/x2goclient.desktop
+			dpkg-divert --package x2gothinclient-minidesktop --rename --remove /usr/share/applications/x2goclient.desktop
 		fi
 		if dpkg-divert --list | grep usr/lib/x2go/x2goclient 1>/dev/null 2>/dev/null; then
-			dpkg-divert --package x2gothinclient-minidesktop --remove /usr/bin/x2goclient
+			dpkg-divert --package x2gothinclient-minidesktop --rename --remove /usr/bin/x2goclient
 		fi
 		if dpkg-divert --list | grep lightdm.conf.disabled-by-x2gotce 1>/dev/null 2>/dev/null; then
-			dpkg-divert --package x2gothinclient-minidesktop --remove /etc/lightdm/lightdm.conf
+			dpkg-divert --package x2gothinclient-minidesktop --rename --remove /etc/lightdm/lightdm.conf
 		fi
 		;;
 	upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git