Explorar el Código

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.
Guillem Jover hace 13 años
padre
commit
da63cf41f7
Se han modificado 6 ficheros con 4 adiciones y 37 borrados
  1. 0 1
      Makefile.am
  2. 1 3
      cputable
  3. 0 29
      debian/archtable
  4. 2 0
      debian/changelog
  5. 0 1
      debian/dpkg.install
  6. 1 3
      ostable

+ 0 - 1
Makefile.am

@@ -37,7 +37,6 @@ EXTRA_DIST = \
 	doc/lcov-epilog \
 	doc/lcov-epilog \
 	doc/lcov-prolog \
 	doc/lcov-prolog \
 	doc/triggers.txt \
 	doc/triggers.txt \
-	debian/archtable \
 	debian/changelog \
 	debian/changelog \
 	debian/compat \
 	debian/compat \
 	debian/control \
 	debian/control \

+ 1 - 3
cputable

@@ -2,9 +2,7 @@
 #
 #
 # Architecture names are formed as a combination of the system name
 # Architecture names are formed as a combination of the system name
 # (from ostable) and CPU name (from this table) after mapping from
 # (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
 # Column 1 is the Debian name for the CPU, used to form the cpu part in
 # the Debian triplet.
 # the Debian triplet.

+ 0 - 29
debian/archtable

@@ -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

+ 2 - 0
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,
   * 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
     as the latter are not future-proof, and neither can be guaranteed to
     produce a reliable output file format.
     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 <guillem@debian.org>  Fri, 03 Aug 2012 13:21:00 +0200
  -- Guillem Jover <guillem@debian.org>  Fri, 03 Aug 2012 13:21:00 +0200
 
 

+ 0 - 1
debian/dpkg.install

@@ -1,5 +1,4 @@
 ../dpkg.cfg etc/dpkg
 ../dpkg.cfg etc/dpkg
-../archtable usr/share/dpkg
 
 
 etc/dpkg/dpkg.cfg.d
 etc/dpkg/dpkg.cfg.d
 etc/alternatives
 etc/alternatives

+ 1 - 3
ostable

@@ -2,9 +2,7 @@
 #
 #
 # Architecture names are formed as a combination of the system name
 # Architecture names are formed as a combination of the system name
 # (from this table) and CPU name (from cputable) after mapping from
 # (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
 # Column 1 is the Debian name for the system, used to form the system part
 # in the Debian triplet.
 # in the Debian triplet.