X Strike Force SVN commit: rev 98 - in trunk: . local
Author: branden
Date: 2003-05-29 11:04:24 -0500 (Thu, 29 May 2003)
New Revision: 98
Modified:
trunk/changelog
trunk/local/update-fonts-dir
trunk/local/update-fonts-scale
trunk/rules
trunk/xserver-common.postinst.in
trunk/xserver-xfree86.config.in
Log:
invoke head, tail, and diff commands in a POSIXly correct fashion (thanks,
Paul Eggert) (Closes: #191669)
Modified: trunk/local/update-fonts-dir
==============================================================================
--- trunk/local/update-fonts-dir 2003-05-29 15:57:27 UTC (rev 97)
+++ trunk/local/update-fonts-dir 2003-05-29 16:04:24 UTC (rev 98)
@@ -56,7 +56,7 @@
/usr/bin/X11/mkfontdir $XDIR
fi
# are there any fonts in the font dir?
- if [ "$(head -1 $XDIR/fonts.dir)" = "0" ]; then
+ if [ "$(head -n 1 $XDIR/fonts.dir)" = "0" ]; then
rm -f $XDIR/fonts.dir $XDIR/encodings.dir
# remove the font dir if it is empty
rmdir $XDIR > /dev/null 2>&1 || true
Modified: trunk/local/update-fonts-scale
==============================================================================
--- trunk/local/update-fonts-scale 2003-05-29 15:57:27 UTC (rev 97)
+++ trunk/local/update-fonts-scale 2003-05-29 16:04:24 UTC (rev 98)
@@ -56,7 +56,7 @@
if [ "$(echo $ETCDIR/*.scale)" != "$ETCDIR/*.scale" ]; then
for file in $ETCDIR/*.scale; do
# omit count at top of file
- tail +2 $file >> $XDIR/fonts.scale.update-tmp
+ tail -n +2 $file >> $XDIR/fonts.scale.update-tmp
done
# write new scale file in case we are interrupted
# write new count to top of file
Modified: trunk/rules
==============================================================================
--- trunk/rules 2003-05-29 15:57:27 UTC (rev 97)
+++ trunk/rules 2003-05-29 16:04:24 UTC (rev 98)
@@ -303,7 +303,7 @@
# confirm that the installed file list has not changed
if [ -e debian/MANIFEST.$(ARCH) ]; then \
if ! cmp -s debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new; then \
- diff -u -0 debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new; \
+ diff -U 0 debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new; \
if [ -n "$$IGNORE_MANIFEST_CHANGES" ]; then \
echo 'MANIFEST check failed; ignoring problem because \$$IGNORE_MANIFEST_CHANGES set' >&2; \
echo 'Please ensure that the package maintainer has an up-to-date version of the' >&2; \
Modified: trunk/xserver-xfree86.config.in
==============================================================================
--- trunk/xserver-xfree86.config.in 2003-05-29 15:57:27 UTC (rev 97)
+++ trunk/xserver-xfree86.config.in 2003-05-29 16:04:24 UTC (rev 98)
@@ -577,7 +577,7 @@
fi
if which lspci > /dev/null 2>&1; then
# try to guess the correct BusID
- VIDEO_CARD=$(LC_ALL=C lspci -n | grep "Class 0300:" | head -1 | cut -d\ -f1)
+ VIDEO_CARD=$(LC_ALL=C lspci -n | grep "Class 0300:" | head -n 1 | cut -d\ -f1)
if [ -n "$VIDEO_CARD" ]; then
# we now have an entry in "hex:hex.hex" format, need "PCI:decimal:decimal:decimal"
BUS=$(printf "%d" 0x$(echo $VIDEO_CARD | cut -d: -f1) )
@@ -705,8 +705,8 @@
set -e
if [ -n "$MDETECT_OUTPUT" ]; then
PRIORITY=low
- AUTODETECTED_PORT=$(echo "$MDETECT_OUTPUT" | head -1)
- AUTODETECTED_PROTOCOL=$(echo "$MDETECT_OUTPUT" | tail -1)
+ AUTODETECTED_PORT=$(echo "$MDETECT_OUTPUT" | head -n 1)
+ AUTODETECTED_PROTOCOL=$(echo "$MDETECT_OUTPUT" | tail -n 1)
debug_echo "mdetect returned port \"$AUTODETECTED_PORT\"; protocol \"$AUTODETECTED_PROTOCOL\""
if [ -n "$AUTODETECTED_PORT" ]; then
# /dev/input/mouse* means we autodetected a USB pointer; we will
Modified: trunk/xserver-common.postinst.in
==============================================================================
--- trunk/xserver-common.postinst.in 2003-05-29 15:57:27 UTC (rev 97)
+++ trunk/xserver-common.postinst.in 2003-05-29 16:04:24 UTC (rev 98)
@@ -59,13 +59,13 @@
egrep -q '^### END DEBCONF SECTION' $CONFIGFILE; then
# see if the beginning of the file was left alone; sed cannot backtrack in an
# address range
- if ! head -1 $CONFIGFILE | egrep -q '^### BEGIN DEBCONF SECTION'; then
+ if ! head -n 1 $CONFIGFILE | egrep -q '^### BEGIN DEBCONF SECTION'; then
# sick, sick, sick
LINES=$(sed -n '1,/^### BEGIN DEBCONF SECTION/p' < $CONFIGFILE | wc -l)
sed -n 1,$(( $LINES - 1 ))p < $CONFIGFILE > $WORKTMP
fi
cat $DEBCONFTMP >> $WORKTMP
- sed -n '/^### END DEBCONF SECTION/,$p' < $CONFIGFILE | tail +2 >> $WORKTMP
+ sed -n '/^### END DEBCONF SECTION/,$p' < $CONFIGFILE | tail -n +2 >> $WORKTMP
else
message "Existing $CONFIGFILE has missing or half-open debconf region;" \
"not writing X server wrapper configuration file."
Modified: trunk/changelog
==============================================================================
--- trunk/changelog 2003-05-29 15:57:27 UTC (rev 97)
+++ trunk/changelog 2003-05-29 16:04:24 UTC (rev 98)
@@ -98,6 +98,9 @@
* debian/*.conffiles: deleted; generation of these files is now handled
automatically by dh_installdeb when DH_COMPAT >= 4
* debian/*.debugfiles: renamed to *.install
+ * debian/{local/update-fonts-{dir,scale}},rules,xserver-common.postinst.in,
+ xserver-xfree86.config.in}: invoke head, tail, and diff commands in a
+ POSIXly correct fashion (thanks, Paul Eggert) (Closes: #191669)
* debian/compat: new file, implementing debhelper recommended best practice
for setting compatibility level; compat-level bumped from 2 to 4: this
means that, among other things, dh_installdeb creates DEBIAN/conffiles
@@ -196,7 +199,7 @@
xserver-xfree86/config/device/driver from "atimisc", "r128", or "radeon"
to "ati"
- -- Branden Robinson <branden@debian.org> Thu, 29 May 2003 10:56:39 -0500
+ -- Branden Robinson <branden@debian.org> Thu, 29 May 2003 11:03:40 -0500
xfree86 (4.2.1-6) unstable; urgency=medium
Reply to: