Author: branden
Date: 2004-04-14 15:51:34 -0500 (Wed, 14 Apr 2004)
New Revision: 1259
Modified:
trunk/debian/changelog
trunk/debian/xfree86-common.postinst.in
trunk/debian/xfree86-common.postrm.in
Log:
Fix up xfree86-common postinst and postrm scripts in minor ways.
+ Pass package name literally to update-rc.d and invoke-rc.d; quiets
lintian warning.
+ Use shell's && and || operators instead of test(1)'s -a and -o
operators, since the former is POSIX-compliant and the latter is not.
+ Update Vim modeline.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-04-14 20:45:53 UTC (rev 1258)
+++ trunk/debian/changelog 2004-04-14 20:51:34 UTC (rev 1259)
@@ -151,8 +151,8 @@
stopped for upgrade, but the upgrade failed.
+ Pass package name literally to update-rc.d and invoke-rc.d; quiets
lintian warning.
- + Use shell's && and || operators instead of test(1)'s -a and -o operators,
- since the former is POSIX-compliant and the latter is not.
+ + Use shell's && and || operators instead of test(1)'s -a and -o
+ operators, since the former is POSIX-compliant and the latter is not.
* Fix SEGV when attempting to use GLX extension on SPARC due to failure of
extension to initialize a Mesa context; patch by Ferris McCormick,
@@ -203,8 +203,14 @@
unexported variables already set to be lost (continuation of incomplete or
regressed fix from 4.2.1-10).
- -- Branden Robinson <[EMAIL PROTECTED]> Wed, 14 Apr 2004 15:45:03 -0500
+ * Fix up xfree86-common postinst and postrm scripts in minor ways.
+ + Pass package name literally to update-rc.d and invoke-rc.d; quiets
+ lintian warning.
+ + Use shell's && and || operators instead of test(1)'s -a and -o
+ operators, since the former is POSIX-compliant and the latter is not.
+ -- Branden Robinson <[EMAIL PROTECTED]> Wed, 14 Apr 2004 15:49:52 -0500
+
xfree86 (4.3.0-7) unstable; urgency=medium
* Urgency due to fix for FTBFS. Yes -- I too am begging for it to stop.
Modified: trunk/debian/xfree86-common.postinst.in
===================================================================
--- trunk/debian/xfree86-common.postinst.in 2004-04-14 20:45:53 UTC (rev
1258)
+++ trunk/debian/xfree86-common.postinst.in 2004-04-14 20:51:34 UTC (rev
1259)
@@ -31,13 +31,13 @@
remove_conffile_commit /etc/X11/Xsession.d/40xfree86-common_xmodmap
if [ -e /etc/init.d/xfree86-common ]; then
- update-rc.d "$THIS_PACKAGE" start 70 S .
+ update-rc.d xfree86-common start 70 S .
fi
#DEBHELPER#
-invoke-rc.d "$THIS_PACKAGE" start || true
+invoke-rc.d xfree86-common start || true
exit 0
-# vim:set ai et sts=2 sw=2 tw=0:
+# vim:set ai et sts=2 sw=2 tw=80:
Modified: trunk/debian/xfree86-common.postrm.in
===================================================================
--- trunk/debian/xfree86-common.postrm.in 2004-04-14 20:45:53 UTC (rev
1258)
+++ trunk/debian/xfree86-common.postrm.in 2004-04-14 20:51:34 UTC (rev
1259)
@@ -14,14 +14,14 @@
#INCLUDE_SHELL_LIB#
-if [ "$1" = "abort-install" -o "$1" = "abort-upgrade" ]; then
+if [ "$1" = "abort-install" ] || [ "$1" = "abort-upgrade" ]; then
remove_conffile_rollback /etc/X11/Xsession.d/40xfree86-common_xmodmap
fi
#DEBHELPER#
if [ "$1" = "purge" ]; then
- update-rc.d "$THIS_PACKAGE" remove
+ update-rc.d xfree86-common remove
for DIR in /etc/X11/Xresources /etc/X11/Xsession.d /etc/X11; do
rmdir "$DIR" 2> /dev/null || true
done
@@ -29,4 +29,4 @@
exit 0
-# vim:set ai et sts=2 sw=2 tw=0:
+# vim:set ai et sts=2 sw=2 tw=80:
