On Mon, Jul 08, 2013 at 07:07:41AM +0200, Petter Reinholdtsen wrote:
> [ Wolfgang Schweer ]
> > Log:
> > * Configuration of gdm3:
> > - Drop file /etc/gdm3/greeter.gsettings, as this approach fails, if
> > gdm3 is installed after the artwork package; remove diversion.
> > - Use schema override file to configure gdm3:
> > /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').
>
> As the failing code is in unstable (Holger uploaded), you also need to
> add code in prerm/postinst to clean up the old diverts and get rid of
> the old conffile during package upgrades. It is not enough to just
> remove the divert code.
>
> > Modified: branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.preinst
> > ===================================================================
> > --- branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.preinst 2013-07-07 22:10:55 UTC (rev 81456)
> > +++ branches/wheezy/debian-edu-artwork/debian/debian-edu-artwork.preinst 2013-07-07 23:26:56 UTC (rev 81457)
> > @@ -5,11 +5,6 @@
> > if [ "$1" = install ] || [ $1 = upgrade ]
> > then
> > dpkg-divert --package debian-edu-artwork --rename \
> > - --divert /etc/gdm3/greeter.gsettings.edu-diverted \
> > - --add /etc/gdm3/greeter.gsettings
> > - dpkg-divert --package debian-edu-artwork --rename \
> > --divert /usr/share/images/desktop-base/login-background.svg.edu-diverted \
> > --add /usr/share/images/desktop-base/login-background.svg
> > fi
> > -
> > -#DEBHELPER#
> >
>
> Also, the #DEBHELPER# marker should stay.
I'm wondering, if these changes would do the job:
-------------------------------------------------------------------
Index: debian/debian-edu-artwork.postinst
===================================================================
--- debian/debian-edu-artwork.postinst (Revision 81456)
+++ debian/debian-edu-artwork.postinst (Arbeitskopie)
@@ -2,6 +2,11 @@
set -e
+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
+
#DEBHELPER#
case "$1" in
Index: debian/debian-edu-artwork.preinst
===================================================================
--- debian/debian-edu-artwork.preinst (Revision 81457)
+++ debian/debian-edu-artwork.preinst (Arbeitskopie)
@@ -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#
\ Kein Zeilenumbruch am Ende der Datei
Index: debian/debian-edu-artwork.prerm
===================================================================
--- debian/debian-edu-artwork.prerm (Revision 81456)
+++ debian/debian-edu-artwork.prerm (Arbeitskopie)
@@ -10,6 +10,11 @@
--rename --remove /usr/share/desktop-base/grub_background.sh
fi
+ if dpkg-divert --listpackage /etc/ >/dev/null; then
+ dpkg-divert --package debian-edu-artwork \
+ --remove /etc/gdm3/greeter.gsettings
+ fi
+
/usr/share/debian-edu-artwork/update-artwork $1
;;
esac
-------------------------------------------------------------------
Wolfgang
Attachment:
signature.asc
Description: Digital signature