Patches applied:

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-23
   stop!  this architecture is not ready yet


* archtable, scripts/dpkg-architecture.pl: Remove support for amd64/x86-64,
the porters clearly can't make up their mind what they want.

4 files changed, 6 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 7c5d55754..a0e087e2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 3 12:03:49 BRT 2004 Scott James Remnant <scott@netsplit.com>
+
+  * archtable, scripts/dpkg-architecture.pl: Remove support for amd64/x86-64,
+  the porters clearly can't make up their mind what they want.
+
 Wed Jun 2 15:32:47 BRT 2004 Scott James Remnant <scott@netsplit.com>
 
   * version-nr, debian/changelog: Bump version to 1.10.23.
diff --git a/archtable b/archtable
index 656de8922..dd1d6bfb9 100644
--- a/archtable
+++ b/archtable
@@ -63,6 +63,3 @@ 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	x86-64		x86_64
-x86_64-linux			x86-64		x86_64
-x86_64-linux-gnu		x86-64		x86_64
diff --git a/debian/changelog b/debian/changelog
index b1535ac11..814ad859e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 dpkg (1.10.23) unstable; urgency=low
 
-  * 
+  * Removed support for x86-64 (x86_64 / amd64).  Closes: #252346.
 
  -- Scott James Remnant <scott@netsplit.com>  UNRELEASED
 
diff --git a/scripts/dpkg-architecture.pl b/scripts/dpkg-architecture.pl
index 883f67860..3d497a864 100755
--- a/scripts/dpkg-architecture.pl
+++ b/scripts/dpkg-architecture.pl
@@ -65,7 +65,6 @@ require 'controllib.pl';
 	    's390',		's390-linux',
 	    's390x',		's390x-linux',
 	    'ia64',		'ia64-linux',
-	    'x86-64',           'x86_64-linux',
 	    'openbsd-i386',	'i386-openbsd',
 	    'freebsd-i386',	'i386-freebsd',
 	    'kfreebsd-i386',	'i386-kfreebsd-gnu',