build fixes, change version 0.7.21

diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc
index baa98f54668eb7f75c1ba4e05dc52f4b5b2f288b..ccd45d51bd9638acf8024527b2ad5301ba2db440 100644 (file)
--- a/apt-pkg/deb/debsystem.cc
+++ b/apt-pkg/deb/debsystem.cc
@@ -17,6 +17,7 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
+#include <apti18n.h>
     
 #include <sys/types.h>
 #include <unistd.h>

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index ccf53ed25bcce359206f342834b924081bb26d84..028f371b5dcc614f4b556913cc0054964e7d0ab5 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1301,7 +1301,9 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
    while ((Parse = SrcRecs.Find(Src.c_str(), MatchSrcOnly)) != 0)
    {
       string Ver = Parse->Version();
-      
+
+      // show name mismatches
+      if (IsMatch == true && Parse->Package() != Src)       
         ioprintf(c1out,  _("No source package '%s' picking '%s' instead\n"), Parse->Package().c_str(), Src.c_str());
       
       if (VerTag.empty() == false)

diff --git a/debian/changelog b/debian/changelog
index 6fe3b7a70d5d2c558bdaca9e6dd5b92a2b971eda..58fa99d7a8bd69022f5033d89a0ee1c396461352 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (0.7.20.3) UNRELEASED; urgency=low
+apt (0.7.21) unstable; urgency=low
 
   [ Christian Perrier ]
   * Translations:
@@ -39,7 +39,7 @@ apt (0.7.20.3) UNRELEASED; urgency=low
     - Call pkgAcquireStatus::Pulse even if quiet, so that we still get
       dlstatus messages on the status-fd (LP: #290234).
 
- -- Michael Vogt <mvo@debian.org>  Wed, 08 Apr 2009 22:37:01 +0200
+ -- Michael Vogt <mvo@debian.org>  Tue, 14 Apr 2009 14:12:51 +0200
 
 apt (0.7.20.2) unstable; urgency=medium