[debian-edu-commits] debian-edu/ 277/437: Divert /usr/share/desktop-base/grub_background.sh to make debian-edu-artwork installable with desktop-base. (Closes: #603785)

[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 2d4da3010c6e486b27ff4aa9c94ac2c01c216a70
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Dec 4 16:10:09 2010 +0000

    Divert /usr/share/desktop-base/grub_background.sh to make
    debian-edu-artwork installable with desktop-base. (Closes: #603785)
---
 debian/changelog                  | 7 +++++++
 debian/debian-edu-artwork.postrm  | 1 +
 debian/debian-edu-artwork.preinst | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a85ae70..1ad6f98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debian-edu-artwork (0.0.32-2) UNRELEASED; urgency=low
+
+  * Divert /usr/share/desktop-base/grub_background.sh to make
+    debian-edu-artwork installable with desktop-base. (Closes: #603785)
+
+ -- Holger Levsen <holger at debian.org>  Sat, 04 Dec 2010 17:07:21 +0100
+
 debian-edu-artwork (0.0.32-1) unstable; urgency=low
 
   * Drop debian-edu-artwork-usplash. (Closes: #593707) 
diff --git a/debian/debian-edu-artwork.postrm b/debian/debian-edu-artwork.postrm
index 866cfa9..12c70ec 100644
--- a/debian/debian-edu-artwork.postrm
+++ b/debian/debian-edu-artwork.postrm
@@ -5,6 +5,7 @@ set -e
 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/desktop-base/grub_background.sh
 fi
 
 #DEBHELPER#
diff --git a/debian/debian-edu-artwork.preinst b/debian/debian-edu-artwork.preinst
index 7b26dca..f1c57a6 100644
--- a/debian/debian-edu-artwork.preinst
+++ b/debian/debian-edu-artwork.preinst
@@ -6,6 +6,8 @@ if [ "$1" = install ] || [ $1 = upgrade ]
 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 --divert \
+		/usr/share/desktop-base/grub_background.sh.orig --rename /usr/share/desktop-base/grub_background.sh
 
 fi
 

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