summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2005-11-29 15:01:33 +0000
committerMichael Vogt <mvo@debian.org>2005-11-29 15:01:33 +0000
commit9329c2ae3c404ba25bf73133287abf01592f409b (patch)
tree29f522eb2c7bcadc5b05466982d3c9d83b7b1933
parentc99a4ffaa6bc01308f52080816be9c0d879dc028 (diff)
parent39442e44c7f68722014dbcd6af061c2856ce76db (diff)
* merged with mvo
Patches applied: * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-105 * fix mailaddress * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-106 * fix a string (thanks to bubulle)
-rw-r--r--apt-pkg/sourcelist.cc2
-rw-r--r--debian/changelog2
2 files changed, 2 insertions, 2 deletions
diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index db895a6c1..e3b4d94f8 100644
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -241,7 +241,7 @@ bool pkgSourceList::ReadAppend(string File)
Type *Parse = Type::GetType(LineType.c_str());
if (Parse == 0)
- return _error->Error(_("Type '%s' is not known in on line %u in source list %s"),LineType.c_str(),CurLine,File.c_str());
+ return _error->Error(_("Type '%s' is not known on line %u in source list %s"),LineType.c_str(),CurLine,File.c_str());
// Vendor name specified
if (C[0] == '[')
diff --git a/debian/changelog b/debian/changelog
index 7745add68..05e4d5f74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,7 @@ apt (0.6.43) unstable; urgency=medium
* Fix GNU/kFreeBSD crash on non-existing server file (closes: #317718)
* switch to libdb4.3 in build-depends
- -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 25 Nov 2005 11:22:31 +0100
+ -- Michael Vogt <mvo@debian.org> Tue, 29 Nov 2005 00:17:07 +0100
apt (0.6.42.3) unstable; urgency=low