[debian-edu-commits] debian-edu/ 07/09: Adjust d-e-a to reflect the theme packages changes concerning gnome and gdm3.

[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 4421f56ad9e76ce5bd0808deb14abe18c64912bf
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Thu Dec 22 21:51:06 2016 +0100

    Adjust d-e-a to reflect the theme packages changes concerning gnome and gdm3.
    
    Drop no longer needed diversion and linking.
    Ensure diversion and link get removed upon upgrades. (Closes: #848294).
---
 debian/debian-edu-artwork.install  |  2 --
 debian/debian-edu-artwork.links    |  1 -
 debian/debian-edu-artwork.postinst |  6 ++++++
 debian/debian-edu-artwork.preinst  | 12 ------------
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/debian/debian-edu-artwork.install b/debian/debian-edu-artwork.install
index 470bca9..1c08399 100644
--- a/debian/debian-edu-artwork.install
+++ b/debian/debian-edu-artwork.install
@@ -1,5 +1,3 @@
-etc/
 usr/share/glib-2.0/
 usr/share/mate-panel/
-usr/share/gdm/
 
diff --git a/debian/debian-edu-artwork.links b/debian/debian-edu-artwork.links
deleted file mode 100644
index 39cbaed..0000000
--- a/debian/debian-edu-artwork.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/gnome-shell/theme/gnome-shell.css.edu-diverted usr/share/gnome-shell/theme/gnome-shell.css
diff --git a/debian/debian-edu-artwork.postinst b/debian/debian-edu-artwork.postinst
index 1c4c99a..0ffc01d 100755
--- a/debian/debian-edu-artwork.postinst
+++ b/debian/debian-edu-artwork.postinst
@@ -18,12 +18,18 @@ case "$1" in
 			# remove deprecated diversion (now managed by alternatives)
 			dpkg-divert --package debian-edu-artwork \
 			            --rename --remove /usr/share/images/desktop-base/login-background.svg
+			# remove deprecated diversion (gdm3 background image configuration dropped)
+			dpkg-divert --package debian-edu-artwork \
+			            --rename --remove /usr/share/gnome-shell/theme/gnome-shell.css
 			if [ -h /usr/share/images/desktop-base/debian-edu-pxe.png ] ; then
 				rm -f /usr/share/images/desktop-base/debian-edu-pxe.png
 			fi
 			if [ -h /usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/20-desktop-base-edu.js ] ; then
 				rm -f /usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/20-desktop-base-edu.js
 			fi
+			if [ -h /usr/share/gnome-shell/theme/gnome-shell.css ] ; then
+				rm -f /usr/share/gnome-shell/theme/gnome-shell.css
+			fi
 		fi
 	;;
 esac
diff --git a/debian/debian-edu-artwork.preinst b/debian/debian-edu-artwork.preinst
deleted file mode 100755
index 105a9ca..0000000
--- a/debian/debian-edu-artwork.preinst
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh 
-
-set -e
-
-if [ "$1" = install ] || [ $1 = upgrade ]; then
-	dpkg-divert --package debian-edu-artwork \
-	            --rename \
-	            --divert /usr/share/gnome-shell/theme/gnome-shell.css.edu-diverted \
-	            /usr/share/gnome-shell/theme/gnome-shell.css
-fi
-
-#DEBHELPER#

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