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

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-14 08:55:27 +0000 (Fri, 14 Jun 2013)
New Revision: 80619

Modified:
   branches/wheezy/debian-edu-artwork/debian/changelog
   branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.links
   branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.postrm
   branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.preinst
Log:
Correct divert for /usr/share/images/login-background.svg in preinst.

Modified: branches/wheezy/debian-edu-artwork/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-artwork/debian/changelog	2013-06-14 08:13:53 UTC (rev 80618)
+++ branches/wheezy/debian-edu-artwork/debian/changelog	2013-06-14 08:55:27 UTC (rev 80619)
@@ -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 @@
     - 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

Modified: branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.links
===================================================================
--- branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.links	2013-06-14 08:13:53 UTC (rev 80618)
+++ branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.links	2013-06-14 08:55:27 UTC (rev 80619)
@@ -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

Modified: branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.postrm
===================================================================
--- branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.postrm	2013-06-14 08:13:53 UTC (rev 80618)
+++ branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.postrm	2013-06-14 08:55:27 UTC (rev 80619)
@@ -5,7 +5,8 @@
 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#

Modified: branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.preinst
===================================================================
--- branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.preinst	2013-06-14 08:13:53 UTC (rev 80618)
+++ branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.preinst	2013-06-14 08:55:27 UTC (rev 80619)
@@ -6,7 +6,9 @@
 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#