[debian-edu-commits] debian-edu/ 193/437: Add conflicts with grub (<< 0.97-39) to make sure a version where bug #477791 in update-grub is fixed is used.

[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 5394e2e9425a88443ecb8076fdfc302e4fb992de
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sat May 24 18:29:19 2008 +0000

    Add conflicts with grub (<< 0.97-39) to make sure a version where bug #477791 in update-grub is fixed is used.
---
 debian/changelog | 5 +++--
 debian/control   | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7322abb..9d2c4a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 debian-edu-artwork (0.0.28) UNRELEASED; urgency=low
 
   [ Petter Reinholdtsen ]
-  * Add rules to build grub splash image.  This do not work properly
-    because of bug #477791 in update-grub.
+  * Add rules to build grub splash image.
+  * Add conflicts with grub (<< 0.97-39) to make sure a version
+    where bug #477791 in update-grub is fixed is used.
 
   [ José L. Redrejo Rodríguez ]
   * Added gconf configuration to customize Gnome Desktop with:
diff --git a/debian/control b/debian/control
index 2394dac..ac23c7a 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Package: debian-edu-artwork
 Architecture: all
 Depends: libconfig-inifiles-perl
 Suggests: grub (>= 0.95+cvs20040624-10), kdm, debian-edu-artwork-usplash
+Conflicts: grub (<< 0.97-39)
 Description: Debian Edu themes and artwork
  This package contains Debian Edu themes and artwork.
 

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