Merge remote-tracking branch 'mvo/bugfix/conffile' into debian/sid

diff --combined cmdline/apt-get.cc
index 0b980cdf4e0c1038a1b878382c457a3abddd2c4a,6973901dc2c2f8688e9aeeb0e3fd90d059265175..730d3ea18a2f7a8fbcdd43c090755c46ce31823b
--- 1/cmdline/apt-get.cc
--- 2/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@@ -322,12 -322,9 +322,12 @@@ pkgSrcRecords::Parser *FindSrc(const ch
  
        if (Src == "" && ArchTag != "")
        {
 -          _error->Error(_("Can not find a package '%s' with version '%s' and "
 -                          "release '%s'"), Pkg.FullName().c_str(), 
 -                                           VerTag.c_str(), RelTag.c_str());
 +         if (VerTag != "")
 +            _error->Error(_("Can not find a package '%s' with version '%s'"),
 +                          Pkg.FullName().c_str(), VerTag.c_str());
 +         if (RelTag != "")
 +            _error->Error(_("Can not find a package '%s' with release '%s'"),
 +                          Pkg.FullName().c_str(), RelTag.c_str());
           Src = Name;
           return 0;
        }
@@@ -419,7 -416,7 +419,7 @@@
  
        if (Last != 0 || VerTag.empty() == true)
         break;
-       _error->Error(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str());
+       _error->Error(_("Can not find version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str());
        return 0;
     }