summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2009-04-14 14:17:40 +0200
committerMichael Vogt <mvo@debian.org>2009-04-14 14:17:40 +0200
commitf0bb64930676131f8df667e064ed8b1d1b14145b (patch)
treeb592f2cda66586d4401d568074cde6f7253cea79
parent09fab2442c2ab9a503841d3dcd56b3c0c3efb502 (diff)
build fixes, change version 0.7.21
-rw-r--r--apt-pkg/deb/debsystem.cc1
-rw-r--r--cmdline/apt-get.cc4
-rw-r--r--debian/changelog4
3 files changed, 6 insertions, 3 deletions
diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc
index baa98f546..ccd45d51b 100644
--- 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 ccf53ed25..028f371b5 100644
--- 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 6fe3b7a70..58fa99d7a 100644
--- 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