[debian-edu-commits] debian-edu/ 308/437: * debian/debian-edu-artwork.prerm - fix "leaves diversion after upgrade from squeeze" (Closes: #657474)

[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 137d3fd12aceeee138213d78b31d22a7bf274a86
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Jun 23 12:30:24 2012 +0000

    * debian/debian-edu-artwork.prerm
      - fix "leaves diversion after upgrade from squeeze"
        (Closes: #657474)
---
 debian/changelog                |  9 +++++++++
 debian/debian-edu-artwork.prerm | 12 +++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 15fb677..2d477eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+debian-edu-artwork (0.0.33-3) UNRELEASED; urgency=low
+
+  [ Hideki Yamane ]
+  * debian/debian-edu-artwork.prerm
+    - fix "leaves diversion after upgrade from squeeze"
+      (Closes: #657474)
+
+ -- Holger Levsen <holger at debian.org>  Sat, 23 Jun 2012 14:30:01 +0200
+
 debian-edu-artwork (0.0.33-2) unstable; urgency=low
 
   [ Andreas B. Mundt ]
diff --git a/debian/debian-edu-artwork.prerm b/debian/debian-edu-artwork.prerm
index 8b6a58f..ea8fbef 100644
--- a/debian/debian-edu-artwork.prerm
+++ b/debian/debian-edu-artwork.prerm
@@ -2,10 +2,16 @@
 
 set -e
 
-#DEBHELPER#
-
 case "$1" in
   remove)
-    /usr/share/debian-edu-artwork/update-artwork remove
+    # avoid puring problem with version in squeeze 
+    if dpkg-divert --listpackage /usr/share/desktop-base/grub_background.sh.orig >/dev/null; then
+      dpkg-divert --package debian-edu-artwork \
+        --rename --remove /usr/share/desktop-base/grub_background.sh
+    fi
+
+    /usr/share/debian-edu-artwork/update-artwork $1
     ;;
 esac
+
+#DEBHELPER#

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