[debian-edu-commits] debian-edu/ 268/437: fix update-artwork to work during installs

[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 3cc27fe08a32e16074eb5b69514ae8c7ee73c09e
Author: Andreas B. Mundt <andi.mundt at web.de>
Date:   Sun May 2 16:28:19 2010 +0000

    fix update-artwork to work during installs
---
 debian/changelog      | 6 +++++-
 debian/control        | 2 +-
 debian/update-artwork | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 47290e3..08b2d53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,11 @@ debian-edu-artwork (0.0.31-2) UNRELEASED; urgency=low
   [ Petter Reinholdtsen ]
   * Updated Standards-Version from 3.8.3 to 3.8.4.  No changes needed.
 
- -- Petter Reinholdtsen <pere at debian.org>  Wed, 21 Apr 2010 22:31:08 +0200
+  [ Andreas B. Mundt ]
+  * Fix update-artwork to work during installs when no grub.conf exists.
+  * Add myself to Uploaders.
+
+ -- Andreas B. Mundt <andi.mundt at web.de>  Sun, 02 May 2010 18:23:03 +0200
 
 debian-edu-artwork (0.0.31-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 314291a..56f0cc6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: debian-edu-artwork
 Section: graphics
 Priority: optional
 Maintainer: Debian Edu developers <debian-edu at lists.debian.org>
-Uploaders: Petter Reinholdtsen <pere at debian.org>, Steffen Joeris <white at debian.org>, Holger Levsen <holger at debian.org>, Morten Werner Forsbring <werner at debian.org>, Vagrant Cascadian <vagrant at debian.org>, Jonas Smedegaard <dr at jones.dk>
+Uploaders: Petter Reinholdtsen <pere at debian.org>, Steffen Joeris <white at debian.org>, Holger Levsen <holger at debian.org>, Morten Werner Forsbring <werner at debian.org>, Vagrant Cascadian <vagrant at debian.org>, Jonas Smedegaard <dr at jones.dk>, Andreas B. Mundt <andi.mundt at web.de>
 Build-Depends: debhelper (>= 7), cdbs, libbogl-dev, imagemagick,  libusplash-dev [i386 amd64 powerpc sparc armel], librsvg2-bin
 Standards-Version: 3.8.4
 XS-DM-Upload-Allowed: yes
diff --git a/debian/update-artwork b/debian/update-artwork
index dc77b9d..e48881a 100644
--- a/debian/update-artwork
+++ b/debian/update-artwork
@@ -11,14 +11,14 @@ restore_ldm_background() {
 }
 
 change_grub_background() {
-    if ! grep -q 'debian-edu-splash-grub.png' /boot/grub/grub.cfg ; then
+    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
     fi
 }
 
 restore_grub_background() {
-    if grep -q 'debian-edu-splash-grub.png' /boot/grub/grub.cfg ; then
+    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
     fi

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