From 46318c8398bb22dae220ac26de95ef6b53eaaa42 Mon Sep 17 00:00:00 2001 From: Scott James Remnant Date: Tue, 27 Apr 2004 18:17:17 +0000 Subject: [PATCH] Add support for pure amd64 in archtable and dpkg-architecture, it's maturing sufficiently that we should probably support it now. archtable made a bit easier to read too... --- ChangeLog | 5 ++ archtable | 111 ++++++++++++++++++----------------- debian/changelog | 1 + scripts/dpkg-architecture.pl | 1 + 4 files changed, 64 insertions(+), 54 deletions(-) diff --git a/ChangeLog b/ChangeLog index 44bf96c4..abe7b8dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Apr 26 20:28:58 CEST 2004 Tollef Fog Heen + + * scripts/dpkg-architecture.pl, archtable: Add AMD64/x86_64 support. + Also reindent archtable so the columns line up nicely. + Mon Apr 26 18:53:15 BST 2004 Scott James Remnant * configure.in: Put the man page directories in alphabetical order. diff --git a/archtable b/archtable index 087e9a04..f836c209 100644 --- a/archtable +++ b/archtable @@ -7,57 +7,60 @@ # returned by `dpkg --print-installation-architecture'. # Column 3 is returned by `dpkg --print-architecture'. -i386-linux-gnu i386 i486 -i486-linux-gnu i386 i486 -i586-linux-gnu i386 i486 -i686-linux-gnu i386 i486 -pentium-linux-gnu i386 i486 -sparc-linux-gnu sparc sparc -sparc64-linux-gnu sparc sparc -alpha-linux-gnu alpha alpha -alphaev4-linux-gnu alpha alpha -alphaev5-linux-gnu alpha alpha -alphaev56-linux-gnu alpha alpha -alphapca56-linux-gnu alpha alpha -alphaev6-linux-gnu alpha alpha -alphaev67-linux-gnu alpha alpha -alphaev68-linux-gnu alpha alpha -m68k-linux-gnu m68k m68k -arm-linux-gnu arm arm -armv3l-linux-gnu arm arm -armv4l-linux-gnu arm arm -ppc-linux-gnu powerpc powerpc -powerpc-linux-gnu powerpc powerpc -powerpc powerpc powerpc -mips-linux-gnu mips mips -mipsel-linux-gnu mipsel mipsel -mipseb-linux-gnu mips mips -i386-gnu hurd-i386 undefined -i386-gnu0.2 hurd-i386 undefined -i386-gnu0.3 hurd-i386 undefined -i486-gnu0.3 hurd-i386 undefined -i586-gnu0.3 hurd-i386 undefined -i686-gnu0.3 hurd-i386 undefined -ia64-linux-gnu ia64 ia64 -ia64-unknown-linux ia64 ia64 -sh3-linux-gnu sh3 sh3 -sh4-linux-gnu sh4 sh4 -sh3eb-linux-gnu sh3eb sh3eb -sh4eb-linux-gnu sh4eb sh4eb -hppa-linux-gnu hppa hppa -hppa1.1-linux-gnu hppa hppa -hppa2.0-linux-gnu hppa hppa -hppa64-linux-gnu hppa hppa -i386-freebsd freebsd-i386 freebsd-i386 -i386-kfreebsd-gnu freebsd-i386 freebsd-i386 -i386-netbsdelf-gnu netbsd-i386 netbsd-i386 -s390-linux-gnu s390 s390 -s390-ibm-linux-gnu s390 s390 -s390-unknown-linux-gnu s390 s390 -i386-openbsd openbsd-i386 openbsd-i386 -i386-unknown-openbsd openbsd-i386 openbsd-i386 -powerpc-darwin darwin-powerpc darwin-powerpc -i386-darwin darwin-i386 darwin-i386 -s390x-linux-gnu s390x s390x -s390x-ibm-linux-gnu s390x s390x -s390x-unknown-linux-gnu s390x s390x +i386-linux-gnu i386 i486 +i486-linux-gnu i386 i486 +i586-linux-gnu i386 i486 +i686-linux-gnu i386 i486 +pentium-linux-gnu i386 i486 +sparc-linux-gnu sparc sparc +sparc64-linux-gnu sparc sparc +alpha-linux-gnu alpha alpha +alphaev4-linux-gnu alpha alpha +alphaev5-linux-gnu alpha alpha +alphaev56-linux-gnu alpha alpha +alphapca56-linux-gnu alpha alpha +alphaev6-linux-gnu alpha alpha +alphaev67-linux-gnu alpha alpha +alphaev68-linux-gnu alpha alpha +m68k-linux-gnu m68k m68k +arm-linux-gnu arm arm +armv3l-linux-gnu arm arm +armv4l-linux-gnu arm arm +ppc-linux-gnu powerpc powerpc +powerpc-linux-gnu powerpc powerpc +powerpc powerpc powerpc +mips-linux-gnu mips mips +mipsel-linux-gnu mipsel mipsel +mipseb-linux-gnu mips mips +i386-gnu hurd-i386 undefined +i386-gnu0.2 hurd-i386 undefined +i386-gnu0.3 hurd-i386 undefined +i486-gnu0.3 hurd-i386 undefined +i586-gnu0.3 hurd-i386 undefined +i686-gnu0.3 hurd-i386 undefined +ia64-linux-gnu ia64 ia64 +ia64-unknown-linux ia64 ia64 +sh3-linux-gnu sh3 sh3 +sh4-linux-gnu sh4 sh4 +sh3eb-linux-gnu sh3eb sh3eb +sh4eb-linux-gnu sh4eb sh4eb +hppa-linux-gnu hppa hppa +hppa1.1-linux-gnu hppa hppa +hppa2.0-linux-gnu hppa hppa +hppa64-linux-gnu hppa hppa +i386-freebsd freebsd-i386 freebsd-i386 +i386-kfreebsd-gnu freebsd-i386 freebsd-i386 +i386-netbsdelf-gnu netbsd-i386 netbsd-i386 +s390-linux-gnu s390 s390 +s390-ibm-linux-gnu s390 s390 +s390-unknown-linux-gnu s390 s390 +i386-openbsd openbsd-i386 openbsd-i386 +i386-unknown-openbsd openbsd-i386 openbsd-i386 +powerpc-darwin darwin-powerpc darwin-powerpc +i386-darwin darwin-i386 darwin-i386 +s390x-linux-gnu s390x s390x +s390x-ibm-linux-gnu s390x s390x +s390x-unknown-linux-gnu s390x s390x +x86_64-unknown-linux-gnu amd64 amd64 +x86_64-linux amd64 amd64 +x86_64-linux-gnu amd64 amd64 diff --git a/debian/changelog b/debian/changelog index 20bbb987..cb9e6ac5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ dpkg (1.10.22) unstable; urgency=low + * Add amd64 support. Closes: #238483, #241938. * Stop hardcoding the list of manual page languages in debian/rules, so we include Spanish, Russian and Brazilian Portugese. Closes: #245994. diff --git a/scripts/dpkg-architecture.pl b/scripts/dpkg-architecture.pl index 10dfdb53..f388b622 100755 --- a/scripts/dpkg-architecture.pl +++ b/scripts/dpkg-architecture.pl @@ -65,6 +65,7 @@ require 'controllib.pl'; 's390', 's390-linux', 's390x', 's390x-linux', 'ia64', 'ia64-linux', + 'amd64', 'x86_64-linux', 'openbsd-i386', 'i386-openbsd', 'freebsd-i386', 'i386-kfreebsd-gnu', 'netbsd-i386', 'i386-netbsdelf-gnu', -- 2.39.5