From ad3c695a57d70d74e5cc6c7a7356c8e1ab7a5c4b Mon Sep 17 00:00:00 2001
From: Eshat Cakar <info@eshat.de>
Date: Mon, 25 Jun 2012 14:57:29 +0000
Subject: [PATCH] Merge with paul's changes.

---
 debian/changelog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 13b67e8..ffa4086 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ desktop-base (7.0.0~exp3) UNRELEASED; urgency=low
   [ Eshat Cakar ]
   * Updated the KDM theme.
   * Updated the ksplash theme.
+  * Install Joy wallpaper into /usr/share/wallpapers/
+    This makes it visibile in KDE's wallpaper chooser
+  * Set default wallpaper for new users via plasma scripting
 
   [ Paul Tagliamonte ]
   * Added joy-inksplat into gnome-backgrounds.xml (Closes: #678937),