[debian-edu-commits] debian-edu/ 271/437: * Use conflict desktop-base (<< 5.0.5), as version 5.0.5 no longer include the /usr/share/desktop-base/grub_background.sh file. * Make sure the artwork package can be removed also when update-grub fail.

[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 0cf62b1da2e23ac8ed14df08df6d8986af4ec5ce
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sun Jul 4 21:29:17 2010 +0000

    * Use conflict desktop-base (<< 5.0.5), as version 5.0.5 no longer
      include the /usr/share/desktop-base/grub_background.sh file.
    * Make sure the artwork package can be removed also when update-grub
      fail.
---
 debian/changelog      | 7 +++++++
 debian/control        | 2 +-
 debian/update-artwork | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 10e2117..b231c63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,14 @@
 debian-edu-artwork (0.0.31-3) UNRELEASED; urgency=low
 
+  [ Holger Levsen ]
   * Provide source/format and set it to 1.0. 
 
+  [ Petter Reinholdtsen ]
+  * Use conflict desktop-base (<< 5.0.5), as version 5.0.5 no longer
+    include the /usr/share/desktop-base/grub_background.sh file.
+  * Make sure the artwork package can be removed also when update-grub
+    fail.
+
  -- Holger Levsen <holger at debian.org>  Thu, 13 May 2010 11:14:29 +0200
 
 debian-edu-artwork (0.0.31-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 56f0cc6..9170322 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Package: debian-edu-artwork
 Architecture: all
 Depends: ${misc:Depends}, libconfig-inifiles-perl
 Suggests: grub (>= 0.95+cvs20040624-10), kdm, debian-edu-artwork-usplash
-Conflicts: grub (<< 0.97-39), desktop-base
+Conflicts: grub (<< 0.97-39), desktop-base (<< 5.0.5)
 Description: Debian Edu themes and artwork
  This package contains Debian Edu themes and artwork.
 
diff --git a/debian/update-artwork b/debian/update-artwork
index e48881a..4d59e9e 100644
--- a/debian/update-artwork
+++ b/debian/update-artwork
@@ -13,14 +13,14 @@ restore_ldm_background() {
 change_grub_background() {
     if [ -f /boot/grub/grub.cfg ] && ! grep -q 'debian-edu-splash-grub.png' /boot/grub/grub.cfg ; then
 	## update-grub should find our splash image and update grub.cfg:
-	update-grub
+	update-grub || true
     fi
 }
 
 restore_grub_background() {
     if [ -f /boot/grub/grub.cfg ] && grep -q 'debian-edu-splash-grub.png' /boot/grub/grub.cfg ; then
 	## update-grub should revert grub.cfg to point to the default image: 
-	update-grub
+	update-grub || true
     fi
 }
 

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