Author: branden
Date: 2005-01-17 18:34:18 -0500 (Mon, 17 Jan 2005)
New Revision: 2137
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/lbxproxy.postrm.in
trunk/debian/proxymngr.postrm.in
trunk/debian/twm.postinst.in
trunk/debian/twm.postrm.in
trunk/debian/twm.prerm.in
trunk/debian/xbase-clients.postrm.in
trunk/debian/xdm.postinst.in
trunk/debian/xdm.postrm.in
trunk/debian/xfonts-100dpi-transcoded.postinst.in
trunk/debian/xfonts-100dpi-transcoded.postrm.in
trunk/debian/xfonts-100dpi.postinst.in
trunk/debian/xfonts-100dpi.postrm.in
trunk/debian/xfonts-75dpi-transcoded.postinst.in
trunk/debian/xfonts-75dpi-transcoded.postrm.in
trunk/debian/xfonts-75dpi.postinst.in
trunk/debian/xfonts-75dpi.postrm.in
trunk/debian/xfonts-base-transcoded.postinst.in
trunk/debian/xfonts-base-transcoded.postrm.in
trunk/debian/xfonts-base.postinst.in
trunk/debian/xfonts-base.postrm.in
trunk/debian/xfonts-cyrillic.postinst.in
trunk/debian/xfonts-cyrillic.postrm.in
trunk/debian/xfonts-scalable.postinst.in
trunk/debian/xfonts-scalable.postrm.in
trunk/debian/xfree86-common.postinst.in
trunk/debian/xfree86-common.postrm.in
trunk/debian/xfs.postinst.in
trunk/debian/xfs.postrm.in
trunk/debian/xserver-common.postinst.in
trunk/debian/xserver-xfree86.postinst.in
trunk/debian/xutils.postinst.in
trunk/debian/xutils.postrm.in
Log:
Move the debhelper expando to run later in maintainer scripts, except
where (as in the case of xdm and xfs), we use flag files that indicate
when the installation is over. In those cases, place the expando
immediately before removal of such files.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2005-01-17 22:57:01 UTC (rev 2136)
+++ trunk/debian/CHANGESETS 2005-01-17 23:34:18 UTC (rev 2137)
@@ -147,4 +147,10 @@
Resync patches #059, #803, and #907.
2136
+Move the debhelper expando to run later in maintainer scripts, except
+where (as in the case of xdm and xfs), we use flag files that indicate
+when the installation is over. In those cases, place the expando
+immediately before removal of such files.
+ 2137
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-01-17 22:57:01 UTC (rev 2136)
+++ trunk/debian/changelog 2005-01-17 23:34:18 UTC (rev 2137)
@@ -117,6 +117,11 @@
(Closes: #286068)
Resync patches #059, #803, and #907.
+ * Move the debhelper expando to run later in maintainer scripts, except
+ where (as in the case of xdm and xfs), we use flag files that indicate
+ when the installation is over. In those cases, place the expando
+ immediately before removal of such files.
+
-- Branden Robinson <[EMAIL PROTECTED]> Mon, 17 Jan 2005 17:40:45 -0500
xfree86 (4.3.0.dfsg.1-10) unstable; urgency=medium
Modified: trunk/debian/lbxproxy.postrm.in
===================================================================
--- trunk/debian/lbxproxy.postrm.in 2005-01-17 22:57:01 UTC (rev 2136)
+++ trunk/debian/lbxproxy.postrm.in 2005-01-17 23:34:18 UTC (rev 2137)
@@ -14,14 +14,14 @@
#INCLUDE_SHELL_LIB#
-#DEBHELPER#
-
if [ "$1" = "purge" ]; then
if [ -d /etc/X11/lbxproxy ]; then
rm -r /etc/X11/lbxproxy
fi
fi
+#DEBHELPER#
+
exit 0
# vim:set ai et sts=2 sw=2 tw=80:
Modified: trunk/debian/proxymngr.postrm.in
===================================================================
--- trunk/debian/proxymngr.postrm.in 2005-01-17 22:57:01 UTC (rev 2136)
+++ trunk/debian/proxymngr.postrm.in 2005-01-17 23:34:18 UTC (rev 2137)
@@ -14,14 +14,14 @@
#INCLUDE_SHELL_LIB#
-#DEBHELPER#
-
if [ "$1" = "purge" ]; then
if [ -d /etc/X11/proxymngr ]; then
rm -r /etc/X11/proxymngr
fi
fi
+#DEBHELPER#
+
exit 0
# vim:set ai et sts=2 sw=2 tw=80:
Modified: trunk/debian/twm.postinst.in
===================================================================
--- trunk/debian/twm.postinst.in 2005-01-17 22:57:01 UTC (rev 2136)
+++ trunk/debian/twm.postinst.in 2005-01-17 23:34:18 UTC (rev 2137)
@@ -22,8 +22,6 @@
rm -r /usr/X11R6/lib/X11/twm.moved-by-preinst
fi
-#DEBHELPER#
-
# clean up after older alternative that used different path
update-alternatives --remove x-window-manager /usr/bin/X11/twm
@@ -31,6 +29,8 @@
/usr/X11R6/bin/twm 40 --slave /usr/share/man/man1/x-window-manager.1.gz \
x-window-manager.1.gz /usr/X11R6/man/man1/twm.1x.gz
+#DEBHELPER#
+
exit 0
# vim:set ai et sts=2 sw=2 tw=80:
Modified: trunk/debian/twm.postrm.in
===================================================================
--- trunk/debian/twm.postrm.in 2005-01-17 22:57:01 UTC (rev 2136)
+++ trunk/debian/twm.postrm.in 2005-01-17 23:34:18 UTC (rev 2137)
@@ -22,14 +22,14 @@
fi
fi
-#DEBHELPER#
-
if [ "$1" = "purge" ]; then
if [ -d /etc/X11/twm ]; then
rm -r /etc/X11/twm
fi
fi
+#DEBHELPER#
+
exit 0
# vim:set ai et sts=2 sw=2 tw=80:
Modified: trunk/debian/twm.prerm.in
===================================================================
--- trunk/debian/twm.prerm.in 2005-01-17 22:57:01 UTC (rev 2136)
+++ trunk/debian/twm.prerm.in 2005-01-17 23:34:18 UTC (rev 2137)
@@ -14,12 +14,12 @@
#INCLUDE_SHELL_LIB#
-#DEBHELPER#
-
if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
update-alternatives --remove x-window-manager /usr/X11R6/bin/twm
fi
+#DEBHELPER#
+
exit 0
# vim:set ai et sts=2 sw=2 tw=80:
Modified: trunk/debian/xbase-clients.postrm.in
===================================================================
--- trunk/debian/xbase-clients.postrm.in 2005-01-17 22:57:01 UTC (rev
2136)
+++ trunk/debian/xbase-clients.postrm.in 2005-01-17 23:34:18 UTC (rev
2137)
@@ -26,8 +26,6 @@
remove_conffile_rollback /etc/X11/Xmodmap
fi
-#DEBHELPER#
-
if [ "$1" = "purge" ]; then
for DIR in xinit xsm; do
if [ -d /etc/X11/$DIR ]; then
@@ -36,6 +34,8 @@
done
fi
+#DEBHELPER#
+
exit 0
# vim:set ai et sts=2 sw=2 tw=80:
Modified: trunk/debian/xdm.postinst.in
===================================================================
--- trunk/debian/xdm.postinst.in 2005-01-17 22:57:01 UTC (rev 2136)
+++ trunk/debian/xdm.postinst.in 2005-01-17 23:34:18 UTC (rev 2137)
@@ -140,6 +140,7 @@
[ -n "$NOSTART" ] || invoke-rc.d xdm start || true
+# Perform debhelper tasks *before* removing the install flag file.
#DEBHELPER#
# Remove install flag file. Leave the "daemon not stopped" flag file, if it
Modified: trunk/debian/xdm.postrm.in
===================================================================
--- trunk/debian/xdm.postrm.in 2005-01-17 22:57:01 UTC (rev 2136)
+++ trunk/debian/xdm.postrm.in 2005-01-17 23:34:18 UTC (rev 2137)
@@ -31,8 +31,6 @@
fi
fi
-#DEBHELPER#
-
if [ "$1" = "purge" ]; then
update-rc.d xdm remove
for DIR in /etc/X11/xdm /var/lib/xdm; do
@@ -42,6 +40,10 @@
done
fi
+# Perform debhelper tasks *before* perform abort-upgrade actions, which remove
+# the flag files.
+#DEBHELPER#
+
if [ "$1" = "abort-upgrade" ]; then
# NOTE: The following is copied from the postinst script and isn't necessary
# if dpkg executes a package's postinst script with the "configure" argument
Modified: trunk/debian/xfonts-100dpi-transcoded.postinst.in
===================================================================
--- trunk/debian/xfonts-100dpi-transcoded.postinst.in 2005-01-17 22:57:01 UTC
(rev 2136)
+++ trunk/debian/xfonts-100dpi-transcoded.postinst.in 2005-01-17 23:34:18 UTC
(rev 2137)
@@ -14,12 +14,12 @@
#INCLUDE_SHELL_LIB#
-#DEBHELPER#
-
FONTDIRS="100dpi"
UPDATECMDS="update-fonts-dir update-fonts-alias"
font_update
+#DEBHELPER#
+
exit 0
# vim:set ai et sts=2 sw=2 tw=80:
Modified: trunk/debian/xfonts-100dpi-transcoded.postrm.in
===================================================================
--- trunk/debian/xfonts-100dpi-transcoded.postrm.in 2005-01-17 22:57:01 UTC
(rev 2136)
+++ trunk/debian/xfonts-100dpi-transcoded.postrm.in 2005-01-17 23:34:18 UTC
(rev 2137)
@@ -14,8 +14,6 @@
#INCLUDE_SHELL_LIB#
-#DEBHELPER#
-
if [ "$1" = "purge" ] || [ "$1" = "remove" ] || [ "$1" = "disappear" ]; then
FONTDIRS="100dpi"
UPDATECMDS="update-fonts-dir update-fonts-alias"
@@ -28,6 +26,8 @@
done
fi
+#DEBHELPER#
+
exit 0
# vim:set ai et sts=2 sw=2 tw=80:
Modified: trunk/debian/xfonts-100dpi.postinst.in
===================================================================
--- trunk/debian/xfonts-100dpi.postinst.in 2005-01-17 22:57:01 UTC (rev
2136)
+++ trunk/debian/xfonts-100dpi.postinst.in 2005-01-17 23:34:18 UTC (rev
2137)
@@ -14,12 +14,12 @@
#INCLUDE_SHELL_LIB#
-#DEBHELPER#
-
FONTDIRS="100dpi"
UPDATECMDS="update-fonts-dir update-fonts-alias"
font_update
+#DEBHELPER#
+
exit 0
# vim:set ai et sts=2 sw=2 tw=80:
Modified: trunk/debian/xfonts-100dpi.postrm.in
===================================================================
--- trunk/debian/xfonts-100dpi.postrm.in 2005-01-17 22:57:01 UTC (rev
2136)
+++ trunk/debian/xfonts-100dpi.postrm.in 2005-01-17 23:34:18 UTC (rev
2137)
@@ -14,8 +14,6 @@
#INCLUDE_SHELL_LIB#
-#DEBHELPER#
-
if [ "$1" = "purge" ] || [ "$1" = "remove" ] || [ "$1" = "disappear" ]; then
FONTDIRS="100dpi"
UPDATECMDS="update-fonts-dir update-fonts-alias"
@@ -28,6 +26,8 @@
done
fi
+#DEBHELPER#
+
exit 0
# vim:set ai et sts=2 sw=2 tw=80:
Modified: trunk/debian/xfonts-75dpi-transcoded.postinst.in
===================================================================
--- trunk/debian/xfonts-75dpi-transcoded.postinst.in 2005-01-17 22:57:01 UTC
(rev 2136)
+++ trunk/debian/xfonts-75dpi-transcoded.postinst.in 2005-01-17 23:34:18 UTC
(rev 2137)
@@ -14,12 +14,12 @@
#INCLUDE_SHELL_LIB#
-#DEBHELPER#
-
FONTDIRS="75dpi"
UPDATECMDS="update-fonts-dir update-fonts-alias"
font_update
+#DEBHELPER#
+
exit 0
# vim:set ai et sts=2 sw=2 tw=80:
Modified: trunk/debian/xfonts-75dpi-transcoded.postrm.in
===================================================================
--- trunk/debian/xfonts-75dpi-transcoded.postrm.in 2005-01-17 22:57:01 UTC
(rev 2136)
+++ trunk/debian/xfonts-75dpi-transcoded.postrm.in 2005-01-17 23:34:18 UTC
(rev 2137)
@@ -14,8 +14,6 @@
#INCLUDE_SHELL_LIB#
-#DEBHELPER#
-
if [ "$1" = "purge" ] || [ "$1" = "remove" ] || [ "$1" = "disappear" ]; then
FONTDIRS="75dpi"
UPDATECMDS="update-fonts-dir update-fonts-alias"
@@ -28,6 +26,8 @@
done
fi
+#DEBHELPER#
+
exit 0
# vim:set ai et sts=2 sw=2 tw=80:
Modified: trunk/debian/xfonts-75dpi.postinst.in
===================================================================
--- trunk/debian/xfonts-75dpi.postinst.in 2005-01-17 22:57:01 UTC (rev
2136)
+++ trunk/debian/xfonts-75dpi.postinst.in 2005-01-17 23:34:18 UTC (rev
2137)
@@ -14,12 +14,12 @@
#INCLUDE_SHELL_LIB#
-#DEBHELPER#
-
FONTDIRS="75dpi"
UPDATECMDS="update-fonts-dir update-fonts-alias"
font_update
+#DEBHELPER#
+
exit 0
# vim:set ai et sts=2 sw=2 tw=80:
Modified: trunk/debian/xfonts-75dpi.postrm.in
===================================================================
--- trunk/debian/xfonts-75dpi.postrm.in 2005-01-17 22:57:01 UTC (rev 2136)
+++ trunk/debian/xfonts-75dpi.postrm.in 2005-01-17 23:34:18 UTC (rev 2137)
@@ -14,8 +14,6 @@
#INCLUDE_SHELL_LIB#
-#DEBHELPER#
-
if [ "$1" = "purge" ] || [ "$1" = "remove" ] || [ "$1" = "disappear" ]; then
FONTDIRS="75dpi"
UPDATECMDS="update-fonts-dir update-fonts-alias"
@@ -28,6 +26,8 @@
done
fi
+#DEBHELPER#
+
exit 0
# vim:set ai et sts=2 sw=2 tw=80:
Modified: trunk/debian/xfonts-base-transcoded.postinst.in
===================================================================
--- trunk/debian/xfonts-base-transcoded.postinst.in 2005-01-17 22:57:01 UTC
(rev 2136)
+++ trunk/debian/xfonts-base-transcoded.postinst.in 2005-01-17 23:34:18 UTC
(rev 2137)
@@ -14,12 +14,12 @@
#INCLUDE_SHELL_LIB#
-#DEBHELPER#
-
FONTDIRS="misc"
UPDATECMDS="update-fonts-dir update-fonts-alias"
font_update
+#DEBHELPER#
+
exit 0
# vim:set ai et sts=2 sw=2 tw=80:
Modified: trunk/debian/xfonts-base-transcoded.postrm.in
===================================================================
--- trunk/debian/xfonts-base-transcoded.postrm.in 2005-01-17 22:57:01 UTC
(rev 2136)
+++ trunk/debian/xfonts-base-transcoded.postrm.in 2005-01-17 23:34:18 UTC
(rev 2137)
@@ -14,8 +14,6 @@
#INCLUDE_SHELL_LIB#
-#DEBHELPER#
-
if [ "$1" = "purge" ] || [ "$1" = "remove" ] || [ "$1" = "disappear" ]; then
FONTDIRS="misc"
UPDATECMDS="update-fonts-dir update-fonts-alias"
@@ -28,6 +26,8 @@
done
fi
+#DEBHELPER#
+
exit 0
# vim:set ai et sts=2 sw=2 tw=80:
Modified: trunk/debian/xfonts-base.postinst.in
===================================================================
--- trunk/debian/xfonts-base.postinst.in 2005-01-17 22:57:01 UTC (rev
2136)
+++ trunk/debian/xfonts-base.postinst.in 2005-01-17 23:34:18 UTC (rev
2137)
@@ -14,12 +14,12 @@
#INCLUDE_SHELL_LIB#
-#DEBHELPER#
-
FONTDIRS="misc"
UPDATECMDS="update-fonts-dir update-fonts-alias"
font_update
+#DEBHELPER#
+
exit 0
# vim:set ai et sts=2 sw=2 tw=80:
Modified: trunk/debian/xfonts-base.postrm.in
===================================================================
--- trunk/debian/xfonts-base.postrm.in 2005-01-17 22:57:01 UTC (rev 2136)
+++ trunk/debian/xfonts-base.postrm.in 2005-01-17 23:34:18 UTC (rev 2137)
@@ -14,8 +14,6 @@
#INCLUDE_SHELL_LIB#
-#DEBHELPER#
-
if [ "$1" = "purge" ] || [ "$1" = "remove" ] || [ "$1" = "disappear" ]; then
FONTDIRS="misc"
UPDATECMDS="update-fonts-dir update-fonts-alias"
@@ -28,6 +26,8 @@
done
fi
+#DEBHELPER#
+
exit 0
# vim:set ai et sts=2 sw=2 tw=80:
Modified: trunk/debian/xfonts-cyrillic.postinst.in
===================================================================
--- trunk/debian/xfonts-cyrillic.postinst.in 2005-01-17 22:57:01 UTC (rev
2136)
+++ trunk/debian/xfonts-cyrillic.postinst.in 2005-01-17 23:34:18 UTC (rev
2137)
@@ -14,12 +14,12 @@
#INCLUDE_SHELL_LIB#
-#DEBHELPER#
-
FONTDIRS="cyrillic"
UPDATECMDS="update-fonts-dir update-fonts-alias"
font_update
+#DEBHELPER#
+
exit 0
# vim:set ai et sts=2 sw=2 tw=80:
Modified: trunk/debian/xfonts-cyrillic.postrm.in
===================================================================
--- trunk/debian/xfonts-cyrillic.postrm.in 2005-01-17 22:57:01 UTC (rev
2136)
+++ trunk/debian/xfonts-cyrillic.postrm.in 2005-01-17 23:34:18 UTC (rev
2137)
@@ -14,8 +14,6 @@
#INCLUDE_SHELL_LIB#
-#DEBHELPER#
-
if [ "$1" = "purge" ] || [ "$1" = "remove" ] || [ "$1" = "disappear" ]; then
FONTDIRS="cyrillic"
UPDATECMDS="update-fonts-dir update-fonts-alias"
@@ -28,6 +26,8 @@
done
fi
+#DEBHELPER#
+
exit 0
# vim:set ai et sts=2 sw=2 tw=80:
Modified: trunk/debian/xfonts-scalable.postinst.in
===================================================================
--- trunk/debian/xfonts-scalable.postinst.in 2005-01-17 22:57:01 UTC (rev
2136)
+++ trunk/debian/xfonts-scalable.postinst.in 2005-01-17 23:34:18 UTC (rev
2137)
@@ -14,8 +14,6 @@
#INCLUDE_SHELL_LIB#
-#DEBHELPER#
-
FONTDIRS="Speedo Type1"
UPDATECMDS="update-fonts-scale update-fonts-dir"
@@ -28,6 +26,8 @@
font_update
+#DEBHELPER#
+
exit 0
# vim:set ai et sts=2 sw=2 tw=80:
Modified: trunk/debian/xfonts-scalable.postrm.in
===================================================================
--- trunk/debian/xfonts-scalable.postrm.in 2005-01-17 22:57:01 UTC (rev
2136)
+++ trunk/debian/xfonts-scalable.postrm.in 2005-01-17 23:34:18 UTC (rev
2137)
@@ -14,8 +14,6 @@
#INCLUDE_SHELL_LIB#
-#DEBHELPER#
-
if [ "$1" = "purge" ] || [ "$1" = "remove" ] || [ "$1" = "disappear" ]; then
FONTDIRS="Speedo Type1"
UPDATECMDS="update-fonts-scale update-fonts-dir"
@@ -37,6 +35,8 @@
done
fi
+#DEBHELPER#
+
exit 0
# vim:set ai et sts=2 sw=2 tw=80:
Modified: trunk/debian/xfree86-common.postinst.in
===================================================================
--- trunk/debian/xfree86-common.postinst.in 2005-01-17 22:57:01 UTC (rev
2136)
+++ trunk/debian/xfree86-common.postinst.in 2005-01-17 23:34:18 UTC (rev
2137)
@@ -31,10 +31,10 @@
update-rc.d xfree86-common start 70 S .
fi
+invoke-rc.d xfree86-common start || true
+
#DEBHELPER#
-invoke-rc.d xfree86-common start || true
-
exit 0
# vim:set ai et sts=2 sw=2 tw=80:
Modified: trunk/debian/xfree86-common.postrm.in
===================================================================
--- trunk/debian/xfree86-common.postrm.in 2005-01-17 22:57:01 UTC (rev
2136)
+++ trunk/debian/xfree86-common.postrm.in 2005-01-17 23:34:18 UTC (rev
2137)
@@ -18,8 +18,6 @@
remove_conffile_rollback /etc/X11/Xsession.d/40xfree86-common_xmodmap
fi
-#DEBHELPER#
-
if [ "$1" = "purge" ]; then
update-rc.d xfree86-common remove
for DIR in /etc/X11/Xresources /etc/X11/Xsession.d /etc/X11; do
@@ -27,6 +25,8 @@
done
fi
+#DEBHELPER#
+
exit 0
# vim:set ai et sts=2 sw=2 tw=80:
Modified: trunk/debian/xfs.postinst.in
===================================================================
--- trunk/debian/xfs.postinst.in 2005-01-17 22:57:01 UTC (rev 2136)
+++ trunk/debian/xfs.postinst.in 2005-01-17 23:34:18 UTC (rev 2137)
@@ -59,6 +59,7 @@
[ -n "$NOSTART" ] || invoke-rc.d xfs start || true
+# Perform debhelper tasks *before* removing the install flag file.
#DEBHELPER#
# Remove install flag file. Leave the "daemon not stopped" flag file, if it
Modified: trunk/debian/xfs.postrm.in
===================================================================
--- trunk/debian/xfs.postrm.in 2005-01-17 22:57:01 UTC (rev 2136)
+++ trunk/debian/xfs.postrm.in 2005-01-17 23:34:18 UTC (rev 2137)
@@ -32,8 +32,6 @@
rm -f /var/run/xfs.install
fi
-#DEBHELPER#
-
if [ "$1" = "purge" ]; then
update-rc.d xfs remove
if [ -d /etc/X11/fs ]; then
@@ -41,6 +39,10 @@
fi
fi
+# Perform debhelper tasks *before* perform abort-upgrade actions, which remove
+# the flag files.
+#DEBHELPER#
+
if [ "$1" = "abort-upgrade" ]; then
# NOTE: The following is copied from the postinst script and isn't necessary
# if dpkg executes a package's postinst script with the "configure" argument
Modified: trunk/debian/xserver-common.postinst.in
===================================================================
--- trunk/debian/xserver-common.postinst.in 2005-01-17 22:57:01 UTC (rev
2136)
+++ trunk/debian/xserver-common.postinst.in 2005-01-17 23:34:18 UTC (rev
2137)
@@ -31,8 +31,6 @@
rm -r /usr/X11R6/lib/X11/xserver.moved-by-preinst
fi
-#DEBHELPER#
-
# only mess with config files if the configuration file auxiliary directory
# exists; if it does not, assume that's the way the user wants it
if [ -d "$CONFIG_AUX_DIR" ]; then
@@ -104,6 +102,8 @@
fi
fi
+#DEBHELPER#
+
exit 0
# vim:set ai et sts=2 sw=2 tw=80:
Modified: trunk/debian/xserver-xfree86.postinst.in
===================================================================
--- trunk/debian/xserver-xfree86.postinst.in 2005-01-17 22:57:01 UTC (rev
2136)
+++ trunk/debian/xserver-xfree86.postinst.in 2005-01-17 23:34:18 UTC (rev
2137)
@@ -27,8 +27,6 @@
XF86CONFIG_ROSTER="$CONFIG_AUX_DIR/${XF86CONFIG##*/}.roster"
THIS_SERVER=/usr/bin/X11/XFree86
-#DEBHELPER#
-
# only mess with config files if the configuration file auxiliary directory
# exists; if it does not, assume that's the way the user wants it
if [ -d "$CONFIG_AUX_DIR" ]; then
@@ -131,6 +129,8 @@
update-configlets
fi
+#DEBHELPER#
+
exit 0
# vim:set ai et sts=2 sw=2 tw=80:
Modified: trunk/debian/xutils.postinst.in
===================================================================
--- trunk/debian/xutils.postinst.in 2005-01-17 22:57:01 UTC (rev 2136)
+++ trunk/debian/xutils.postinst.in 2005-01-17 23:34:18 UTC (rev 2137)
@@ -30,6 +30,7 @@
"/etc/X11/rstart/rstartd.real"
rm /etc/X11/rstart/rstartd.real.dpkg-tmp
fi
+
#DEBHELPER#
exit 0
Modified: trunk/debian/xutils.postrm.in
===================================================================
--- trunk/debian/xutils.postrm.in 2005-01-17 22:57:01 UTC (rev 2136)
+++ trunk/debian/xutils.postrm.in 2005-01-17 23:34:18 UTC (rev 2137)
@@ -33,14 +33,14 @@
fi
fi
-#DEBHELPER#
-
if [ "$1" = "purge" ]; then
if [ -d /etc/X11/rstart ]; then
rm -r /etc/X11/rstart
fi
fi
+#DEBHELPER#
+
exit 0
# vim:set ai et sts=2 sw=2 tw=80:
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
