summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--buildlib/archtable2
-rw-r--r--buildlib/sizetable1
-rw-r--r--configure.in2
-rw-r--r--debian/changelog11
-rw-r--r--share/debian-archive.gpgbin1303 -> 2717 bytes
5 files changed, 13 insertions, 3 deletions
diff --git a/buildlib/archtable b/buildlib/archtable
index af1123d02..197529202 100644
--- 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 51a136d4a..cf6a3ae2d 100644
--- 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 758727f2f..cae1ffe6a 100644
--- 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 a8c9e398b..acacb8f23 100644
--- 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 c391d8fa1..bb5ed5033 100644
--- a/share/debian-archive.gpg
+++ b/share/debian-archive.gpg
Binary files differ