[debian-edu-commits] r81470 - branches/wheezy/debian-edu-artwork/debian

[schweer-guest at alioth.debian.org]

Author: schweer-guest
Date: 2013-07-08 21:50:29 +0000 (Mon, 08 Jul 2013)
New Revision: 81470

Modified:
   branches/wheezy/debian-edu-artwork/debian/changelog
   branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.postinst
   branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.postrm
   branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.preinst
   branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.prerm
   branches/wheezy/debian-edu-artwork/debian/update-artwork
Log:
  - Handle unused diversions.  (Closes: #715153)
  - Remove useless whitespace in update-artwork.

Modified: branches/wheezy/debian-edu-artwork/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-artwork/debian/changelog	2013-07-08 21:49:10 UTC (rev 81469)
+++ branches/wheezy/debian-edu-artwork/debian/changelog	2013-07-08 21:50:29 UTC (rev 81470)
@@ -7,6 +7,8 @@
       /usr/share/glib-2.0/schemas/20_debian-edu.gschema.override
     - Call 'glib-compile-schemas /usr/share/glib-2.0/schemas/' to activate
       the overrides (function in script 'update-artwork').
+    - Handle unused diversions.  (Closes: #715153)
+    - Remove useless whitespace in update-artwork.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Mon, 08 Jul 2013 00:40:14 +0200
 

Modified: branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.postinst
===================================================================
--- branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.postinst	2013-07-08 21:49:10 UTC (rev 81469)
+++ branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.postinst	2013-07-08 21:50:29 UTC (rev 81470)
@@ -2,6 +2,18 @@
 
 set -e
 
+# remove deprecated diversion (bug #715153)
+if dpkg-divert --listpackage /usr/share/gdm/defaults.conf.orig >/dev/null; then
+    dpkg-divert --package debian-edu-artwork \
+        --remove /usr/share/gdm/defaults.conf
+fi
+
+# remove deprecated diversion
+if dpkg-divert --listpackage /etc/gdm3/greeter.gsettings.edu-diverted >/dev/null; then
+    dpkg-divert --package debian-edu-artwork \
+        --rename --remove /etc/gdm3/greeter.gsettings
+fi
+
 #DEBHELPER#
 
 case "$1" in

Modified: branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.postrm
===================================================================
--- branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.postrm	2013-07-08 21:49:10 UTC (rev 81469)
+++ branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.postrm	2013-07-08 21:50:29 UTC (rev 81470)
@@ -5,8 +5,6 @@
 if [ "$1" = remove ]
 then
 	dpkg-divert --package debian-edu-artwork --rename \
-	    --remove /etc/gdm3/greeter.gsettings
-	dpkg-divert --package debian-edu-artwork --rename \
 	    --remove /usr/share/images/desktop-base/login-background.svg
 fi
 

Modified: branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.preinst
===================================================================
--- branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.preinst	2013-07-08 21:49:10 UTC (rev 81469)
+++ branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.preinst	2013-07-08 21:50:29 UTC (rev 81470)
@@ -8,3 +8,5 @@
             --divert /usr/share/images/desktop-base/login-background.svg.edu-diverted \
             --add /usr/share/images/desktop-base/login-background.svg
 fi
+
+#DEBHELPER#
\ No newline at end of file

Modified: branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.prerm
===================================================================
--- branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.prerm	2013-07-08 21:49:10 UTC (rev 81469)
+++ branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.prerm	2013-07-08 21:50:29 UTC (rev 81470)
@@ -10,6 +10,12 @@
         --rename --remove /usr/share/desktop-base/grub_background.sh
     fi
 
+    # treat previous version
+    if dpkg-divert --listpackage /etc/gdm3/greeter.gsettings >/dev/null; then
+      dpkg-divert --package debian-edu-artwork \
+        --remove /etc/gdm3/greeter.gsettings
+    fi
+
     /usr/share/debian-edu-artwork/update-artwork $1
     ;;
 esac

Modified: branches/wheezy/debian-edu-artwork/debian/update-artwork
===================================================================
--- branches/wheezy/debian-edu-artwork/debian/update-artwork	2013-07-08 21:49:10 UTC (rev 81469)
+++ branches/wheezy/debian-edu-artwork/debian/update-artwork	2013-07-08 21:50:29 UTC (rev 81470)
@@ -80,7 +80,7 @@
 		debian-edu-wallpaper02_1600x1200.png \
 		debian-edu-wallpaper02_1600x1200.svg ; do
 	update-alternatives --remove desktop-background \
-		/usr/share/images/desktop-base/$WALLPAPER 
+		/usr/share/images/desktop-base/$WALLPAPER
     done
 }