From c5d6a22cc65d4f5d0405c0a2a392c659e2959e3f Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 18 Nov 2010 14:10:50 +0100
Subject: cmdline/apt-get.cc: use source version instead of binary version

---
 cmdline/apt-get.cc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'cmdline/apt-get.cc')

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index a1987b977..db9424985 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2751,10 +2751,12 @@ string GetChangelogPath(CacheFile &Cache,
    pkgRecords Recs(Cache);
    pkgRecords::Parser &rec=Recs.Lookup(Ver.FileList());
    string srcpkg = rec.SourcePkg().empty() ? Pkg.Name() : rec.SourcePkg();
-   // FIXME: deal with cases like gcc-defaults (srcver != binver)
-   string srcver = StripEpoch(Ver.VerStr());
+   string ver = Ver.VerStr();
+   // if there is a source version it always wins
+   if (rec.SourceVer() != "")
+      ver = rec.SourceVer();
    path = flNotFile(rec.FileName());
-   path += srcpkg + "_" + srcver;
+   path += srcpkg + "_" + StripEpoch(ver);
    return path;
 }
 									/*}}}*/
-- 
cgit v1.2.3-70-g09d2