[debian-edu-commits] debian-edu/ 01/01: Fix debian-edu-artwork.(postinst|postrm). (Closes: #847279). - Remove deprecated diversion from pre stretch versions. - Remove otherwise dangling symlink if the package is purged. Thanks to Andreas Beckmann.

[Wolfgang Schweer]

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

schweer-guest pushed a commit to branch master
in repository debian-edu-artwork.

commit 49245cdb664c90fc6e1967b262c283ff7a5145bd
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Thu Dec 8 14:58:04 2016 +0100

    Fix debian-edu-artwork.(postinst|postrm). (Closes: #847279).
    - Remove deprecated diversion from pre stretch versions.
    - Remove otherwise dangling symlink if the package is purged.
    Thanks to Andreas Beckmann.
---
 debian/changelog                   | 9 +++++++++
 debian/debian-edu-artwork.postinst | 6 ++++++
 debian/debian-edu-artwork.postrm   | 7 +++++++
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index bb83d1f..d24128b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+debian-edu-artwork (0.901-4) UNRELEASED; urgency=medium
+
+  * Fix debian-edu-artwork.(postinst|postrm). (Closes: #847279).
+    - Remove deprecated diversion from pre stretch versions.
+    - Remove otherwise dangling symlink if the package is purged.
+    Thanks to Andreas Beckmann.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 08 Dec 2016 14:43:18 +0100
+
 debian-edu-artwork (0.901-3) unstable; urgency=medium
 
   [ Wolfgang Schweer ]
diff --git a/debian/debian-edu-artwork.postinst b/debian/debian-edu-artwork.postinst
index b669b8a..63dfaea 100755
--- a/debian/debian-edu-artwork.postinst
+++ b/debian/debian-edu-artwork.postinst
@@ -14,5 +14,11 @@ case "$1" in
 			dpkg-divert --package debian-edu-artwork \
 			            --rename --remove /etc/gdm3/greeter.gsettings
 		fi
+		if dpkg --compare-versions "$2" le "0.52-2"; then
+			# remove deprecated diversion (bug #847279)
+			dpkg-divert --package debian-edu-artwork \
+			            --rename --remove /usr/share/kde4/apps/plasma-desktop/init/10-desktop-base.js
+		fi
+
 	;;
 esac
diff --git a/debian/debian-edu-artwork.postrm b/debian/debian-edu-artwork.postrm
index a20dd69..59c6e94 100755
--- a/debian/debian-edu-artwork.postrm
+++ b/debian/debian-edu-artwork.postrm
@@ -9,12 +9,19 @@ restore_plymouth_theme() {
 	fi
 }
 
+unlink_desktop_base_edu_js() {
+	if [ -h /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js ] ; then
+	    rm -f /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js
+	fi
+}
+
 if [ "$1" = remove ]; then
 	dpkg-divert --package debian-edu-artwork --rename \
 	            --remove /usr/share/images/desktop-base/login-background.svg
 	dpkg-divert --package debian-edu-artwork --rename \
 	            --remove /usr/share/gnome-shell/theme/gnome-shell.css
 	restore_plymouth_theme
+	unlink_desktop_base_edu_js
 fi
 
 #DEBHELPER#

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-artwork.git