[debian-edu-commits] debian-edu/ 248/437: Document why we conflict with desktop-base.

[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 e12aa364bb156ba1a091215c974235fc97612924
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sun Mar 7 18:45:46 2010 +0000

    Document why we conflict with desktop-base.
---
 debian/changelog | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index eae21b9..311b3d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
 debian-edu-artwork (0.0.30-5) UNRELEASED; urgency=low
 
   [ Petter Reinholdtsen ]
-  * Try to fix grub 2 theme support (Closes: #570786).
+  * Try to fix grub 2 theme support (Closes: #570786).  Make sure we
+    conflict with desktop-base as we include
+    /usr/share/desktop-base/grub_background.sh which is also there.
 
  -- Petter Reinholdtsen <pere at debian.org>  Sun, 07 Mar 2010 19:43:19 +0100
 

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