Author: branden
Date: 2003-10-21 19:09:10 -0500 (Tue, 21 Oct 2003)
New Revision: 688
Modified:
trunk/debian/changelog
trunk/debian/xdm.postinst.in
trunk/debian/xdm.postrm.in
Log:
Complete support for commit/rollback of default display manager file. In the
postinst script (package configuration), remove the temporary file. In the
postrm script, if package install or upgrade is being aborted, restore the
temporary file to its original location.
- debian/xdm.postinst.in
- debian/xdm.postrm.in
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2003-10-21 23:52:31 UTC (rev 687)
+++ trunk/debian/changelog 2003-10-22 00:09:10 UTC (rev 688)
@@ -55,13 +55,16 @@
(Closes: #216448)
- debian/po/da.po
- * In xdm's config script, move the default display manager file to a
- temporary location instead of deleting it if the default is changing; this
- way the change can be reverted if the install or upgrade is aborted
- (already implemented in the postrm script).
+ * Support commit/rollback of default display manager file. In the config
+ script, if the default is changed, move the file to a temporary location.
+ In the postinst script (package configuration), remove the temporary file.
+ In the postrm script, if package install or upgrade is being aborted,
+ restore the temporary file to its original location.
- debian/xdm.config.in
+ - debian/xdm.postinst.in
+ - debian/xdm.postrm.in
- -- Branden Robinson <[EMAIL PROTECTED]> Tue, 21 Oct 2003 18:51:12 -0500
+ -- Branden Robinson <[EMAIL PROTECTED]> Tue, 21 Oct 2003 19:06:02 -0500
xfree86 (4.2.1-12.1) unstable; urgency=low
Modified: trunk/debian/xdm.postinst.in
===================================================================
--- trunk/debian/xdm.postinst.in 2003-10-21 23:52:31 UTC (rev 687)
+++ trunk/debian/xdm.postinst.in 2003-10-22 00:09:10 UTC (rev 688)
@@ -46,6 +46,11 @@
fi
fi
+# remove the displaced old default display manager file if it exists
+if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" ]; then
+ rm "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp"
+fi
+
# restarting the daemon may cause output to stdout
safe_debconf db_stop
Modified: trunk/debian/xdm.postrm.in
===================================================================
--- trunk/debian/xdm.postrm.in 2003-10-21 23:52:31 UTC (rev 687)
+++ trunk/debian/xdm.postrm.in 2003-10-22 00:09:10 UTC (rev 688)
@@ -26,6 +26,11 @@
debugmsg "rolling back removal of obsolete conffile $F"
remove_conffile_rollback "$F"
done
+
+ # roll back displacement of default display manager file
+ if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" ]; then
+ mv "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" "$DEFAULT_DISPLAY_MANAGER_FILE"
+ fi
fi
#DEBHELPER#
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
