Bug#42918: dpkg: Patch to fix compile problem with gcc-2.95 plus ARM port fix
Package: dpkg
Version: 1.4.1.6
Severity: normal
Hi,
Here's a patch we need for the ARM port. It fixes the dselect
compilation problem with gcc 2.95, and updates the config.{sub,guess}
files.
There isn't anything fancy in here. I'll wait a week, and if it isn't
incorporated, I'll do an NMU because we need dpkg for the ARM port.
Cheers,
- Jim
diff -urN ../previous/dpkg-1.4.1.6/config.guess dpkg-1.4.1.7/config.guess
--- ../previous/dpkg-1.4.1.6/config.guess Tue Jul 6 16:00:45 1999
+++ dpkg-1.4.1.7/config.guess Thu Aug 12 17:59:55 1999
@@ -1,7 +1,6 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
-# Free Software Foundation, Inc.
+# Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
#
# 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
@@ -24,7 +23,6 @@
# Written by Per Bothner <bothner@cygnus.com>.
# The master version of this file is at the FSF in /home/gd/gnu/lib.
-# Please send patches to the Autoconf mailing list <autoconf@gnu.org>.
#
# This script attempts to guess a canonical system name similar to
# config.sub. If it succeeds, it prints the system name on stdout, and
@@ -37,20 +35,6 @@
# (but try to keep the structure clean).
#
-# Use $HOST_CC if defined. $CC may point to a cross-compiler
-if test x"$CC_FOR_BUILD" = x; then
- if test x"$HOST_CC" != x; then
- CC_FOR_BUILD="$HOST_CC"
- else
- if test x"$CC" != x; then
- CC_FOR_BUILD="$CC"
- else
- CC_FOR_BUILD=cc
- fi
- fi
-fi
-
-
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (ghazi@noc.rutgers.edu 8/24/94.)
if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
@@ -93,7 +77,7 @@
ret \$31,(\$26),1
.end main
EOF
- $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+ ${CC-cc} $dummy.s -o $dummy 2>/dev/null
if test "$?" = 0 ; then
./$dummy
case "$?" in
@@ -115,13 +99,7 @@
esac
fi
rm -f $dummy.s $dummy
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit 0 ;;
- Alpha\ *:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # Should we change UNAME_MACHINE based on the output of uname instead
- # of the specific Alpha model?
- echo alpha-pc-interix
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
exit 0 ;;
21064:Windows_NT:50:3)
echo alpha-dec-winnt3.5
@@ -165,7 +143,7 @@
SR2?01:HI-UX/MPP:*:*)
echo hppa1.1-hitachi-hiuxmpp
exit 0;;
- Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+ Pyramid*:OSx*:*:*|MIS*:OSx*:*:*|MIS*:SMP_DC-OSx*:*:*)
# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
if test "`(/bin/universe) 2>/dev/null`" = att ; then
echo pyramid-pyramid-sysv3
@@ -173,7 +151,7 @@
echo pyramid-pyramid-bsd
fi
exit 0 ;;
- NILE*:*:*:dcosx)
+ NILE:*:*:dcosx)
echo pyramid-pyramid-svr4
exit 0 ;;
sun4H:SunOS:5.*:*)
@@ -224,32 +202,6 @@
atari*:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
- # The situation for MiNT is a little confusing. The machine name
- # can be virtually everything (everything which is not
- # "atarist" or "atariste" at least should have a processor
- # > m68000). The system name ranges from "MiNT" over "FreeMiNT"
- # to the lowercase version "mint" (or "freemint"). Finally
- # the system name "TOS" denotes a system which is actually not
- # MiNT. But MiNT is downward compatible to TOS, so this should
- # be no problem.
- atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
- atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
- *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
- milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE}
- exit 0 ;;
- hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
- exit 0 ;;
- *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
- exit 0 ;;
sun3*:NetBSD:*:*)
echo m68k-sun-netbsd${UNAME_RELEASE}
exit 0 ;;
@@ -283,16 +235,12 @@
VAX*:ULTRIX*:*:*)
echo vax-dec-ultrix${UNAME_RELEASE}
exit 0 ;;
- 2020:CLIX:*:* | 2430:CLIX:*:*)
+ 2020:CLIX:*:*)
echo clipper-intergraph-clix${UNAME_RELEASE}
exit 0 ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
sed 's/^ //' << EOF >$dummy.c
-#ifdef __cplusplus
- int main (int argc, char *argv[]) {
-#else
- int main (argc, argv) int argc; char *argv[]; {
-#endif
+ int main (argc, argv) int argc; char **argv; {
#if defined (host_mips) && defined (MIPSEB)
#if defined (SYSTYPE_SYSV)
printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
@@ -307,7 +255,7 @@
exit (-1);
}
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy \
+ ${CC-cc} $dummy.c -o $dummy \
&& ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
&& rm $dummy.c $dummy && exit 0
rm -f $dummy.c $dummy
@@ -373,7 +321,7 @@
exit(0);
}
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+ ${CC-cc} $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
rm -f $dummy.c $dummy
echo rs6000-ibm-aix3.2.5
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
@@ -421,25 +369,25 @@
case "${UNAME_MACHINE}" in
9000/31? ) HP_ARCH=m68000 ;;
9000/[34]?? ) HP_ARCH=m68k ;;
- 9000/[678][0-9][0-9])
+ 9000/6?? | 9000/7?? | 9000/80[24] | 9000/8?[13679] | 9000/892 )
sed 's/^ //' << EOF >$dummy.c
#include <stdlib.h>
#include <unistd.h>
-
+
int main ()
{
#if defined(_SC_KERNEL_BITS)
long bits = sysconf(_SC_KERNEL_BITS);
- #endif
+ #endif
long cpu = sysconf (_SC_CPU_VERSION);
-
- switch (cpu)
+
+ switch (cpu)
{
case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
- case CPU_PA_RISC2_0:
+ case CPU_PA_RISC2_0:
#if defined(_SC_KERNEL_BITS)
- switch (bits)
+ switch (bits)
{
case 64: puts ("hppa2.0w"); break;
case 32: puts ("hppa2.0n"); break;
@@ -447,13 +395,13 @@
} break;
#else /* !defined(_SC_KERNEL_BITS) */
puts ("hppa2.0"); break;
- #endif
+ #endif
default: puts ("hppa1.0"); break;
}
exit (0);
}
EOF
- ($CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+ (${CC-cc} $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
rm -f $dummy.c $dummy
esac
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
@@ -485,7 +433,7 @@
exit (0);
}
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+ ${CC-cc} $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
rm -f $dummy.c $dummy
echo unknown-hitachi-hiuxwe2
exit 0 ;;
@@ -495,9 +443,6 @@
9000/8??:4.3bsd:*:*)
echo hppa1.0-hp-bsd
exit 0 ;;
- *9??*:MPE/iX:*:*)
- echo hppa1.0-hp-mpeix
- exit 0 ;;
hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
echo hppa1.1-hp-osf
exit 0 ;;
@@ -514,9 +459,6 @@
parisc*:Lites*:*:*)
echo hppa1.1-hp-lites
exit 0 ;;
- hppa*:OpenBSD:*:*)
- echo hppa-unknown-openbsd
- exit 0 ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd
exit 0 ;;
@@ -556,7 +498,7 @@
echo cray2-cray-unicos
exit 0 ;;
F300:UNIX_System_V:*:*)
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit 0 ;;
@@ -569,22 +511,16 @@
hp300:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
- i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
- exit 0 ;;
sparc*:BSD/OS:*:*)
echo sparc-unknown-bsdi${UNAME_RELEASE}
exit 0 ;;
+ i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
+ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+ exit 0 ;;
*:BSD/OS:*:*)
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit 0 ;;
*:FreeBSD:*:*)
- if test -x /usr/bin/objformat; then
- if test "elf" = "`/usr/bin/objformat`"; then
- echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
- exit 0
- fi
- fi
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit 0 ;;
*:NetBSD:*:*)
@@ -599,15 +535,6 @@
i*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit 0 ;;
- i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
- # UNAME_MACHINE based on the output of uname instead of i386?
- echo i386-pc-interix
- exit 0 ;;
- i*:UWIN*:*)
- echo ${UNAME_MACHINE}-pc-uwin
- exit 0 ;;
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin
exit 0 ;;
@@ -621,14 +548,12 @@
# uname on the ARM produces all sorts of strangeness, and we need to
# filter it out.
case "$UNAME_MACHINE" in
- armv*) UNAME_MACHINE=$UNAME_MACHINE ;;
arm* | sa110*) UNAME_MACHINE="arm" ;;
esac
# The BFD linker knows what the default object file format is, so
- # first see if it will tell us. cd to the root directory to prevent
- # problems with other programs or directories called `ld' in the path.
- ld_help_string=`cd /; ld --help 2>&1`
+ # first see if it will tell us.
+ ld_help_string=`ld --help 2>&1`
ld_supported_emulations=`echo $ld_help_string \
| sed -ne '/supported emulations:/!d
s/[ ][ ]*/ /g
@@ -641,36 +566,7 @@
sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
- elf32ppc)
- # Determine Lib Version
- cat >$dummy.c <<EOF
-#include <features.h>
-#if defined(__GLIBC__)
-extern char __libc_version[];
-extern char __libc_release[];
-#endif
-main(argc, argv)
- int argc;
- char *argv[];
-{
-#if defined(__GLIBC__)
- printf("%s %s\n", __libc_version, __libc_release);
-#else
- printf("unkown\n");
-#endif
- return 0;
-}
-EOF
- LIBC=""
- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
- if test "$?" = 0 ; then
- ./$dummy | grep 1\.99 > /dev/null
- if test "$?" = 0 ; then
- LIBC="libc1"
- fi
- fi
- rm -f $dummy.c $dummy
- echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;;
+ elf32ppc) echo "powerpc-unknown-linux-gnu" ; exit 0 ;;
esac
if test "${UNAME_MACHINE}" = "alpha" ; then
@@ -692,7 +588,7 @@
.end main
EOF
LIBC=""
- $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+ ${CC-cc} $dummy.s -o $dummy 2>/dev/null
if test "$?" = 0 ; then
./$dummy
case "$?" in
@@ -711,23 +607,22 @@
16)
UNAME_MACHINE="alphaev6"
;;
- esac
+ esac
objdump --private-headers $dummy | \
grep ld.so.1 > /dev/null
if test "$?" = 0 ; then
LIBC="libc1"
fi
- fi
+ fi
rm -f $dummy.s $dummy
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
elif test "${UNAME_MACHINE}" = "mips" ; then
cat >$dummy.c <<EOF
-#ifdef __cplusplus
- int main (int argc, char *argv[]) {
-#else
- int main (argc, argv) int argc; char *argv[]; {
-#endif
+main(argc, argv)
+ int argc;
+ char *argv[];
+{
#ifdef __MIPSEB__
printf ("%s-unknown-linux-gnu\n", argv[1]);
#endif
@@ -737,7 +632,7 @@
return 0;
}
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+ ${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
rm -f $dummy.c $dummy
else
# Either a pre-BFD a.out linker (linux-gnuoldld)
@@ -759,11 +654,10 @@
# Determine whether the default compiler is a.out or elf
cat >$dummy.c <<EOF
#include <features.h>
-#ifdef __cplusplus
- int main (int argc, char *argv[]) {
-#else
- int main (argc, argv) int argc; char *argv[]; {
-#endif
+main(argc, argv)
+ int argc;
+ char *argv[];
+{
#ifdef __ELF__
# ifdef __GLIBC__
# if __GLIBC__ >= 2
@@ -780,7 +674,7 @@
return 0;
}
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+ ${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
rm -f $dummy.c $dummy
fi ;;
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions
@@ -803,14 +697,6 @@
echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
fi
exit 0 ;;
- i?86:*:5:7*)
- UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
- (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
- (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) && UNAME_MACHINE=i586
- (/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686
- (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585
- echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE}
- exit 0 ;;
i?86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -820,15 +706,18 @@
(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
&& UNAME_MACHINE=i586
- (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
- && UNAME_MACHINE=i686
- (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
- && UNAME_MACHINE=i686
echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
else
echo ${UNAME_MACHINE}-pc-sysv32
fi
exit 0 ;;
+ i?86:UnixWare:*:*)
+ if /bin/uname -X 2>/dev/null >/dev/null ; then
+ (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+ && UNAME_MACHINE=i586
+ fi
+ echo ${UNAME_MACHINE}-unixware-${UNAME_RELEASE}-${UNAME_VERSION}
+ exit 0 ;;
pc:*:*:*)
# uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i386.
@@ -870,7 +759,7 @@
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
exit 0 ;;
- i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
+ i?86:LynxOS:2.*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
TSUNAMI:LynxOS:2.*:*)
@@ -882,9 +771,6 @@
SM[BE]S:UNIX_SV:*:*)
echo mips-dde-sysv${UNAME_RELEASE}
exit 0 ;;
- RM*:ReliantUNIX-*:*:*)
- echo mips-sni-sysv4
- exit 0 ;;
RM*:SINIX-*:*:*)
echo mips-sni-sysv4
exit 0 ;;
@@ -915,7 +801,7 @@
news*:NEWS-OS:*:6*)
echo mips-sony-newsos6
exit 0 ;;
- R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+ R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
echo mips-nec-sysv${UNAME_RELEASE}
else
@@ -1049,7 +935,7 @@
}
EOF
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
+${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
rm -f $dummy.c $dummy
# Apollos put the system type in the environment.
diff -urN ../previous/dpkg-1.4.1.6/config.sub dpkg-1.4.1.7/config.sub
--- ../previous/dpkg-1.4.1.6/config.sub Tue Jul 6 16:00:45 1999
+++ dpkg-1.4.1.7/config.sub Thu Aug 12 17:59:55 1999
@@ -1,6 +1,6 @@
#! /bin/sh
# Configuration validation subroutine script, version 1.1.
-# Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
# can handle that machine. It does not imply ALL GNU software can.
@@ -98,21 +98,11 @@
os=
basic_machine=$1
;;
- -sim | -cisco | -oki | -wec | -winbond)
- os=
- basic_machine=$1
- ;;
- -scout)
- ;;
- -wrs)
- os=vxworks
- basic_machine=$1
- ;;
-hiux*)
os=-hiuxwe2
;;
-sco5)
- os=-sco3.2v5
+ os=sco3.2v5
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-sco4)
@@ -131,9 +121,6 @@
os=-sco3.2v2
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
- -udk*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
-isc)
os=-isc2.2
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -164,21 +151,14 @@
# Some are omitted here because they have special meanings below.
tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
- | 580 | i960 | h8300 \
- | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
- | alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
- | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
- | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
- | mips64orion | mips64orionel | mipstx39 | mipstx39el \
- | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
- | mips64vr5000 | miprs64vr5000el \
- | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
- | thumb | d10v)
+ | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 | hppa2.0 \
+ | alpha | alphaev5 | alphaev56 | alphapca56 | we32k | ns16k | clipper \
+ | i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
+ | mips64 | mipsel | mips64el | mips64orion | mips64orionel \
+ | mipstx39 | mipstx39el \
+ | sparc | sparclet | sparclite | sparc64 | v850)
basic_machine=$basic_machine-unknown
;;
- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65)
- ;;
-
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users.
@@ -194,41 +174,24 @@
vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
| m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
| mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
- | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
- | xmp-* | ymp-* \
- | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
- | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
- | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
- | clipper-* | orion-* \
+ | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
+ | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* \
+ | alpha-* | alphaev5-* | alphaev56-* | alphapca56-* | we32k-* | cydra-* \
+ | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
| sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
- | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
- | mips64el-* | mips64orion-* | mips64orionel-* \
- | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
+ | sparc64-* | mips64-* | mipsel-* \
+ | mips64el-* | mips64orion-* | mips64orionel-* \
| mipstx39-* | mipstx39el-* \
- | f301-* | armv*-* | t3e-* \
- | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
- | thumb-* | v850-* | d30v-* | tic30-* | c30-* )
+ | f301-*)
;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
- 386bsd)
- basic_machine=i386-unknown
- os=-bsd
- ;;
3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
basic_machine=m68000-att
;;
3b*)
basic_machine=we32k-att
;;
- a29khif)
- basic_machine=a29k-amd
- os=-udi
- ;;
- adobe68k)
- basic_machine=m68010-adobe
- os=-scout
- ;;
alliant | fx80)
basic_machine=fx80-alliant
;;
@@ -258,10 +221,6 @@
basic_machine=m68k-apollo
os=-sysv
;;
- apollo68bsd)
- basic_machine=m68k-apollo
- os=-bsd
- ;;
aux)
basic_machine=m68k-apple
os=-aux
@@ -338,10 +297,6 @@
encore | umax | mmax)
basic_machine=ns32k-encore
;;
- es1800 | OSE68k | ose68k | ose | OSE)
- basic_machine=m68k-ericsson
- os=-ose
- ;;
fx2800)
basic_machine=i860-alliant
;;
@@ -360,14 +315,6 @@
basic_machine=h8300-hitachi
os=-hms
;;
- h8300xray)
- basic_machine=h8300-hitachi
- os=-xray
- ;;
- h8500hms)
- basic_machine=h8500-hitachi
- os=-hms
- ;;
harris)
basic_machine=m88k-harris
os=-sysv3
@@ -383,30 +330,13 @@
basic_machine=m68k-hp
os=-hpux
;;
- hp3k9[0-9][0-9] | hp9[0-9][0-9])
- basic_machine=hppa1.0-hp
- ;;
hp9k2[0-9][0-9] | hp9k31[0-9])
basic_machine=m68000-hp
;;
hp9k3[2-9][0-9])
basic_machine=m68k-hp
;;
- hp9k6[0-9][0-9] | hp6[0-9][0-9])
- basic_machine=hppa1.0-hp
- ;;
- hp9k7[0-79][0-9] | hp7[0-79][0-9])
- basic_machine=hppa1.1-hp
- ;;
- hp9k78[0-9] | hp78[0-9])
- # FIXME: really hppa2.0-hp
- basic_machine=hppa1.1-hp
- ;;
- hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
- # FIXME: really hppa2.0-hp
- basic_machine=hppa1.1-hp
- ;;
- hp9k8[0-9][13679] | hp8[0-9][13679])
+ hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
basic_machine=hppa1.1-hp
;;
hp9k8[0-9][0-9] | hp8[0-9][0-9])
@@ -415,14 +345,6 @@
hppa-next)
os=-nextstep3
;;
- hppaosf)
- basic_machine=hppa1.1-hp
- os=-osf
- ;;
- hppro)
- basic_machine=hppa1.1-hp
- os=-proelf
- ;;
i370-ibm* | ibm*)
basic_machine=i370-ibm
os=-mvs
@@ -444,22 +366,6 @@
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-solaris2
;;
- i386mach)
- basic_machine=i386-mach
- os=-mach
- ;;
- i386-vsta | vsta)
- basic_machine=i386-unknown
- os=-vsta
- ;;
- i386-go32 | go32)
- basic_machine=i386-unknown
- os=-go32
- ;;
- i386-mingw32 | mingw32)
- basic_machine=i386-unknown
- os=-mingw32
- ;;
iris | iris4d)
basic_machine=mips-sgi
case $os in
@@ -488,10 +394,6 @@
miniframe)
basic_machine=m68000-convergent
;;
- *mint | *MiNT)
- basic_machine=m68k-atari
- os=-mint
- ;;
mipsel*-linux*)
basic_machine=mipsel-unknown
os=-linux-gnu
@@ -506,26 +408,10 @@
mips3*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
;;
- monitor)
- basic_machine=m68k-rom68k
- os=-coff
- ;;
- msdos)
- basic_machine=i386-unknown
- os=-msdos
- ;;
ncr3000)
basic_machine=i486-ncr
os=-sysv4
;;
- netbsd386)
- basic_machine=i386-unknown
- os=-netbsd
- ;;
- netwinder)
- basic_machine=armv4l-corel
- os=-linux
- ;;
news | news700 | news800 | news900)
basic_machine=m68k-sony
os=-newsos
@@ -538,10 +424,6 @@
basic_machine=mips-sony
os=-newsos
;;
- necv70)
- basic_machine=v70-nec
- os=-sysv
- ;;
next | m*-next )
basic_machine=m68k-next
case $os in
@@ -567,25 +449,9 @@
basic_machine=i960-intel
os=-nindy
;;
- mon960)
- basic_machine=i960-intel
- os=-mon960
- ;;
np1)
basic_machine=np1-gould
;;
- op50n-* | op60c-*)
- basic_machine=hppa1.1-oki
- os=-proelf
- ;;
- OSE68000 | ose68000)
- basic_machine=m68000-ericsson
- os=-ose
- ;;
- os68k)
- basic_machine=m68k-none
- os=-os68k
- ;;
pa-hitachi)
basic_machine=hppa1.1-hitachi
os=-hiuxwe2
@@ -603,19 +469,19 @@
pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
- pentium | p5 | k5 | k6 | nexen)
+ pentium | p5 | k5 | nexen)
basic_machine=i586-pc
;;
- pentiumpro | p6 | 6x86)
+ pentiumpro | p6 | k6 | 6x86)
basic_machine=i686-pc
;;
pentiumii | pentium2)
basic_machine=i786-pc
;;
- pentium-* | p5-* | k5-* | k6-* | nexen-*)
+ pentium-* | p5-* | k5-* | nexen-*)
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
- pentiumpro-* | p6-* | 6x86-*)
+ pentiumpro-* | p6-* | k6-* | 6x86-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pentiumii-* | pentium2-*)
@@ -639,20 +505,12 @@
ps2)
basic_machine=i386-ibm
;;
- rom68k)
- basic_machine=m68k-rom68k
- os=-coff
- ;;
rm[46]00)
basic_machine=mips-siemens
;;
rtpc | rtpc-*)
basic_machine=romp-ibm
;;
- sa29200)
- basic_machine=a29k-amd
- os=-udi
- ;;
sequent)
basic_machine=i386-sequent
;;
@@ -660,10 +518,6 @@
basic_machine=sh-hitachi
os=-hms
;;
- sparclite-wrs)
- basic_machine=sparclite-wrs
- os=-vxworks
- ;;
sps7)
basic_machine=m68k-bull
os=-sysv2
@@ -671,13 +525,6 @@
spur)
basic_machine=spur-unknown
;;
- st2000)
- basic_machine=m68k-tandem
- ;;
- stratus)
- basic_machine=i860-stratus
- os=-sysv4
- ;;
sun2)
basic_machine=m68000-sun
;;
@@ -722,10 +569,6 @@
basic_machine=i386-sequent
os=-dynix
;;
- t3e)
- basic_machine=t3e-cray
- os=-unicos
- ;;
tx39)
basic_machine=mipstx39-unknown
;;
@@ -743,10 +586,6 @@
basic_machine=a29k-nyu
os=-sym1
;;
- v810 | necv810)
- basic_machine=v810-nec
- os=-none
- ;;
vaxv)
basic_machine=vax-dec
os=-sysv
@@ -770,14 +609,6 @@
basic_machine=a29k-wrs
os=-vxworks
;;
- w65*)
- basic_machine=w65-wdc
- os=-none
- ;;
- w89k-*)
- basic_machine=hppa1.1-winbond
- os=-proelf
- ;;
xmp)
basic_machine=xmp-cray
os=-unicos
@@ -785,10 +616,6 @@
xps | xps100)
basic_machine=xps100-honeywell
;;
- z8k-*-coff)
- basic_machine=z8k-unknown
- os=-sim
- ;;
none)
basic_machine=none-none
os=-none
@@ -796,15 +623,6 @@
# Here we handle the default manufacturer of certain CPU types. It is in
# some cases the only manufacturer, in others, it is the most popular.
- w89k)
- basic_machine=hppa1.1-winbond
- ;;
- op50n)
- basic_machine=hppa1.1-oki
- ;;
- op60c)
- basic_machine=hppa1.1-oki
- ;;
mips)
if [ x$os = x-linux-gnu ]; then
basic_machine=mips-unknown
@@ -827,7 +645,7 @@
we32k)
basic_machine=we32k-att
;;
- sparc | sparcv9)
+ sparc)
basic_machine=sparc-sun
;;
cydra)
@@ -839,16 +657,6 @@
orion105)
basic_machine=clipper-highlevel
;;
- mac | mpw | mac-mpw)
- basic_machine=m68k-apple
- ;;
- pmac | pmac-mpw)
- basic_machine=powerpc-apple
- ;;
- c4x*)
- basic_machine=c4x-none
- os=-coff
- ;;
*)
echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
exit 1
@@ -902,21 +710,14 @@
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)
+ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -rhapsody* \
+ | -openstep*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
- -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
- | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
- ;;
- -mac*)
- os=`echo $os | sed -e 's|mac|macos|'`
- ;;
-linux*)
os=`echo $os | sed -e 's|linux|linux-gnu|'`
;;
@@ -941,9 +742,6 @@
-acis*)
os=-aos
;;
- -386bsd)
- os=-bsd
- ;;
-ctix* | -uts*)
os=-sysv
;;
@@ -975,18 +773,9 @@
# This must come after -sysvr4.
-sysv*)
;;
- -ose*)
- os=-ose
- ;;
- -es1800*)
- os=-ose
- ;;
-xenix)
os=-xenix
;;
- -*mint | -*MiNT)
- os=-mint
- ;;
-none)
;;
*)
@@ -1012,9 +801,6 @@
*-acorn)
os=-riscix1.2
;;
- arm*-corel)
- os=-linux
- ;;
arm*-semi)
os=-aout
;;
@@ -1036,15 +822,6 @@
# default.
# os=-sunos4
;;
- m68*-cisco)
- os=-aout
- ;;
- mips*-cisco)
- os=-elf
- ;;
- mips*-*)
- os=-elf
- ;;
*-tti) # must be before sparc entry or we get the wrong os.
os=-sysv3
;;
@@ -1057,15 +834,6 @@
*-ibm)
os=-aix
;;
- *-wec)
- os=-proelf
- ;;
- *-winbond)
- os=-proelf
- ;;
- *-oki)
- os=-proelf
- ;;
*-hp)
os=-hpux
;;
@@ -1129,18 +897,6 @@
f301-fujitsu)
os=-uxpv
;;
- *-rom68k)
- os=-coff
- ;;
- *-*bug)
- os=-coff
- ;;
- *-apple)
- os=-macos
- ;;
- *-atari*)
- os=-mint
- ;;
*)
os=-none
;;
@@ -1162,15 +918,9 @@
-aix*)
vendor=ibm
;;
- -beos*)
- vendor=be
- ;;
-hpux*)
vendor=hp
;;
- -mpeix*)
- vendor=hp
- ;;
-hiux*)
vendor=hitachi
;;
@@ -1197,15 +947,6 @@
;;
-aux*)
vendor=apple
- ;;
- -hms*)
- vendor=hitachi
- ;;
- -mpw* | -macos*)
- vendor=apple
- ;;
- -*mint | -*MiNT)
- vendor=atari
;;
esac
basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
diff -urN ../previous/dpkg-1.4.1.6/debian/changelog dpkg-1.4.1.7/debian/changelog
--- ../previous/dpkg-1.4.1.6/debian/changelog Sat Jul 24 09:24:34 1999
+++ dpkg-1.4.1.7/debian/changelog Thu Aug 12 18:51:34 1999
@@ -1,3 +1,12 @@
+dpkg (1.4.1.7) unstable; urgency=low
+
+ * Non-maintainer release.
+ * Applied patch from Daniel Jacobowitz <dan@debian.org> to fix compile
+ problems with gcc 2.95.
+ * Updated config.{guess,sub} from automake (needed for ARM)
+
+ -- Jim Pick <jim@jimpick.com> Thu, 12 Aug 1999 18:51:21 -0700
+
dpkg (1.4.1.6) unstable; urgency=low
* Non-maintainer release.
diff -urN ../previous/dpkg-1.4.1.6/dselect/methkeys.cc dpkg-1.4.1.7/dselect/methkeys.cc
--- ../previous/dpkg-1.4.1.6/dselect/methkeys.cc Sun Nov 1 08:34:33 1998
+++ dpkg-1.4.1.7/dselect/methkeys.cc Thu Aug 12 18:53:15 1999
@@ -34,28 +34,28 @@
#include "bindings.h"
const keybindings::interpretation methodlist_kinterps[] = {
- { "up", methodlist::kd_up, 0, qa_noquit },
- { "down", methodlist::kd_down, 0, qa_noquit },
- { "top", methodlist::kd_top, 0, qa_noquit },
- { "bottom", methodlist::kd_bottom, 0, qa_noquit },
- { "scrollon", methodlist::kd_scrollon, 0, qa_noquit },
- { "scrollback", methodlist::kd_scrollback, 0, qa_noquit },
- { "iscrollon", methodlist::kd_iscrollon, 0, qa_noquit },
- { "iscrollback", methodlist::kd_iscrollback, 0, qa_noquit },
- { "scrollon1", methodlist::kd_scrollon1, 0, qa_noquit },
- { "scrollback1", methodlist::kd_scrollback1, 0, qa_noquit },
- { "iscrollon1", methodlist::kd_iscrollon1, 0, qa_noquit },
- { "iscrollback1", methodlist::kd_iscrollback1, 0, qa_noquit },
- { "panon", methodlist::kd_panon, 0, qa_noquit },
- { "panback", methodlist::kd_panback, 0, qa_noquit },
- { "panon1", methodlist::kd_panon1, 0, qa_noquit },
- { "panback1", methodlist::kd_panback1, 0, qa_noquit },
- { "help", methodlist::kd_help, 0, qa_noquit },
- { "search", methodlist::kd_search, 0, qa_noquit },
- { "searchagain", methodlist::kd_searchagain, 0, qa_noquit },
- { "redraw", methodlist::kd_redraw, 0, qa_noquit },
- { "select-and-quit", methodlist::kd_quit, 0, qa_quitchecksave },
- { "abort", methodlist::kd_abort, 0, qa_quitnochecksave },
+ { "up", &methodlist::kd_up, 0, qa_noquit },
+ { "down", &methodlist::kd_down, 0, qa_noquit },
+ { "top", &methodlist::kd_top, 0, qa_noquit },
+ { "bottom", &methodlist::kd_bottom, 0, qa_noquit },
+ { "scrollon", &methodlist::kd_scrollon, 0, qa_noquit },
+ { "scrollback", &methodlist::kd_scrollback, 0, qa_noquit },
+ { "iscrollon", &methodlist::kd_iscrollon, 0, qa_noquit },
+ { "iscrollback", &methodlist::kd_iscrollback, 0, qa_noquit },
+ { "scrollon1", &methodlist::kd_scrollon1, 0, qa_noquit },
+ { "scrollback1", &methodlist::kd_scrollback1, 0, qa_noquit },
+ { "iscrollon1", &methodlist::kd_iscrollon1, 0, qa_noquit },
+ { "iscrollback1", &methodlist::kd_iscrollback1, 0, qa_noquit },
+ { "panon", &methodlist::kd_panon, 0, qa_noquit },
+ { "panback", &methodlist::kd_panback, 0, qa_noquit },
+ { "panon1", &methodlist::kd_panon1, 0, qa_noquit },
+ { "panback1", &methodlist::kd_panback1, 0, qa_noquit },
+ { "help", &methodlist::kd_help, 0, qa_noquit },
+ { "search", &methodlist::kd_search, 0, qa_noquit },
+ { "searchagain", &methodlist::kd_searchagain, 0, qa_noquit },
+ { "redraw", &methodlist::kd_redraw, 0, qa_noquit },
+ { "select-and-quit", &methodlist::kd_quit, 0, qa_quitchecksave },
+ { "abort", &methodlist::kd_abort, 0, qa_quitnochecksave },
{ 0, 0, 0, qa_noquit }
};
diff -urN ../previous/dpkg-1.4.1.6/dselect/pkginfo.cc dpkg-1.4.1.7/dselect/pkginfo.cc
--- ../previous/dpkg-1.4.1.6/dselect/pkginfo.cc Sun Nov 1 08:04:51 1998
+++ dpkg-1.4.1.7/dselect/pkginfo.cc Thu Aug 12 18:53:15 1999
@@ -66,11 +66,11 @@
int packagelist::itr_recursive() { return recursive; }
const packagelist::infotype packagelist::infoinfos[]= {
- { itr_recursive, itd_relations },
- { 0, itd_description },
- { 0, itd_statuscontrol },
- { 0, itd_availablecontrol },
- { 0, 0 }
+ { &packagelist::itr_recursive, &packagelist::itd_relations },
+ { 0, &packagelist::itd_description },
+ { 0, &packagelist::itd_statuscontrol },
+ { 0, &packagelist::itd_availablecontrol },
+ { 0, 0 }
};
const packagelist::infotype *const packagelist::baseinfo= infoinfos;
diff -urN ../previous/dpkg-1.4.1.6/dselect/pkgkeys.cc dpkg-1.4.1.7/dselect/pkgkeys.cc
--- ../previous/dpkg-1.4.1.6/dselect/pkgkeys.cc Sun Nov 1 08:34:35 1998
+++ dpkg-1.4.1.7/dselect/pkgkeys.cc Thu Aug 12 18:53:15 1999
@@ -34,44 +34,44 @@
#include "bindings.h"
const keybindings::interpretation packagelist_kinterps[] = {
- { "up", 0, packagelist::kd_up, qa_noquit },
- { "down", 0, packagelist::kd_down, qa_noquit },
- { "top", 0, packagelist::kd_top, qa_noquit },
- { "bottom", 0, packagelist::kd_bottom, qa_noquit },
- { "scrollon", 0, packagelist::kd_scrollon, qa_noquit },
- { "scrollback", 0, packagelist::kd_scrollback, qa_noquit },
- { "iscrollon", 0, packagelist::kd_iscrollon, qa_noquit },
- { "iscrollback", 0, packagelist::kd_iscrollback, qa_noquit },
- { "scrollon1", 0, packagelist::kd_scrollon1, qa_noquit },
- { "scrollback1", 0, packagelist::kd_scrollback1, qa_noquit },
- { "iscrollon1", 0, packagelist::kd_iscrollon1, qa_noquit },
- { "iscrollback1", 0, packagelist::kd_iscrollback1, qa_noquit },
- { "panon", 0, packagelist::kd_panon, qa_noquit },
- { "panback", 0, packagelist::kd_panback, qa_noquit },
- { "panon1", 0, packagelist::kd_panon1, qa_noquit },
- { "panback1", 0, packagelist::kd_panback1, qa_noquit },
- { "install", 0, packagelist::kd_select, qa_noquit },
- { "remove", 0, packagelist::kd_deselect, qa_noquit },
- { "purge", 0, packagelist::kd_purge, qa_noquit },
- { "hold", 0, packagelist::kd_hold, qa_noquit },
- { "unhold", 0, packagelist::kd_unhold, qa_noquit },
- { "info", 0, packagelist::kd_info, qa_noquit },
- { "toggleinfo", 0, packagelist::kd_toggleinfo, qa_noquit },
- { "verbose", 0, packagelist::kd_verbose, qa_noquit },
- { "versiondisplay", 0, packagelist::kd_versiondisplay, qa_noquit },
- { "help", 0, packagelist::kd_help, qa_noquit },
- { "search", 0, packagelist::kd_search, qa_noquit },
- { "searchagain", 0, packagelist::kd_searchagain, qa_noquit },
- { "swaporder", 0, packagelist::kd_swaporder, qa_noquit },
- { "swapstatorder", 0, packagelist::kd_swapstatorder, qa_noquit },
- { "redraw", 0, packagelist::kd_redraw, qa_noquit },
- { "quitcheck", 0, packagelist::kd_quit_noop, qa_quitchecksave },
- { "quitrejectsug", 0, packagelist::kd_revertdirect, qa_quitnochecksave },
- { "quitnocheck", 0, packagelist::kd_quit_noop, qa_quitnochecksave },
- { "abortnocheck", 0, packagelist::kd_revert_abort, qa_quitnochecksave },
- { "revert", 0, packagelist::kd_revert_abort, qa_noquit },
- { "revertsuggest", 0, packagelist::kd_revertsuggest, qa_noquit },
- { "revertdirect", 0, packagelist::kd_revertdirect, qa_noquit },
+ { "up", 0, &packagelist::kd_up, qa_noquit },
+ { "down", 0, &packagelist::kd_down, qa_noquit },
+ { "top", 0, &packagelist::kd_top, qa_noquit },
+ { "bottom", 0, &packagelist::kd_bottom, qa_noquit },
+ { "scrollon", 0, &packagelist::kd_scrollon, qa_noquit },
+ { "scrollback", 0, &packagelist::kd_scrollback, qa_noquit },
+ { "iscrollon", 0, &packagelist::kd_iscrollon, qa_noquit },
+ { "iscrollback", 0, &packagelist::kd_iscrollback, qa_noquit },
+ { "scrollon1", 0, &packagelist::kd_scrollon1, qa_noquit },
+ { "scrollback1", 0, &packagelist::kd_scrollback1, qa_noquit },
+ { "iscrollon1", 0, &packagelist::kd_iscrollon1, qa_noquit },
+ { "iscrollback1", 0, &packagelist::kd_iscrollback1, qa_noquit },
+ { "panon", 0, &packagelist::kd_panon, qa_noquit },
+ { "panback", 0, &packagelist::kd_panback, qa_noquit },
+ { "panon1", 0, &packagelist::kd_panon1, qa_noquit },
+ { "panback1", 0, &packagelist::kd_panback1, qa_noquit },
+ { "install", 0, &packagelist::kd_select, qa_noquit },
+ { "remove", 0, &packagelist::kd_deselect, qa_noquit },
+ { "purge", 0, &packagelist::kd_purge, qa_noquit },
+ { "hold", 0, &packagelist::kd_hold, qa_noquit },
+ { "unhold", 0, &packagelist::kd_unhold, qa_noquit },
+ { "info", 0, &packagelist::kd_info, qa_noquit },
+ { "toggleinfo", 0, &packagelist::kd_toggleinfo, qa_noquit },
+ { "verbose", 0, &packagelist::kd_verbose, qa_noquit },
+ { "versiondisplay", 0, &packagelist::kd_versiondisplay, qa_noquit },
+ { "help", 0, &packagelist::kd_help, qa_noquit },
+ { "search", 0, &packagelist::kd_search, qa_noquit },
+ { "searchagain", 0, &packagelist::kd_searchagain, qa_noquit },
+ { "swaporder", 0, &packagelist::kd_swaporder, qa_noquit },
+ { "swapstatorder", 0, &packagelist::kd_swapstatorder, qa_noquit },
+ { "redraw", 0, &packagelist::kd_redraw, qa_noquit },
+ { "quitcheck", 0, &packagelist::kd_quit_noop, qa_quitchecksave },
+ { "quitrejectsug", 0, &packagelist::kd_revertdirect, qa_quitnochecksave },
+ { "quitnocheck", 0, &packagelist::kd_quit_noop, qa_quitnochecksave },
+ { "abortnocheck", 0, &packagelist::kd_revert_abort, qa_quitnochecksave },
+ { "revert", 0, &packagelist::kd_revert_abort, qa_noquit },
+ { "revertsuggest", 0, &packagelist::kd_revertsuggest, qa_noquit },
+ { "revertdirect", 0, &packagelist::kd_revertdirect, qa_noquit },
{ 0, 0, 0, qa_noquit }
};
-- System Information
Debian Release: potato
Kernel Version: Linux pepper 2.2.10 #1 Sun Jul 18 13:16:46 PDT 1999 i586 unknown
Versions of the packages dpkg depends on:
ii libc6 2.1.1-13 GNU C Library: Shared libraries and timezone
ii libncurses4 4.2-3.2 Shared libraries for terminal handling
ii libstdc++2.9-gl 2.91.66-2 The GNU stdc++ library (EGCS version)
Reply to: