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.

diff --git a/ChangeLog b/ChangeLog
index 7c5d5575477103481eeffaa60ed119b91a07a963..a0e087e2d8c16027ba2e4d488ce9459c5e002dd4 100644 (file)
--- 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 656de8922eee683ec77144f63081c8170ba1fbbd..dd1d6bfb9079f066ba6570b23576624a3708d254 100644 (file)
--- 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 b1535ac1124d9434958010c30e03420a2b5604d0..814ad859e63c87f7661a20da7067ea6864deda06 100644 (file)
--- 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 883f6786054f2fb804fb58df45436f3c0ca4f4fc..3d497a8646bf3b7f69ca0dbafe75551a3a65b75b 100755 (executable)
--- 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',