[debian-edu-commits] debian-edu/ 400/437: - Handle unused diversions. (Closes: #715153) - Remove useless whitespace in update-artwork.

[Mike Gabriel]

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

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

commit 830862c8c931f9d65c9ffd28bc68f89d23d9c376
Author: Wolfgang Schweer <w.schweer at gmx.de>
Date:   Mon Jul 8 21:50:29 2013 +0000

      - Handle unused diversions.  (Closes: #715153)
      - Remove useless whitespace in update-artwork.
---
 debian/changelog                   |  2 ++
 debian/debian-edu-artwork.postinst | 12 ++++++++++++
 debian/debian-edu-artwork.postrm   |  2 --
 debian/debian-edu-artwork.preinst  |  2 ++
 debian/debian-edu-artwork.prerm    |  6 ++++++
 debian/update-artwork              |  2 +-
 6 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5497465..7471561 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ debian-edu-artwork (0.0.40-1) UNRELEASED; urgency=low
       /usr/share/glib-2.0/schemas/20_debian-edu.gschema.override
     - Call 'glib-compile-schemas /usr/share/glib-2.0/schemas/' to activate
       the overrides (function in script 'update-artwork').
+    - Handle unused diversions.  (Closes: #715153)
+    - Remove useless whitespace in update-artwork.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Mon, 08 Jul 2013 00:40:14 +0200
 
diff --git a/debian/debian-edu-artwork.postinst b/debian/debian-edu-artwork.postinst
index c170ffc..cc82b52 100644
--- a/debian/debian-edu-artwork.postinst
+++ b/debian/debian-edu-artwork.postinst
@@ -2,6 +2,18 @@
 
 set -e
 
+# remove deprecated diversion (bug #715153)
+if dpkg-divert --listpackage /usr/share/gdm/defaults.conf.orig >/dev/null; then
+    dpkg-divert --package debian-edu-artwork \
+        --remove /usr/share/gdm/defaults.conf
+fi
+
+# remove deprecated diversion
+if dpkg-divert --listpackage /etc/gdm3/greeter.gsettings.edu-diverted >/dev/null; then
+    dpkg-divert --package debian-edu-artwork \
+        --rename --remove /etc/gdm3/greeter.gsettings
+fi
+
 #DEBHELPER#
 
 case "$1" in
diff --git a/debian/debian-edu-artwork.postrm b/debian/debian-edu-artwork.postrm
index 9945676..144769c 100644
--- a/debian/debian-edu-artwork.postrm
+++ b/debian/debian-edu-artwork.postrm
@@ -5,8 +5,6 @@ set -e
 if [ "$1" = remove ]
 then
 	dpkg-divert --package debian-edu-artwork --rename \
-	    --remove /etc/gdm3/greeter.gsettings
-	dpkg-divert --package debian-edu-artwork --rename \
 	    --remove /usr/share/images/desktop-base/login-background.svg
 fi
 
diff --git a/debian/debian-edu-artwork.preinst b/debian/debian-edu-artwork.preinst
index 7fbb1e1..45add9c 100644
--- a/debian/debian-edu-artwork.preinst
+++ b/debian/debian-edu-artwork.preinst
@@ -8,3 +8,5 @@ then
             --divert /usr/share/images/desktop-base/login-background.svg.edu-diverted \
             --add /usr/share/images/desktop-base/login-background.svg
 fi
+
+#DEBHELPER#
\ No newline at end of file
diff --git a/debian/debian-edu-artwork.prerm b/debian/debian-edu-artwork.prerm
index ea8fbef..f6748a7 100644
--- a/debian/debian-edu-artwork.prerm
+++ b/debian/debian-edu-artwork.prerm
@@ -10,6 +10,12 @@ case "$1" in
         --rename --remove /usr/share/desktop-base/grub_background.sh
     fi
 
+    # treat previous version
+    if dpkg-divert --listpackage /etc/gdm3/greeter.gsettings >/dev/null; then
+      dpkg-divert --package debian-edu-artwork \
+        --remove /etc/gdm3/greeter.gsettings
+    fi
+
     /usr/share/debian-edu-artwork/update-artwork $1
     ;;
 esac
diff --git a/debian/update-artwork b/debian/update-artwork
index 67cade4..c277db6 100644
--- a/debian/update-artwork
+++ b/debian/update-artwork
@@ -80,7 +80,7 @@ restore_desktop_background() {
 		debian-edu-wallpaper02_1600x1200.png \
 		debian-edu-wallpaper02_1600x1200.svg ; do
 	update-alternatives --remove desktop-background \
-		/usr/share/images/desktop-base/$WALLPAPER 
+		/usr/share/images/desktop-base/$WALLPAPER
     done
 }
 

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