[debian-edu-commits] r80634 - branches/wheezy/debian-edu-artwork/debian

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-14 11:30:27 +0000 (Fri, 14 Jun 2013)
New Revision: 80634

Modified:
   branches/wheezy/debian-edu-artwork/debian/changelog
   branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.postrm
   branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.preinst
Log:
Correct path to login-background.svg from /usr/share/images/ to /usr/share/images/desktop-base/.

Modified: branches/wheezy/debian-edu-artwork/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-artwork/debian/changelog	2013-06-14 11:01:49 UTC (rev 80633)
+++ branches/wheezy/debian-edu-artwork/debian/changelog	2013-06-14 11:30:27 UTC (rev 80634)
@@ -9,10 +9,13 @@
       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.
 

Modified: branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.postrm
===================================================================
--- branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.postrm	2013-06-14 11:01:49 UTC (rev 80633)
+++ branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.postrm	2013-06-14 11:30:27 UTC (rev 80634)
@@ -6,7 +6,7 @@
 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#

Modified: branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.preinst
===================================================================
--- branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.preinst	2013-06-14 11:01:49 UTC (rev 80633)
+++ branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.preinst	2013-06-14 11:30:27 UTC (rev 80634)
@@ -7,8 +7,8 @@
 	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#