* merged the NMU from Franz Pop, fixed armeb problem (#333599)

diff --git a/buildlib/archtable b/buildlib/archtable
index af1123d020cb92b9ada14ff257b5fcf730e247af..1975292022d21e6097b386941a6030da86186913 100644 (file)
--- a/buildlib/archtable
+++ b/buildlib/archtable
@@ -11,7 +11,7 @@ sparc sparc
 sparc64        sparc
 alpha.*        alpha
 m68k   m68k
-armeb.*        armeb
+arm.*b armeb
 arm.*  arm
 powerpc        powerpc
 ppc    powerpc

diff --git a/buildlib/sizetable b/buildlib/sizetable
index 51a136d4a0c844ce2ad491f1d109a7bc1cb40db8..cf6a3ae2d4ba7b49da9f2749452cbe14bf21c96f 100644 (file)
--- a/buildlib/sizetable
+++ b/buildlib/sizetable
@@ -11,6 +11,7 @@
 # The format is:-
 # CPU endian sizeof: char, int, short, long
 i386    little  1 4 2 4
+armeb   big     1 4 2 4
 arm     little  1 4 2 4
 armeb   big     1 4 2 4
 alpha   little  1 4 2 8

diff --git a/configure.in b/configure.in
index 758727f2f21a0a342f0d896ff26db8c7a443afcc..cae1ffe6a41232706b23e5506daebb39a7c25891 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.6.42.1")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.42.2")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/changelog b/debian/changelog
index a8c9e398bba77b4eb579039d2f50809d9d0952f6..acacb8f238cbebfa78a46f4662dce9abd72b0996 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (0.6.42.2) unstable; urgency=low
+apt (0.6.42.3) unstable; urgency=low
 
   * Merge bubulle@debian.org--2005/apt--main--0 up to patch-129:
     - patch-118: Russian translation update by Yuri Kozlov (closes: #335164)
@@ -16,6 +16,15 @@ apt (0.6.42.2) unstable; urgency=low
    
  --
 
+apt (0.6.42.2) unstable; urgency=high
+
+  * NMU (approved by maintainer)
+  * Add AMD64 archive signing key to debian-archive.gpg (closes: #336500).
+  * Add big-endian arm (armeb) support (closes: #333599).
+  * Priority high to get the AMD key into testing ASAP.
+
+ -- Frans Pop <fjp@debian.org>  Sun, 30 Oct 2005 21:29:11 +0100
+ 
 apt (0.6.42.1) unstable; urgency=low
 
   * fix a incorrect example in the apt_prefrences man page

diff --git a/share/debian-archive.gpg b/share/debian-archive.gpg
index c391d8fa1e71897bfec9564216101b0f22b77114..bb5ed5033368a3699a03fe69d5e4ed70b9fc94c6 100644 (file)
Binary files a/share/debian-archive.gpg and b/share/debian-archive.gpg differ