[debian-edu-commits] debian-edu/ 03/04: Fix debian-edu-artwork.(postinst|postrm); thanks again to Andreas Beckmann for hints and explanations. (Closes: #847279).

[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 bdc64dfcb609834457ac4d4e167daa73c1b63661
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Wed Dec 14 19:34:05 2016 +0100

    Fix debian-edu-artwork.(postinst|postrm); thanks again to Andreas Beckmann for hints and explanations. (Closes: #847279).
---
 debian/changelog                   |  2 ++
 debian/debian-edu-artwork.postinst | 10 ++--------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0bfa40d..23cc016 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 debian-edu-artwork (0.902-1) UNRELEASED; urgency=medium
 
   * Bump version to 0.902-1.
+  * Fix debian-edu-artwork.(postinst|postrm); thanks again to Andreas Beckmann
+    for hints and explanations. (Closes: #847279).
   * Make d-e-a and d-e-a-(lines|softwaves) compatible with desktop-base 9.0.0.
     - Use structure similar to desktop-base for d-e-a-(lines|softwaves).
     - Drop playground/stretch, put everything needed into art-softwaves.
diff --git a/debian/debian-edu-artwork.postinst b/debian/debian-edu-artwork.postinst
index f974cbe..5828aef 100755
--- a/debian/debian-edu-artwork.postinst
+++ b/debian/debian-edu-artwork.postinst
@@ -6,24 +6,18 @@ set -e
 
 case "$1" in
 	configure)
-		# remove deprecated diversion
-		if dpkg --compare-versions "$2" le "0.0.39-1"; then
+		if dpkg --compare-versions "$2" lt-nl "0.902-1~"; then
 			# remove deprecated diversion (bug #715153)
 			dpkg-divert --package debian-edu-artwork \
 			            --remove /usr/share/gdm/defaults.conf
 			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
-		if dpkg --compare-versions "$2" le "0.901-4"; then
 			# remove deprecated diversion (now managed by alternatives)
 			dpkg-divert --package debian-edu-artwork \
-			--rename --remove /usr/share/images/desktop-base/login-background.svg
+			            --rename --remove /usr/share/images/desktop-base/login-background.svg
 		fi
-
 	;;
 esac

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