[debian-edu-commits] debian-edu/ 403/437: * RTFM: Use dpkg-maintscript-helper to remove the conffile. * Fix typos in 20_debian-edu.gschema.override * Drop one fake svg file (aspect ratio 5:4), which scales bad, as listed in debian-edu.xml (should be added later again as real svg).

[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 e047dd409b74898f94ff3fef520a4300ae2a1c5a
Author: Wolfgang Schweer <w.schweer at gmx.de>
Date:   Wed Jul 10 10:16:24 2013 +0000

    * RTFM: Use dpkg-maintscript-helper to remove the conffile.
    * Fix typos in 20_debian-edu.gschema.override
    * Drop one fake svg file (aspect ratio 5:4), which scales bad, as listed
      in debian-edu.xml (should be added later again as real svg).
---
 art/gdm-theme/20-debian-edu-artwork-settings |  6 +++---
 art/gdm-theme/20_debian-edu.gschema.override |  4 ++--
 art/kde/debian-edu.xml                       |  1 -
 debian/changelog                             |  6 ++++++
 debian/debian-edu-artwork.postinst           | 25 +++----------------------
 5 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/art/gdm-theme/20-debian-edu-artwork-settings b/art/gdm-theme/20-debian-edu-artwork-settings
index 1e768c2..10fe6ae 100644
--- a/art/gdm-theme/20-debian-edu-artwork-settings
+++ b/art/gdm-theme/20-debian-edu-artwork-settings
@@ -1,3 +1,3 @@
-[org/gnome/desktop/background]
-picture-uri='file:///usr/share/images/desktop-base/debian-edu-wallpaper02_1600x1200.svg'
-picture-options='zoom'
+#[org/gnome/desktop/background]
+#picture-uri='file:///usr/share/images/desktop-base/debian-edu-wallpaper02_1600x1200.svg'
+#picture-options='zoom'
diff --git a/art/gdm-theme/20_debian-edu.gschema.override b/art/gdm-theme/20_debian-edu.gschema.override
index 2785b84..6ac9eaf 100644
--- a/art/gdm-theme/20_debian-edu.gschema.override
+++ b/art/gdm-theme/20_debian-edu.gschema.override
@@ -2,8 +2,8 @@
 
 # - Dont't show default red swirl logo, cause the swirl is already shipped
 #   with the Debian Edu theme.
-#logo=''
-#fallback-logo=''
+logo='/usr/share/icons/gnome/48x48/devices/computer.png'
+fallback-logo='/usr/share/icons/gnome/48x48/devices/computer.png'
 
 # - Disable user list
 disable-user-list=true
diff --git a/art/kde/debian-edu.xml b/art/kde/debian-edu.xml
index 2f1646c..184f9b0 100644
--- a/art/kde/debian-edu.xml
+++ b/art/kde/debian-edu.xml
@@ -2,7 +2,6 @@
   <static>
     <duration>8640000.0</duration>
     <file>
-      <size width="1280" height="1024">/usr/share/images/desktop-base/debian-edu-wallpaper01_1280x1024.svg</size>
       <size width="1600" height="1200">/usr/share/images/desktop-base/debian-edu-wallpaper01_1600x1200.svg</size>
       <size width="1920" height="1080">/usr/share/images/desktop-base/debian-edu-wallpaper01_1920x1080.svg</size>
       <size width="1920" height="1200">/usr/share/images/desktop-base/debian-edu-wallpaper01_1920x1200.svg</size>
diff --git a/debian/changelog b/debian/changelog
index 96a7d2a..4f81c89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,12 @@ debian-edu-artwork (0.0.40-1) UNRELEASED; urgency=low
     to handle cleanup of previoiusly diverted files as I believe
     it must be done.
 
+  [ Wolfgang Schweer ]
+  * RTFM: Use dpkg-maintscript-helper to remove the conffile.
+  * Fix typos in 20_debian-edu.gschema.override
+  * Drop one fake svg file (aspect ratio 5:4), which scales bad, as listed
+    in debian-edu.xml (should be added later again as real svg).
+
  -- Wolfgang Schweer <wschweer at arcor.de>  Mon, 08 Jul 2013 00:40:14 +0200
 
 debian-edu-artwork (0.0.39-1) unstable; urgency=low
diff --git a/debian/debian-edu-artwork.postinst b/debian/debian-edu-artwork.postinst
index 292f45a..01ee327 100644
--- a/debian/debian-edu-artwork.postinst
+++ b/debian/debian-edu-artwork.postinst
@@ -1,28 +1,10 @@
 #! /bin/sh
 
-# Remove a no-longer used conffile.  From
-# http://wiki.debian.org/DpkgConffileHandling
-rm_conffile() {
-    PKGNAME="$1"
-    CONFFILE="$2"
-
-    [ -e "$CONFFILE" ] || return 0
-
-    md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')"
-    old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PKGNAME | \
-            sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")"
-    if [ "$md5sum" != "$old_md5sum" ]; then
-        echo "Obsolete conffile $CONFFILE has been modified by you." 1>&2
-        echo "Saving as $CONFFILE.dpkg-bak ..." 1>&2
-        mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
-    else
-        echo "Removing obsolete conffile $CONFFILE ..." 1>&2
-        rm -f "$CONFFILE"
-    fi
-}
-
 set -e
 
+dpkg-maintscript-helper rm_conffile \
+    /etc/gdm3/greeter.gsettings 0.0.39-1 debian-edu-artwork -- "$@"
+
 #DEBHELPER#
 
 case "$1" in
@@ -33,7 +15,6 @@ case "$1" in
 	dpkg-divert --package debian-edu-artwork \
 	    --remove /usr/share/gdm/defaults.conf
 
-	rm_conffile debian-edu-artwork /etc/gdm3/greeter.gsettings
 	dpkg-divert --package debian-edu-artwork \
 	    --rename --remove /etc/gdm3/greeter.gsettings
     fi

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