diff options
| -rw-r--r-- | ChangeLog | 51 | ||||
| -rwxr-xr-x | Configure | 59 | ||||
| -rwxr-xr-x | bin/manilist.SH | 6 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/control | 7 | ||||
| -rw-r--r-- | debian/copyright | 4 | ||||
| -rw-r--r-- | dist.man | 6 |
7 files changed, 66 insertions, 70 deletions
@@ -79,7 +79,7 @@ Fri Feb 28 17:48:41 MET 1997 Raphael Manfredi <Raphael_Manfredi@grenoble.hp.co * bin/packinit.SH: Fixed one wrong ':' comment in .package. - * jmake/files/Jmake.rules: Now handles USRINC for dependencies. + * jmake/files/Jmake.rules: Now handles USRINC for dependencies. Smarter about dependencies computation. * jmake/files/Jmake.tmpl: Lex path can now be configured. @@ -109,13 +109,13 @@ Fri Feb 28 17:48:41 MET 1997 Raphael Manfredi <Raphael_Manfredi@grenoble.hp.co * mcon/U/Instruct.U: Logname / whoami sequence rewritten to use case. - * mcon/U/Loc.U: Allow users to specify paths on the command line. + * mcon/U/Loc.U: Allow users to specify paths on the command line. Will now substitute cp for ln if not supported. - * mcon/U/Myread.U: Myread script now starts with a "startsh". + * mcon/U/Myread.U: Myread script now starts with a "startsh". Miscellaneous fixes. - * mcon/U/Oldconfig.U: Added support for src.U. New OSNAME define. + * mcon/U/Oldconfig.U: Added support for src.U. New OSNAME define. Can now sense new OSes. * mcon/U/Options.U: Optdef.sh now starts with a "startsh". Moved @@ -154,7 +154,7 @@ Fri Feb 28 17:48:41 MET 1997 Raphael Manfredi <Raphael_Manfredi@grenoble.hp.co * mcon/U/d_csh.U: Added full_csh to preserve the full path even when portable. - * mcon/U/d_dosuid.U: Moved unit to TOP via a ?Y: layout directive. + * mcon/U/d_dosuid.U: Moved unit to TOP via a ?Y: layout directive. Tell them /dev/fd is not about floppy disks. * mcon/U/d_gconvert.U: Integrated new unit from perl5. @@ -170,7 +170,7 @@ Fri Feb 28 17:48:41 MET 1997 Raphael Manfredi <Raphael_Manfredi@grenoble.hp.co * mcon/U/d_newsadm.U: Added Guess dependency. - * mcon/U/d_pidcheck.U: Replaced .o with $_o all over the place. + * mcon/U/d_pidcheck.U: Replaced .o with $_o all over the place. Added ?F: metalint hint. * mcon/U/d_poll.U: Mention that <poll.h> can be included if HAS_POLL @@ -182,7 +182,7 @@ Fri Feb 28 17:48:41 MET 1997 Raphael Manfredi <Raphael_Manfredi@grenoble.hp.co * mcon/U/d_setpgid.U: Reworded symbol comments. * mcon/U/d_setpgrp.U: Obsoleted USE_BSDGRP in favor of - USE_BSD_SETPGRP. Another unit now also defines a USE_BSD_GETPGRP. + USE_BSD_SETPGRP. Another unit now also defines a USE_BSD_GETPGRP. Fallback for test program failure improved. * mcon/U/d_sgndchr.U, mcon/U/d_wifstat.U: Added a ?F: metalint hint. @@ -198,21 +198,21 @@ Fri Feb 28 17:48:41 MET 1997 Raphael Manfredi <Raphael_Manfredi@grenoble.hp.co * mcon/U/i_varhdr.U: Varargs script now starts with leading "startsh". - * mcon/U/intsize.U: Avoid prompting the user if the test runs ok. + * mcon/U/intsize.U: Avoid prompting the user if the test runs ok. Moved code from longsize.U into there. New tests for shortsize as well. * mcon/U/libc.U: Replaced .a with $_a all over the place. Added support for HPUX-10 nm output. - * mcon/U/libnlist.U: Added usrinc and mips on the dependency line. + * mcon/U/libnlist.U: Added usrinc and mips on the dependency line. Make sure we call ./mips. Added a ?LINT: hint. * mcon/U/libpth.U: New loclibpth variable. * mcon/U/longsize.U: Code moved to intsize.U. - * mcon/U/mallocsrc.U: Added support for Free_t, the type of free(). + * mcon/U/mallocsrc.U: Added support for Free_t, the type of free(). Replaced .o with $_o all over the place. * mcon/U/manfmt.U, mcon/U/mansrc.U: Don't ask for AFS when they @@ -227,7 +227,7 @@ Fri Feb 28 17:48:41 MET 1997 Raphael Manfredi <Raphael_Manfredi@grenoble.hp.co * mcon/U/nis.U: Ensure suitable defaults for hostcat and friends. - * mcon/U/orderlib.U: Replaced .a with $_a all over the place. + * mcon/U/orderlib.U: Replaced .a with $_a all over the place. Likewise for .o replaced by $_o. Now uses the ar located by Loc.U. * mcon/U/randbits.U: Added <unistd.h> and <stdlib.h> to the C program @@ -262,13 +262,13 @@ Fri Feb 28 17:48:41 MET 1997 Raphael Manfredi <Raphael_Manfredi@grenoble.hp.co * mcon/U/voidflags.U: Don't prompt them if the void support is high enough for us. - * mcon/configure: Added the srcdir support now that we have src.U. + * mcon/configure: Added the srcdir support now that we have src.U. Random cleanup for nicer help message. * mcon/man/mconfig.SH: Documents the running environment and the src.U unit. Added warnings for $_a and $_o, as well as "startsh". - * mcon/man/mlint.SH: New "create" and "empty" lint directives. + * mcon/man/mlint.SH: New "create" and "empty" lint directives. Documented new messages. * mcon/mxref.SH, mcon/man/mxref.SH: New -L option to match metaconfig @@ -341,7 +341,7 @@ Mon Sep 25 10:33:26 MET 1995 Raphael Manfredi <ram@hptnos02.grenoble.hp.com> * mcon/U/Config_h.U: Commented the purpose of the #un-def directive. - * mcon/U/Loc.U: Commented the purpose of the #un-def directive. + * mcon/U/Loc.U: Commented the purpose of the #un-def directive. Abort Configure run when mandatory command is missing. * mcon/U/Options.U: Protected option parsing code against 'echo -*' @@ -492,7 +492,7 @@ Tue Jul 25 16:41:40 METDST 1995 Raphael Manfredi <ram@hptnos02.grenoble.hp.com * mcon/U/libs.U, mcon/U/Loc.U, mcon/U/Guess.U, mcon/U/Oldconfig.U, mcon/U/libc.U: Now knows about OS/2 platforms. - * mcon/U/Head.U: Added SVR4-ish /opt directories to path list (ADO). + * mcon/U/Head.U: Added SVR4-ish /opt directories to path list (ADO). OS/2 platforms are using another path separator. * mcon/U/Typedef.U: Added backslash escapes within evals to prevent @@ -668,7 +668,7 @@ Fri May 12 14:39:16 METDST 1995 Raphael Manfredi <ram@hptnos02.grenoble.hp.com by checking both header and lib (ADO). * mcon/U/libc.U: Made sure only most recent version of shared lib is - picked. Final "nm -p" check now uses xscan and xrun like everybody. + picked. Final "nm -p" check now uses xscan and xrun like everybody. Can now grok linux nm output with lead __IO (ADO). Added support for linux ELF output, using 'W' for alias (ADO). @@ -693,7 +693,7 @@ Tue Mar 21 09:55:57 MET 1995 Raphael Manfredi <ram@hptnos02.grenoble.hp.com> Jmake was not working at all on HP-UX due to the way their cpp systematically removes trailing backslashes in text. The new fixcpp script is now a wrapper over cpp to first escape those - backslashes that should be preserved accross cpp before feeding + backslashes that should be preserved across cpp before feeding it with the text of the Jmakefile... Suppressed extra argument to NormalProgramTarget call in jmake rules. @@ -722,7 +722,7 @@ Tue Mar 21 09:55:57 MET 1995 Raphael Manfredi <ram@hptnos02.grenoble.hp.com> * jmake/fixcpp.SH, mcon/U/d_wifstat.U: Created. * jmake/jmake.SH: Now invokes cpp through new fixcpp script. First - pass now skips cpp comments alltogether. + pass now skips cpp comments altogether. * mcon/U/Head.U: Definition of paths wrongly added spurious ':' chars. @@ -990,7 +990,7 @@ Wed Jan 11 17:03:22 MET 1995 Raphael Manfredi <ram@acri.fr> * mcon/U/Config_sh.U: Moved path stripping from d_portable.U to end of Configure. - * mcon/U/Cppsym.U: New cc vs. cpp symbol checking suggested by JHI. + * mcon/U/Cppsym.U: New cc vs. cpp symbol checking suggested by JHI. Added more cpp symbols (JHI). * mcon/U/Getfile.U: Added support for escaping answers to skip @@ -1088,7 +1088,7 @@ Mon Oct 31 10:57:05 MET 1994 Raphael Manfredi <ram@acri.fr> Also, the leading comment in Chk_MANI.U now explains how this unit gets included into the Configure script. There used to be - an explaination there, but it was no longer accurate. + an explanation there, but it was no longer accurate. One new unit file (Begin.U). @@ -1312,7 +1312,7 @@ Sat Oct 29 18:16:03 MET 1994 Raphael Manfredi <ram@acri.fr> * mcon/U/Loc.U: Added ?F: line for metalint file checking. Be careful and guard against wildcard searching (ADO). - * mcon/U/Oldconfig.U: Added ?F: line for metalint file checking. + * mcon/U/Oldconfig.U: Added ?F: line for metalint file checking. Merged with the version used for perl5's Configure (ADO). * mcon/U/Options.U: Ensure option definition file is removed before @@ -1335,7 +1335,7 @@ Sat Oct 29 18:16:03 MET 1994 Raphael Manfredi <ram@acri.fr> mcon/U/d_dlerror.U, mcon/U/d_sysconf.U, mcon/U/i_dld.U, mcon/U/modetype.U: Created by ADO. - * mcon/U/cc.U: Detect gcc even when not called as 'gcc' (ADO). + * mcon/U/cc.U: Detect gcc even when not called as 'gcc' (ADO). Simplified gcc version checking (ADO). Added ?F: line for metalint file checking. @@ -1418,7 +1418,7 @@ Sat Oct 29 18:16:03 MET 1994 Raphael Manfredi <ram@acri.fr> * mcon/U/so.U: Now tells user how he can suppress shared lib lookup (ADO). Removed echo at the top, since it's now in the here-doc (ADO). - * mcon/U/ssizetype.U: Added ?F: line for metalint file checking. + * mcon/U/ssizetype.U: Added ?F: line for metalint file checking. Added 'ldflags' to the test compile line (ADO). * mcon/man/mconfig.SH: Added nroff protection for lines beginning @@ -1444,14 +1444,13 @@ Sat Oct 29 18:16:03 MET 1994 Raphael Manfredi <ram@acri.fr> * pat/pat.SH: Now unlinks all the files created by patlog in bugs. - * pat/pat.man: Documents new patlog script and the files it uses. + * pat/pat.man: Documents new patlog script and the files it uses. The RCS layer section has been extended slightly. * pat/patcil.SH: Now honors the VISUAL and EDITOR environment - variables. Newer RCS programs chop trailing spaces in log messages. + variables. Newer RCS programs chop trailing spaces in log messages. Separated V/E and v/e commands. New 'v' command to edit the file being patcil'ed. Added hook for 'V' command (not implemented yet). * pat/patmake.SH: A lot of setup is now performed by patlog. Added various escapes in strings for perl5 support. - @@ -449,10 +449,10 @@ esac case "$sh" in '') cat >&2 <<EOM -$me: Fatal Error: I can't find a Bourne Shell anywhere. +$me: Fatal Error: I can't find a Bourne Shell anywhere. Usually it's in /bin/sh. How did you even get this far? -Please contact me (Raphael Manfredi) at Raphael_Manfredi@pobox.com and +Please contact me (Raphael Manfredi) at Raphael_Manfredi@pobox.com and we'll try to straighten this all out. EOM exit 1 @@ -683,7 +683,7 @@ while test $# -gt 0; do case "$zzz" in *:*) zzz='' ;; *) xxx=append - zzz=" "`echo "$yyy"|sed 's!^[^=]*=!!'` + zzz=" "`echo "$yyy"|sed 's!^[^=]*=!!'` yyy=`echo "$yyy"|sed 's!=.*!!'` ;; esac ;; @@ -697,7 +697,7 @@ while test $# -gt 0; do *) xxx=`echo "$yyy"|sed 's!:.*!!'` yyy=`echo "$yyy"|sed 's!^[^:]*:!!'` ;; esac - ;; + ;; esac case "$xxx" in append) @@ -1214,7 +1214,7 @@ if $contains "^$user\$" ../.config/instruct >/dev/null 2>&1; then fi if $needman; then cat <<EOH - + This installation shell script will examine your system and ask you questions to determine how the dist package should be installed. If you get stuck on a question, you may use a ! shell escape to start a subshell or @@ -1238,7 +1238,7 @@ in the default answer, as if the default line was a set of arguments given to a script shell. This means you may also use $* to repeat the whole default line, so you do not have to re-type everything to add something to the default. -Everytime there is a substitution, you will have to confirm. If there is an +Every time there is a substitution, you will have to confirm. If there is an error (e.g. an unmatched backtick), the default answer will remain unchanged and you will be prompted again. @@ -1462,7 +1462,7 @@ ln$_exe|ln) ;; esac case "$make" in -make$_exe|make) +make$_exe|make) case "$gmake" in gmake) echo "I can't find make or gmake, and my life depends on it." >&4 @@ -1471,7 +1471,7 @@ make$_exe|make) ;; esac ;; -esac +esac case "$gmake" in gmake$_exe|gmake) ;; *) @@ -1570,12 +1570,12 @@ EOM echo "Cannot find myread, sorry. Aborting." >&2 exit 1 fi - fi + fi case "$ans" in [yY]*) cc=gcc; ccname=gcc; ccflags=''; despair=no; $cat *.cbu >checktmp 2>/dev/null if $contains ccflags checktmp >/dev/null; then - ./warn 4>&4 <<EOM + ./warn 4>&4 <<EOM Any previous setting of the C compiler flags has been lost. It may be necessary to pass -Dcc=gcc to Configure right away. EOM @@ -1594,9 +1594,9 @@ cat <<EOS >checkcc $startsh EOS cat <<'EOSC' >>checkcc -case "$cc" in +case "$cc" in '') ;; -*) $rm -f try try.* +*) $rm -f try try.* $cat >try.c <<EOM int main(int argc, char *argv[]) { (void) argc; @@ -1610,7 +1610,7 @@ EOM if $test X"$despair" = Xyes; then echo "Uh-oh, the C compiler '$cc' doesn't seem to be working." >&4 fi - $cat >&4 <<EOM + $cat >&4 <<EOM You need to find a working C compiler. Either (purchase and) install the C compiler supplied by your OS vendor, or for a free C compiler try http://gcc.gnu.org/ @@ -1674,7 +1674,7 @@ case "$lns" in ;; *) issymlink='' ;; esac - fi + fi fi if $test "X$issymlink" = X; then if $test -L sym 2>/dev/null; then @@ -1956,16 +1956,16 @@ if $test "X$has_uname" != X; then domainos) osname=apollo osvers="$3" ;; - dgux) osname=dgux + dgux) osname=dgux osvers="$3" ;; dynixptx*) osname=dynixptx osvers=`echo "$4"|sed 's/^v//'` ;; - freebsd) osname=freebsd + freebsd) osname=freebsd osvers="$3" ;; genix) osname=genix ;; - hp*) osname=hpux + hp*) osname=hpux osvers=`echo "$3" | $sed 's,.*\.\([0-9]*\.[0-9]*\),\1,'` ;; irix*) osname=irix @@ -2058,7 +2058,7 @@ if $test "X$has_uname" != X; then *freebsd*) ;; svr*) : svr4.x or possibly later - case "svr$3" in + case "svr$3" in ${osname}*) osname=svr$3 osvers=$4 @@ -2306,7 +2306,7 @@ fi : determine where manual pages are on this system echo " " case "$sysman" in -'') +'') syspath='/usr/share/man/man1 /usr/man/man1' syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1" syspath="$syspath /usr/man/u_man/man1 /usr/share/man/man1" @@ -2328,9 +2328,9 @@ case "$d_portable" in *) dflt=n;; esac $cat <<'EOH' - + I can set things up so that your shell scripts and binaries are more portable, -at what may be a noticable cost in performance. In particular, if you +at what may be a noticeable cost in performance. In particular, if you ask to be portable, the following happens: 1) Shell scripts will rely on the PATH variable rather than using @@ -2537,7 +2537,7 @@ while test "$type"; do for fp in $gfpth; do if test "X$fp" = X.; then pf="$ansexp" - else + else pf="$fp/$ansexp" fi if test -f "$pf"; then @@ -2558,7 +2558,7 @@ while test "$type"; do if test "X$fp" = X.; then dir="$ans" direxp="$ansexp" - else + else dir="$fp/$ansexp" direxp="$fp/$ansexp" fi @@ -2830,12 +2830,12 @@ case "$scriptdir" in ;; esac $cat <<EOM - + Some installations have a separate directory just for executable scripts so that they can mount it across multiple architectures but keep the scripts in one spot. You might, for example, have a subdirectory of /usr/share for this. Or you might just lump your scripts in with all your other executables. - + EOM fn=d~ rp='Where do you keep publicly executable scripts?' @@ -3383,7 +3383,7 @@ else fi $rm -f foo.c foo.cpp -: Check whether they have gcc in any guise. +: Check whether they have gcc in any guise. echo " " echo "Checking for GNU cc in disguise and/or its version number..." >&4 $cat >try.c <<EOM @@ -3406,7 +3406,7 @@ then case "$gccversion" in '') echo "You are not using GNU cc." ;; *) echo "You are using GNU cc $gccversion." - ccname=gcc + ccname=gcc ;; esac else @@ -3855,7 +3855,7 @@ esac for thislibdir in $libpth; do case " $loclibpth " in *" $thislibdir "*) - case "$dflt " in + case "$dflt " in *"-L$thislibdir "*) ;; *) dflt="$dflt -L$thislibdir" ;; esac @@ -4207,7 +4207,7 @@ case "$orgname" in *) dflt="$orgname";; esac $cat << 'EOH' - + Please type the name of your organization as you want it to appear on the Organization line of outgoing articles. (It's nice if this also specifies your location. Your city name is probably sufficient if well known.) @@ -4736,4 +4736,3 @@ $rm -f kit*isdone ark*isdone $rm -rf UU : End of Configure - diff --git a/bin/manilist.SH b/bin/manilist.SH index 42972ef..3e1adee 100755 --- a/bin/manilist.SH +++ b/bin/manilist.SH @@ -23,7 +23,7 @@ $startperl # $Id: manilist.SH 31 2010-03-06 20:15:24Z rmanfredi $ # # Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi -# +# # You may redistribute only under the terms of the Artistic Licence, # as specified in the README file that comes with the distribution. # You may reuse parts of this distribution only within the terms of @@ -79,7 +79,7 @@ $spitshell >>manilist <<'!NO!SUBS!' $format = 'A:%c %n'; -# By default, only the source files whith the following extensions are reported +# By default, only the source files with the following extensions are reported # (but a -a option will report ALL the files, and a -i option can specify some # other extensions as well). # .sh .SH .c .h .l .y .man @@ -293,7 +293,7 @@ sub report { local($fmt) = $format; local($postproc) = 0; # Do we need formatting post-processing ? $fmt =~ s/^\w+://; - $fmt =~ s/\|/\02/g && ($postproc = 1); # Formatted colum separator + $fmt =~ s/\|/\02/g && ($postproc = 1); # Formatted column separator # If neither 'd' nor 'f' is specified, then all the files are candidate # for report. Specifying 'df' is the same, but is less efficient. diff --git a/debian/changelog b/debian/changelog index af024fa..a2d300b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,7 @@ dist (1:3.5-36.0001-3) unstable; urgency=medium [ Helmut Grohne ] * Mark dist Multi-Arch: foreign. - - [ Manoj Srivastava ] + [ Manoj Srivastava ] * Update the copyright file * Incorporated Helmut's chqange, which, unless I missed it, newver made it out. diff --git a/debian/control b/debian/control index 9acc616..592e5c8 100644 --- a/debian/control +++ b/debian/control @@ -1,19 +1,18 @@ Source: dist VCS-Git: https://anonscm.debian.org/git/users/srivasta/debian/dist.git -VCS-Browser: http://anonscm.debian.org/gitweb/?p=users/srivasta/debian/dist.git +VCS-Browser: http://anonscm.debian.org/git/users/srivasta/debian/dist.git Section: devel Priority: optional Maintainer: Manoj Srivastava <srivasta@debian.org> Standards-Version: 4.1.3 Build-Depends-Indep: debhelper (>= 11), sharutils, po-debconf, - gettext, dpkg-dev (>= 1.16.0), - libperl4-corelibs-perl | perl (<< 5.12.3-7) + gettext, dpkg-dev Package: dist Architecture: all Multi-Arch: foreign Depends: perl, debconf (>= 1.2.0) | debconf-2.0, - ${misc:Depends}, libperl4-corelibs-perl | perl (<< 5.12.3-7) + ${misc:Depends} Description: Tools for developing, maintaining and distributing software The dist package is a set of tools meant to ease the construction and maintenance of portable software. diff --git a/debian/copyright b/debian/copyright index 8500bf1..1108b31 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: dist 3.0 Upstream-Contact: Raphael Manfredi <Raphael_Manfredi@grenoble.hp.com> Sources: https://svn.code.sf.net/p/dist/code/trunk/dist @@ -91,7 +91,7 @@ License: GPL-2+ GNU General Public License for more details. . You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. . On Debian systems, the complete text of the GNU General Public License can be found in "/usr/share/common-licenses/GPL-2". @@ -1,7 +1,7 @@ .\" $Id: dist.man 3 2006-08-25 21:39:07Z rmanfredi $ .\" .\" Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi -.\" +.\" .\" You may redistribute only under the terms of the Artistic Licence, .\" as specified in the README file that comes with the distribution. .\" You may reuse parts of this distribution only within the terms of @@ -31,7 +31,7 @@ .\" Revision 3.0 1993/08/18 12:04:07 ram .\" Baseline for dist 3.0 netwide release. .\" -.\" +.\" .de Ex \" Start of Example .sp .in +5 @@ -183,7 +183,7 @@ format: .Ex profile-component: \fIvalue\fR .Ef -whith shell-style comments (#) allowed provided they start the line. +with shell-style comments (#) allowed provided they start the line. .PP Each command looks for a profile component entry matching its name and loads the \fIvalue\fR as if it were arguments specified |