From 670c56e521e3f59be7722f1243399d8289e14626 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 8 Nov 2005 16:19:07 +0000 Subject: [PATCH] * merged the NMU from Franz Pop, fixed armeb problem (#333599) --- buildlib/archtable | 2 +- buildlib/sizetable | 1 + configure.in | 2 +- debian/changelog | 11 ++++++++++- share/debian-archive.gpg | Bin 1303 -> 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 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 GIT binary patch delta 1439 zcmV;Q1z`G@3Y`_O$^-!elgk85f0+TI1VU@iD-i?$qkMdR4$o{ygP%m(s1_<8+hSdY z`AtMi4Cq_7tk9c0P=;QWR2Q&{Us-bvAUfzoc__i?2eTV(=0uyAe%3X!Cob;y#C?v! z-CkmJb?tBvEmHxUApkNYi)4^X1~e3M7o(0x&*_d-*xLIc8+$}9cj?dpf5dJKg)O?8 zACsY{-vFS7QItQqE7-<1DawzsvJj5H^38!vh9Xb9tUIY^n0stNb0zzxgD*_t> z1`7!Y2Ll2F6#@eTe-;7(0v-VZ7k~f?2@vEJvb44JyX{hR0G~{w`YO*WrW7Smy=E1^ z5NwW4p27g1Wt2^S@X_d-a(dj=K!Qs;Iefk7umS)Bh(-hu5dr`P1p-2Lr`7-p2@r8! z)}VfSiph)Q0G~ykT7WloQ)s%3zpCP6lbP`k2&e#`LDJ%!e*?*~Fcr1PHBn^(?u-hS zZ?FOY0Ek8e5D@|Z1_c5_dpCao3JDNFD;_a{dYNia*8rff>q=Zlp_pz-jI>{8n_9n@ z65C1upt#R})){XEIXQw^Wp=Ssss(2bwy**K0Ek8e6A=Oc1_c5_dpe&03JDOI)0v^{ zHlc-%UI3mge;HlGG;)!mC9YtX?u8T=)ya#T0G>C|w$>x_sOYy737_8z5OW9k!8EV} z006lH4Fp1K&odAR0P6LR=nh7j#qb%}+x&@9!$dzx?wx3Zg{GTE2pD2bU5Uc&e|z=9 zJ6EPqlo!(MwE8c9nYayD15R@h;ZSe(S8Kak!+cG&L?0y!gdkavm`g7(X zQyGe79^V1ZvwV&3ADi?kYnVITc2%t8hY%?Oe|I9;IYbXG=tPek-p2J}~A0in(1i6&Ri~9!}FA+@*<5*?QsaM1(=MNO%93$rwJlL9j4sichXyttn} z+Kms7OLHDSIlF+ErcH=R1Q-zl00{*GLTk@60vikf3JDP86|%Io^}Fq#b^w|JFS8Ge t#}NP|E(?y1a`YhBWL%E`pMP-JQ;@kn5o_@vD)2;gLvAqHmV2-Q00R~vdSn0q delta 13 UcmbO$I-P67DHcYC$){O-03n71fdBvi -- 2.47.2