[debian-edu-commits] r80732 - in branches/wheezy/debian-edu-artwork: art/kde debian

[schweer-guest at alioth.debian.org]

Author: schweer-guest
Date: 2013-06-15 10:25:10 +0000 (Sat, 15 Jun 2013)
New Revision: 80732

Modified:
   branches/wheezy/debian-edu-artwork/art/kde/Makefile.am
   branches/wheezy/debian-edu-artwork/debian/changelog
   branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.links
Log:
revert wallpaper/Debian-Edu related changes from commit r80669; correct changelog to refect the changes.


Modified: branches/wheezy/debian-edu-artwork/art/kde/Makefile.am
===================================================================
--- branches/wheezy/debian-edu-artwork/art/kde/Makefile.am	2013-06-15 09:55:47 UTC (rev 80731)
+++ branches/wheezy/debian-edu-artwork/art/kde/Makefile.am	2013-06-15 10:25:10 UTC (rev 80732)
@@ -11,7 +11,7 @@
 	debian-edu-wallpaper02_1920x1080.svg \
 	debian-edu-wallpaper02_1920x1200.svg
 
-kdeimgdir = $(datadir)/wallpapers/Debian-Edu
+kdeimgdir = $(datadir)/wallpapers/
 kdeimg_DATA = $(KDEIMG) debian-edu-wallpaper.png.desktop
 
 Xsessiondir      = /etc/X11/Xsession.d/

Modified: branches/wheezy/debian-edu-artwork/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-artwork/debian/changelog	2013-06-15 09:55:47 UTC (rev 80731)
+++ branches/wheezy/debian-edu-artwork/debian/changelog	2013-06-15 10:25:10 UTC (rev 80732)
@@ -1,9 +1,7 @@
 debian-edu-artwork (0.0.35-2) UNRELEASED; urgency=low
 
   [ Wolfgang Schweer ]
-  * Store wallpaper image files in /usr/share/wallpapers/Debian-Edu and
-    link /usr/share/kde4/apps/ksplash/Themes/Debian-Edu to it.
-  * /usr/share/wallpapers/Debian-Edu/debian-edu-wallpaper02_1600x1200.svg
+  * /usr/share/wallpapers/debian-edu-wallpaper02_1600x1200.svg
     is now used to provide login-background.svg for the lightdm greeter.
 
   [ Holger Levsen ]

Modified: branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.links
===================================================================
--- branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.links	2013-06-15 09:55:47 UTC (rev 80731)
+++ branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.links	2013-06-15 10:25:10 UTC (rev 80732)
@@ -4,5 +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/debian-edu-wallpaper02_1600x1200.svg /usr/share/images/desktop-base/login-background.svg
-/usr/share/wallpapers/Debian-Edu /usr/share/kde4/apps/ksplash/Themes/Debian-Edu
+/usr/share/wallpapers/debian-edu-wallpaper02_1600x1200.svg /usr/share/images/desktop-base/login-background.svg