Author: branden
Date: 2003-10-27 12:47:52 -0500 (Mon, 27 Oct 2003)
New Revision: 722
Modified:
trunk/debian/changelog
trunk/debian/shell-lib.sh
trunk/debian/xdm.postinst.in
trunk/debian/xdm.postrm.in
trunk/debian/xdm.preinst.in
trunk/debian/xfree86-common.postinst.in
trunk/debian/xfree86-common.postrm.in
trunk/debian/xfree86-common.preinst.in
Log:
Have the remove_conffile_prepare(), remove_conffile_commit(), and
remove_conffile_rollback() functions call observe() to report the actual
actions performed. Remove such uses of observe() in maintainer scripts.
This way these observational messages are issued only when the system
changes state, and not when a function that potentially does nothing is
called.
- debian/shell-lib.sh
- debian/xdm.postinst.in
- debian/xdm.postrm.in
- debian/xdm.preinst.in
- debian/xfree86-common.postinst.in
- debian/xfree86-common.postrm.in
- debian/xfree86-common.preinst.in
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2003-10-27 17:36:10 UTC (rev 721)
+++ trunk/debian/changelog 2003-10-27 17:47:52 UTC (rev 722)
@@ -278,8 +278,22 @@
- debian/xserver-xfree86.preinst.in
- debian/xserver-xfree86.prerm.in
- -- Branden Robinson <[EMAIL PROTECTED]> Mon, 27 Oct 2003 12:32:03 -0500
+ * Have the remove_conffile_prepare(), remove_conffile_commit(), and
+ remove_conffile_rollback() functions call observe() to report the actual
+ actions performed. Remove such uses of observe() in maintainer scripts.
+ This way these observational messages are issued only when the system
+ changes state, and not when a function that potentially does nothing is
+ called.
+ - debian/shell-lib.sh
+ - debian/xdm.postinst.in
+ - debian/xdm.postrm.in
+ - debian/xdm.preinst.in
+ - debian/xfree86-common.postinst.in
+ - debian/xfree86-common.postrm.in
+ - debian/xfree86-common.preinst.in
+ -- Branden Robinson <[EMAIL PROTECTED]> Mon, 27 Oct 2003 12:43:26 -0500
+
xfree86 (4.2.1-12.1) unstable; urgency=low
* Fix typo in xlibs preinst. Closes: #213774, #213776
Modified: trunk/debian/shell-lib.sh
===================================================================
--- trunk/debian/shell-lib.sh 2003-10-27 17:36:10 UTC (rev 721)
+++ trunk/debian/shell-lib.sh 2003-10-27 17:47:52 UTC (rev 722)
@@ -430,6 +430,7 @@
while [ -n "$1" ]; do
if [ "$current_checksum" = "$1" ]; then
# we found a match; move the confffile and stop looking
+ observe "preparing obsolete conffile $conffile for removal"
mv "$conffile" "$conffile.$THIS_PACKAGE-tmp"
break
fi
@@ -459,6 +460,7 @@
# if the temporary file created by remove_conffile_prepare() exists, remove it
if [ -e "$conffile.$THIS_PACKAGE-tmp" ]; then
+ observe "committing removal of obsolete conffile $conffile"
rm "$conffile.$THIS_PACKAGE-tmp"
fi
}
@@ -486,6 +488,7 @@
# if the temporary file created by remove_conffile_prepare() exists, move it
# back
if [ -e "$conffile.$THIS_PACKAGE-tmp" ]; then
+ observe "rolling back removal of obsolete conffile $conffile"
mv "$conffile.$THIS_PACKAGE-tmp" "$conffile"
fi
}
Modified: trunk/debian/xdm.postinst.in
===================================================================
--- trunk/debian/xdm.postinst.in 2003-10-27 17:36:10 UTC (rev 721)
+++ trunk/debian/xdm.postinst.in 2003-10-27 17:47:52 UTC (rev 722)
@@ -26,7 +26,6 @@
# now safe to remove obsolete conffiles
for F in /etc/X11/xdm/Xreset /etc/X11/xdm/Xsetup; do
- observe "committing removal of obsolete conffile $F"
remove_conffile_commit "$F"
done
Modified: trunk/debian/xdm.postrm.in
===================================================================
--- trunk/debian/xdm.postrm.in 2003-10-27 17:36:10 UTC (rev 721)
+++ trunk/debian/xdm.postrm.in 2003-10-27 17:47:52 UTC (rev 722)
@@ -23,7 +23,6 @@
# roll back removal of obsolete conffiles
for F in /etc/X11/xdm/Xreset /etc/X11/xdm/Xsetup; do
- observe "rolling back removal of obsolete conffile $F"
remove_conffile_rollback "$F"
done
Modified: trunk/debian/xdm.preinst.in
===================================================================
--- trunk/debian/xdm.preinst.in 2003-10-27 17:36:10 UTC (rev 721)
+++ trunk/debian/xdm.preinst.in 2003-10-27 17:47:52 UTC (rev 722)
@@ -47,8 +47,6 @@
# default Xreset and Xsetup conffiles went away in 4.2.1-12
if dpkg --compare-versions "$2" lt "4.2.1-12"; then
- observe "preparing obsolete conffiles /etc/X11/xdm/Xreset and" \
- "/etc/X11/xdm/Xsetup for removal"
remove_conffile_prepare /etc/X11/xdm/Xreset d65cd850f647f7f3d6a076273a3bbb1f
remove_conffile_prepare /etc/X11/xdm/Xsetup 9e68b23946b72af86f88593394ba9339
fi
Modified: trunk/debian/xfree86-common.postinst.in
===================================================================
--- trunk/debian/xfree86-common.postinst.in 2003-10-27 17:36:10 UTC (rev 721)
+++ trunk/debian/xfree86-common.postinst.in 2003-10-27 17:47:52 UTC (rev 722)
@@ -28,8 +28,6 @@
"the filesystem (a bug in dpkg)"
fi
-observe "committing removal of obsolete conffile" \
- "/etc/X11/Xsession.d/40xfree86-common_xmodmap"
remove_conffile_commit /etc/X11/Xsession.d/40xfree86-common_xmodmap
if [ -e /etc/init.d/xfree86-common ]; then
Modified: trunk/debian/xfree86-common.postrm.in
===================================================================
--- trunk/debian/xfree86-common.postrm.in 2003-10-27 17:36:10 UTC (rev 721)
+++ trunk/debian/xfree86-common.postrm.in 2003-10-27 17:47:52 UTC (rev 722)
@@ -15,8 +15,6 @@
#INCLUDE_SHELL_LIB#
if [ "$1" = "abort-install" -o "$1" = "abort-upgrade" ]; then
- observe "rolling back removal of obsolete conffile" \
- "/etc/X11/Xsession.d/40xfree86-common_xmodmap"
remove_conffile_rollback /etc/X11/Xsession.d/40xfree86-common_xmodmap
fi
Modified: trunk/debian/xfree86-common.preinst.in
===================================================================
--- trunk/debian/xfree86-common.preinst.in 2003-10-27 17:36:10 UTC (rev 721)
+++ trunk/debian/xfree86-common.preinst.in 2003-10-27 17:47:52 UTC (rev 722)
@@ -38,8 +38,6 @@
fi
if dpkg --compare-versions "$2" lt "4.1.0-7"; then
- observe "preparing obsolete conffile" \
- "/etc/X11/Xsession.d/40xfree86-common_xmodmap for removal"
remove_conffile_prepare /etc/X11/Xsession.d/40xfree86-common_xmodmap \
b370a42803aec72f27da67ca6a225402
fi
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
