diff options
| -rw-r--r-- | cmdline/apt-get.cc | 4 | ||||
| -rw-r--r-- | debian/changelog | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index b2beb3c2b..48b21a31f 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1211,10 +1211,6 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false; VF++) { - // extra paranioa - if(VF.File() == NULL) - continue; - /* If this is the status file, and the current version is not the version in the status file (ie it is not installed, or somesuch) then it is not a candidate for installation, ever. This weeds diff --git a/debian/changelog b/debian/changelog index a4e403030..a8c9e398b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,15 @@ apt (0.6.42.2) unstable; urgency=low - * Merge bubulle@debian.org--2005/apt--main--0 up to patch-118: + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-129: - patch-118: Russian translation update by Yuri Kozlov (closes: #335164) + - patch-119: add update-po as a pre-req for binary (closes: #329910) + - patch-121: Complete French translation + - patch-125: Fixed localization of y/n questions in German translation + (closes: #337078) + - patch-126: Swedish translation update (closes: #337163) + - patch-127: Complete Tagalog translation (closes: #337306) + - patch-128: Danish translation update (closes: #337949) + - patch-129: Basque translation update (closes: #338101) * cmdline/apt-get.cc: - bufix in FindSrc (closes: #335213) * added armeb to archtable (closes: #333599) |