X Strike Force XFree86 SVN commit: r2253 - trunk/debian
Author: branden
Date: 2005-05-11 13:00:58 -0500 (Wed, 11 May 2005)
New Revision: 2253
Modified:
trunk/debian/CHANGESETS
trunk/debian/xserver-xfree86.config.in
Log:
Grep actual files, not standard input.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2005-05-10 19:57:46 UTC (rev 2252)
+++ trunk/debian/CHANGESETS 2005-05-11 18:00:58 UTC (rev 2253)
@@ -129,7 +129,7 @@
of debugging statements (suppressed by default). Among other things, this
adds support for the /dev/adbmouse device node used on Apple Desktop
Bus-equipped Macintoshes. (Closes: #293527)
- 2248, 2249
+ 2248, 2249, 2253
Fix translation error in Brazilian Portguese debconf template
translations. (Thanks, André Luís Lopes!) (Closes: #308506)
Modified: trunk/debian/xserver-xfree86.config.in
===================================================================
--- trunk/debian/xserver-xfree86.config.in 2005-05-10 19:57:46 UTC (rev 2252)
+++ trunk/debian/xserver-xfree86.config.in 2005-05-11 18:00:58 UTC (rev 2253)
@@ -575,7 +575,8 @@
m68k)
# A good default for m68k depends on which subarchitecure this is.
if [ -r /proc/hardware ]; then
- _subarch=$(grep -w "Model:" | sed 's/Model:[[:space:]]+//')
+ _subarch=$(grep -w "Model:" /proc/hardware \
+ | sed 's/Model:[[:space:]]+//')
case "$_subarch" in
Amiga*)
_default_port="/dev/amigamouse"
@@ -609,7 +610,8 @@
powerpc)
# A good default for PowerPC depends on which subarchitecure this is.
if [ -r /proc/cpuinfo ]; then
- _subarch=$(grep "^machine" | sed 's/machine[[:space:]]+:[[:space:]]+//')
+ _subarch=$(grep "^machine" /proc/cpuinfo \
+ | sed 's/machine[[:space:]]+:[[:space:]]+//')
case "$_subarch" in
PowerMac*)
# Old World Macs use ADB mice, and New World Macs use USB mice.
Reply to: