Patches applied:

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-28
   restore amd64 support with that name

* archtable: Requested the technical committee to make the mentioned
decision -- we're going with amd64 (that'll please my boss :-)
* scripts/dpkg-architecture.pl: Likewise.

diff --git a/ChangeLog b/ChangeLog
index b0a092d67373e342d4d7876e1fe1358641ac99f8..337bace4d59a0135193e9b28500683b1f93111cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jun 18 06:34:43 BST 2004 Scott James Remnant <scott@netsplit.com>
+
+  * archtable: Requested the technical committee to make the mentioned
+  decision -- we're going with amd64 (that'll please my boss :-)
+  * scripts/dpkg-architecture.pl: Likewise.
+
 Tue Jun 15 19:19:36 BST 2004 Bartosz Fenski aka fEnIo <fenio@o2.pl>
 
   * po/pl.po: Updated.

diff --git a/archtable b/archtable
index dd1d6bfb9079f066ba6570b23576624a3708d254..883570322d48eeebf8e438b2e1e7ad2ee5017825 100644 (file)
--- a/archtable
+++ b/archtable
@@ -41,6 +41,7 @@ i686-gnu0.3                   hurd-i386       undefined
 ia64-linux-gnu                 ia64            ia64
 ia64-unknown-linux             ia64            ia64
 ia64-unknown-linux-gnu         ia64            ia64
+x86_64-linux-gnu               amd64           x86_64
 sh3-linux-gnu                  sh3             sh3
 sh4-linux-gnu                  sh4             sh4
 sh3eb-linux-gnu                        sh3eb           sh3eb

diff --git a/debian/changelog b/debian/changelog
index 70e1469e02e379f89cd621ae6734e9e834187f28..4c8ad72e4b82b56b912bf4757ea107c6bc776c28 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 dpkg (1.10.23) unstable; urgency=low
 
-  * Removed support for x86-64 (x86_64 / amd64).  Closes: #252346.
+  * Architecture Support:
+    - Renamed x86-64 to amd64.  Closes: #252346, #254598.
   * Documentation:
     - Correct typo in dpkg-divert(8).  Closes: #254175.
   * Updated Translations:

diff --git a/scripts/dpkg-architecture.pl b/scripts/dpkg-architecture.pl
index 3d497a8646bf3b7f69ca0dbafe75551a3a65b75b..a53212ae876c6e0c2d9abb7a3daede96d3044321 100755 (executable)
--- 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-freebsd',
            'kfreebsd-i386',    'i386-kfreebsd-gnu',