[debian-edu-commits] debian-edu/ 336/437: Correct divert for /usr/share/images/login-background.svg in preinst.

[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 fb6e2e4ce049ed9b078b13ecc71415822a02fc94
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Fri Jun 14 08:55:27 2013 +0000

    Correct divert for /usr/share/images/login-background.svg in preinst.
---
 debian/changelog                  | 4 ++++
 debian/debian-edu-artwork.links   | 2 +-
 debian/debian-edu-artwork.postrm  | 3 ++-
 debian/debian-edu-artwork.preinst | 4 +++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f82c4a0..40b6589 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 debian-edu-artwork (0.0.34-2) UNRELEASED; urgency=low
 
+  [ Wolfgang Schweer ]
   * Raise update-alternatives priority for the desktop background from 65
     to 75 (same as the default joy one), to enable the Debian Edu one again.
   * Try to configure background for lightdm-greeter:
@@ -7,6 +8,9 @@ debian-edu-artwork (0.0.34-2) UNRELEASED; urgency=low
     - link /usr/share/wallpapers/debian-edu-wallpaper01_1600x1200.png
       to /usr/share/images/desktop-base/login-background.svg
 
+  [ Petter Reinholdtsen ]
+  * Correct divert for /usr/share/images/login-background.svg in preinst.
+
  -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 13 Jun 2013 21:41:36 +0200
 
 debian-edu-artwork (0.0.34-1) unstable; urgency=low
diff --git a/debian/debian-edu-artwork.links b/debian/debian-edu-artwork.links
index d0b5819..314293d 100644
--- a/debian/debian-edu-artwork.links
+++ b/debian/debian-edu-artwork.links
@@ -4,4 +4,4 @@
 /usr/share/ldm/themes/ltsp/reboot.png /usr/share/ldm/themes/debian-edu/reboot.png
 /usr/share/ldm/themes/ltsp/session.png /usr/share/ldm/themes/debian-edu/session.png
 /usr/share/ldm/themes/ltsp/shutdown.png /usr/share/ldm/themes/debian-edu/shutdown.png
-/usr/share/wallpapers/debian-edu-wallpaper01_1600x1200.png /usr/share/images/desktop-base/login-background.svg
+/usr/share/images/desktop-base/login-background.svg /usr/share/wallpapers/debian-edu-wallpaper01_1600x1200.png
diff --git a/debian/debian-edu-artwork.postrm b/debian/debian-edu-artwork.postrm
index a586937..8dd2d14 100644
--- a/debian/debian-edu-artwork.postrm
+++ b/debian/debian-edu-artwork.postrm
@@ -5,7 +5,8 @@ set -e
 if [ "$1" = remove ]
 then
 	dpkg-divert --package debian-edu-artwork --rename --remove /usr/share/gdm/defaults.conf
-	dpkg-divert --package debian-edu-artwork --rename --remove /usr/share/images/login-background.svg
+	dpkg-divert --package debian-edu-artwork --rename \
+	    --remove /usr/share/images/login-background.svg
 fi
 
 #DEBHELPER#
diff --git a/debian/debian-edu-artwork.preinst b/debian/debian-edu-artwork.preinst
index a9a8c21..2b5edf6 100644
--- a/debian/debian-edu-artwork.preinst
+++ b/debian/debian-edu-artwork.preinst
@@ -6,7 +6,9 @@ if [ "$1" = install ] || [ $1 = upgrade ]
 then
 	dpkg-divert --package debian-edu-artwork --divert \
 		/usr/share/gdm/defaults.conf.orig --rename /usr/share/gdm/defaults.conf
-	dpkg-divert --package debian-edu-artwork /usr/share/images/login-background.svg
+        dpkg-divert --package debian-edu-artwork --rename \
+            --divert /usr/share/images/login-background.svg.edu-diverted \
+            --add /usr/share/images/login-background.svg
 fi
 
 #DEBHELPER#

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