diff options
| author | Christian Perrier <bubulle@debian.org> | 2005-11-01 17:25:04 +0000 |
|---|---|---|
| committer | Christian Perrier <bubulle@debian.org> | 2005-11-01 17:25:04 +0000 |
| commit | 2cf1aee845ce86e6dba7a069ce6ad5edefae1331 (patch) | |
| tree | 20c0290daa978b2f8926a1cfa7dd76fcc4412e8f | |
| parent | efd1e3490c7fe2718d76f60ca0a83145b8289afa (diff) | |
| parent | c5198dc1d0edeb3999741f00a25ec946cd66d6b9 (diff) | |
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
| -rw-r--r-- | buildlib/archtable | 1 | ||||
| -rw-r--r-- | buildlib/sizetable | 1 | ||||
| -rw-r--r-- | cmdline/apt-get.cc | 2 | ||||
| -rw-r--r-- | debian/changelog | 10 |
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 |