[debian-edu-commits] debian-edu/ 360/437: revert wallpaper/Debian-Edu related changes from commit r80669; correct changelog to refect the changes.

[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 5fa92caddb6c32c88357dfe71bc026c38cf7b580
Author: Wolfgang Schweer <w.schweer at gmx.de>
Date:   Sat Jun 15 10:25:10 2013 +0000

    revert wallpaper/Debian-Edu related changes from commit r80669; correct changelog to refect the changes.
---
 art/kde/Makefile.am             | 2 +-
 debian/changelog                | 4 +---
 debian/debian-edu-artwork.links | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/art/kde/Makefile.am b/art/kde/Makefile.am
index 2d96cee..c66b513 100644
--- a/art/kde/Makefile.am
+++ b/art/kde/Makefile.am
@@ -11,7 +11,7 @@ KDEIMG = debian-edu-wallpaper01_1600x1200.png \
 	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/
diff --git a/debian/changelog b/debian/changelog
index 044238e..9e34fdf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 ]
diff --git a/debian/debian-edu-artwork.links b/debian/debian-edu-artwork.links
index 2d67bbd..89cc5d2 100644
--- a/debian/debian-edu-artwork.links
+++ b/debian/debian-edu-artwork.links
@@ -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

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