Merge with Michael

Patches applied:

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-82
   * merged with bubulle

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-83
   * cmdline/apt-get.cc: fix bug in FindSrc() (debian #335213)

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-84
   * added armeb to archtable

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

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

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 040f670b1f051aff0953fec6fb3be40571fafc4c..b2beb3c2be07e65710e059ce8488a220d72f7a09 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1200,7 +1200,7 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
       VerTag = string(TmpSrc.begin() + Slash + 1,TmpSrc.end());
       TmpSrc = string(TmpSrc.begin(),TmpSrc.begin() + Slash);
    } 
-   else  if(DefRel.empty() == false)
+   else  if(!Pkg.end() && DefRel.empty() == false)
    {
       // we have a default release, try to locate the pkg. we do it like
       // this because GetCandidateVer() will not "downgrade", that means

diff --git a/debian/changelog b/debian/changelog
index 9716c3836d31aa4c70bbb42be2240d15f10d908b..a4e4030300135a7e4f1b3dc01d661ef0c48c800e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+apt (0.6.42.2) unstable; urgency=low
+
+  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-118:
+    - patch-118: Russian translation update by Yuri Kozlov (closes: #335164)
+  * cmdline/apt-get.cc:
+    - bufix in FindSrc  (closes: #335213)
+  * added armeb to archtable (closes: #333599)
+   
+ --
+
 apt (0.6.42.1) unstable; urgency=low
 
   * fix a incorrect example in the apt_prefrences man page