summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--buildlib/archtable1
-rw-r--r--buildlib/sizetable1
-rw-r--r--cmdline/apt-get.cc2
-rw-r--r--debian/changelog10
4 files changed, 13 insertions, 1 deletions
diff --git a/buildlib/archtable b/buildlib/archtable
index b01743c02..af1123d02 100644
--- 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 911180145..51a136d4a 100644
--- 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 040f670b1..b2beb3c2b 100644
--- 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 9716c3836..a4e403030 100644
--- 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