The following commit has been merged in the master branch:
commit da63cf41f766b3188d0a7330c91a06222e479539
Author: Guillem Jover <[email protected]>
Date: Sat Apr 13 03:06:22 2013 +0200
debian: Drop archtable
It serves no purpose, it's Debian specific, it's usually outdated
relative to the main archive, and everyone should be using
dpkg-architecture anyway, or looking at the Debian archive for the
distribution supported architectures.
diff --git a/Makefile.am b/Makefile.am
index 406d3dd..d27a0fc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,7 +37,6 @@ EXTRA_DIST = \
doc/lcov-epilog \
doc/lcov-prolog \
doc/triggers.txt \
- debian/archtable \
debian/changelog \
debian/compat \
debian/control \
diff --git a/cputable b/cputable
index 28630f0..c556fdd 100644
--- a/cputable
+++ b/cputable
@@ -2,9 +2,7 @@
#
# Architecture names are formed as a combination of the system name
# (from ostable) and CPU name (from this table) after mapping from
-# the Debian triplet (from triplettable). A list of architecture
-# names in the Debian ‘sid’ distribution can be found in the archtable
-# file.
+# the Debian triplet (from triplettable).
#
# Column 1 is the Debian name for the CPU, used to form the cpu part in
# the Debian triplet.
diff --git a/debian/archtable b/debian/archtable
deleted file mode 100644
index a50328b..0000000
--- a/debian/archtable
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file contains the list of architecture names in Debian's ‘sid’
-# distribution.
-#
-# Architecture names are formed as a combination of the system name
-# (from ostable) and CPU name (from cputable) after mapping from
-# the Debian triplet (from triplettable). Support for new
-# architectures in dpkg is added in those files, architecture names
-# are only added to this file when added to the distribution.
-#
-# Column 1 is present for historical reasons only, and should be ignored.
-# Column 2 contains the Debian name for the architecture, which is returned
-# by ‘dpkg --print-architecture’.
-#
-# <ignore> <Debian name>
-i486-linux-gnu i386
-ia64-linux-gnu ia64
-alpha-linux-gnu alpha
-x86_64-linux-gnu amd64
-arm-linux-gnu arm
-arm-linux-gnueabi armel
-hppa-linux-gnu hppa
-mips-linux-gnu mips
-mipsel-linux-gnu mipsel
-powerpc-linux-gnu powerpc
-s390-linux-gnu s390
-sparc-linux-gnu sparc
-i486-gnu hurd-i386
-i486-kfreebsd-gnu kfreebsd-i386
-x86_64-kfreebsd-gnu kfreebsd-amd64
diff --git a/debian/changelog b/debian/changelog
index 83df024..3930239 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -72,6 +72,8 @@ dpkg (1.17.0) UNRELEASED; urgency=low
* Add new dpkg-deb --deb-format option and base --new and --old on it,
as the latter are not future-proof, and neither can be guaranteed to
produce a reliable output file format.
+ * Drop archtable. It serves no purpose, it's Debian specific, it's
+ usually outdated, and everyone should be using dpkg-architecture anyway.
-- Guillem Jover <[email protected]> Fri, 03 Aug 2012 13:21:00 +0200
diff --git a/debian/dpkg.install b/debian/dpkg.install
index 26aa1b6..1150616 100644
--- a/debian/dpkg.install
+++ b/debian/dpkg.install
@@ -1,5 +1,4 @@
../dpkg.cfg etc/dpkg
-../archtable usr/share/dpkg
etc/dpkg/dpkg.cfg.d
etc/alternatives
diff --git a/ostable b/ostable
index 3348014..ddc4b04 100644
--- a/ostable
+++ b/ostable
@@ -2,9 +2,7 @@
#
# Architecture names are formed as a combination of the system name
# (from this table) and CPU name (from cputable) after mapping from
-# the Debian triplet (from triplettable). A list of architecture
-# names in the Debian ‘sid’ distribution can be found in the archtable
-# file.
+# the Debian triplet (from triplettable).
#
# Column 1 is the Debian name for the system, used to form the system part
# in the Debian triplet.
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
