diff -u sgrep-1.94a/config.sub sgrep-1.94a/config.sub --- sgrep-1.94a/config.sub +++ sgrep-1.94a/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2007-06-28' +timestamp='2008-01-16' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -72,8 +72,8 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -369,10 +369,14 @@ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-*) ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -443,6 +447,14 @@ basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; c90) basic_machine=c90-cray os=-unicos @@ -668,6 +680,14 @@ basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -813,6 +833,14 @@ basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; @@ -1021,6 +1049,10 @@ basic_machine=tic6x-unknown os=-coff ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown ;; diff -u sgrep-1.94a/debian/changelog sgrep-1.94a/debian/changelog --- sgrep-1.94a/debian/changelog +++ sgrep-1.94a/debian/changelog @@ -1,3 +1,10 @@ +sgrep (1.94a-4) unstable; urgency=low + + * Fixed typos in man page (Closes: #496168) + * added missing options to man page (Closes: #193722) + + -- Uwe Steinmann Thu, 19 Mar 2009 08:50:30 +0100 + sgrep (1.94a-3) unstable; urgency=low * Read sgreprc from /etc instead of /usr/share where it has diff -u sgrep-1.94a/config.guess sgrep-1.94a/config.guess --- sgrep-1.94a/config.guess +++ sgrep-1.94a/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2007-07-22' +timestamp='2008-01-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -56,8 +56,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -532,7 +532,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[45]) + *:AIX:*:[456]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -799,6 +799,9 @@ EM64T | authenticamd) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks @@ -833,7 +836,14 @@ echo ${UNAME_MACHINE}-pc-minix exit ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + fi exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -954,8 +964,8 @@ x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; - xtensa:Linux:*:*) - echo xtensa-unknown-linux-gnu + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so @@ -1474,9 +1484,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD and - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please send the following data and any information you think might be only in patch2: unchanged: --- sgrep-1.94a.orig/sgrep.1 +++ sgrep-1.94a/sgrep.1 @@ -36,23 +36,41 @@ .Pp \fIsgrep \fP -[\fB-aCcDdhilNnPqSsTtV\fP] +[\fB-aCcDdhiIlNnPqSsTtV\fP] +[\fB-g\fP \fIoption\fP] [\fB-O\fP \fIfilename\fP] [\fB-o\fP "\fIformat\fP"] [\fB-p\fP \fIpreprocessor\fP] +[\fB-w\fP \fIchar list\fP] +[\fB-x\fP \fIfilename\fP] [\fB-e\fP] \fIexpression\fP [\fIfilename \fP ...] .Pp \fIsgrep\fP -[\fB-aCcDdhilNnPqSsTtV\fP] +[\fB-aCcDdhiIlNnPqSsTtV\fP] +[\fB-g\fP \fIoption\fP] [\fB-O\fP \fIfilename\fP] [\fB-o\fP "\fIformat\fP"] -[ \fB-p\fP \fIpreprocessor\fP] +[\fB-p\fP \fIpreprocessor\fP] +[\fB-w\fP \fIchar list\fP] +[\fB-x\fP \fIfilename\fP] \fB-f\fP \fIfilename\fP [\fB-e \fP \fIexpression\fP] [\fIfilename\fP ...] .Pp +\fIsgrep\fP +[\fB-aCcDdhiIlNnPqSsTtV\fP] +[\fB-g\fP \fIoption\fP] +[\fB-O\fP \fIfilename\fP] +[\fB-o\fP "\fIformat\fP"] +[\fB-p\fP \fIpreprocessor\fP] +[\fB-w\fP \fIchar list\fP] +[\fB-x\fP \fIfilename\fP] +\fB-f\fP \fIfilename\fP +\fB-F\fP \fIfilename\fP +[\fB-e \fP \fIexpression\fP] +.Pp \fIsgrep \fP \fB-h\fP .SH DESCRIPTION @@ -123,7 +141,7 @@ .IP "\fB-a\fP" .nr bi 1 .Pp -Act as a filter: display the maching regions, +Act as a filter: display the matching regions, possibly formatted according to the output format, interleaved with the rest of the text. (See the description of option -o below.) @@ -158,6 +176,39 @@ Read the region expression from the named file. Filename \fB- \fP refers to stdin. +.IP "\fB-F\fP \fIfilename\fP" +.nr bi 1 +.Pp +Read list of input files from \fIfilename\fP instead of command line +.IP "\fB-g\fP \fIoption\fP" +.nr bi 1 +.Pp +Set scanner option. \fIoption\fP can be any of: +.nr ll +1 +.nr t\n(ll 2 +.if \n(ll>1 .RS +.IP "\fBsgml\fP" +.nr bi 1 +.Pp +use SGML scanner +.IP "\fBhtml\fP" +.nr bi 1 +.Pp +use HTML scanner (currently same as SGML scanner) +.IP "\fBxml\fP" +.nr bi 1 +.Pp +use XML scanner +.IP "\fBsgml-debug\fP" +.nr bi 1 +.Pp +show recognized SGML tokens +.IP "\fBinclude-entities\fP" +.nr bi 1 +.Pp +automatically include system entities +.if \n(ll>1 .RE +.nr ll -1 .IP "\fB-h\fP" .nr bi 1 .Pp @@ -166,6 +217,10 @@ .nr bi 1 .Pp Ignore case distinctions in phrases. +.IP "\fB-I\fP" +.nr bi 1 +.Pp +Switches to indexing mode, when given as first option .IP "\fB-l\fP" .nr bi 1 .Pp @@ -293,6 +348,18 @@ .nr bi 1 .Pp Display version information. +.IP "\fB-v\fP" +.nr bi 1 +.Pp +Verbose mode. Shows what is going on. +.IP "\fB-w\fP \fIchar list\fP" +.nr bi 1 +.Pp +Set the list of characters used to recognize words. +.IP "\fB-x\fP \fIfilename\fP" +.nr bi 1 +.Pp +Use given index file instead of scanner. Implies -S. .IP "\fB--\fP" .nr bi 1 .Pp @@ -721,11 +788,11 @@ .nr bi 1 .Pp For each possible left-quote region \fBx\fP, the earliest region in -\fBv(basic_expr)\fP preceeded by \fBx\fP is its right-quote region. +\fBv(basic_expr)\fP preceded by \fBx\fP is its right-quote region. .nr bi 1 .Pp For each right-quote region \fBy\fP in \fBv(basic_expr)\fP, the -earliest region in \fBv(region_expr)\fP preceeded by \fBy\fP is a +earliest region in \fBv(region_expr)\fP preceded by \fBy\fP is a possible left-quote region. .if \n(ll>1 .RE .nr ll -1