[debian-edu-commits] debian-edu/ 341/437: Correct path to login-background.svg from /usr/share/images/ to /usr/share/images/desktop-base/.

[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 98756d5da76a5a03f3a1db89b375533220e68278
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Fri Jun 14 11:30:27 2013 +0000

    Correct path to login-background.svg from /usr/share/images/ to /usr/share/images/desktop-base/.
---
 debian/changelog                  | 7 +++++--
 debian/debian-edu-artwork.postrm  | 2 +-
 debian/debian-edu-artwork.preinst | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c76ba12..a9fe38d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,10 +9,13 @@ debian-edu-artwork (0.0.34-2) UNRELEASED; urgency=low
       to /usr/share/images/desktop-base/login-background.svg
 
   [ Petter Reinholdtsen ]
-  * Correct divert for /usr/share/images/login-background.svg in preinst.
+  * Correct order and arguments for dpkg-divert for
+    login-background.svg in preinst.
+  * Correct path to login-background.svg from /usr/share/images/ to
+    /usr/share/images/desktop-base/.
 
   [ Holger Levsen ]
-  * Also use /usr/share/images/login-background.svg in
+  * Also use /usr/share/images/desktop-base/login-background.svg in
     art/gdm-theme/20-debian-edu-artwork-settings.
   * Drop unused art/kdm-theme/debian-edu-wallpaper.png.
 
diff --git a/debian/debian-edu-artwork.postrm b/debian/debian-edu-artwork.postrm
index 8dd2d14..00af883 100644
--- a/debian/debian-edu-artwork.postrm
+++ b/debian/debian-edu-artwork.postrm
@@ -6,7 +6,7 @@ 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
+	    --remove /usr/share/images/desktop-base/login-background.svg
 fi
 
 #DEBHELPER#
diff --git a/debian/debian-edu-artwork.preinst b/debian/debian-edu-artwork.preinst
index 2b5edf6..ec42a41 100644
--- a/debian/debian-edu-artwork.preinst
+++ b/debian/debian-edu-artwork.preinst
@@ -7,8 +7,8 @@ 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 --rename \
-            --divert /usr/share/images/login-background.svg.edu-diverted \
-            --add /usr/share/images/login-background.svg
+            --divert /usr/share/images/desktop-base/login-background.svg.edu-diverted \
+            --add /usr/share/images/desktop-base/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