summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2007-12-16 18:35:58 -0200
committerOtavio Salvador <otavio@ossystems.com.br>2007-12-16 18:35:58 -0200
commitda543ed87d3f8b8a0030a211452c9bddfc066f0b (patch)
tree07a7c0ab66a3df7205a80217ebc14537bf6751b4
parent9129f2af997bf10530432c6d7cd9711cd3dbbba1 (diff)
* Applied patch from Peter Eisentraut <peter_e@gmx.net> to fix a
grammatical error ("manual installed" -> "manually installed"), closes: #438136. *
-rw-r--r--apt-pkg/algorithms.cc4
-rw-r--r--cmdline/apt-get.cc2
-rw-r--r--debian/changelog8
3 files changed, 10 insertions, 4 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 62727a852..158f9c258 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -1261,8 +1261,8 @@ void pkgProblemResolver::InstallProtect()
Cache.MarkDelete(I);
else
{
- // preserver the information if the package was auto
- // or manual installed
+ // preserve the information whether the package was auto
+ // or manually installed
bool autoInst = (Cache[I].Flags & pkgCache::Flag::Auto);
Cache.MarkInstall(I, false, 0, !autoInst);
}
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 3bcacb293..486e995cc 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1719,7 +1719,7 @@ bool DoInstall(CommandLine &CmdL)
(Cache[Pkg].Flags & pkgCache::Flag::Auto) &&
_config->FindB("APT::Get::ReInstall",false) == false)
{
- ioprintf(c1out,_("%s set to manual installed.\n"),
+ ioprintf(c1out,_("%s set to manually installed.\n"),
Pkg.Name());
Cache->MarkAuto(Pkg,false);
AutoMarkChanged++;
diff --git a/debian/changelog b/debian/changelog
index 8e3f9ab38..4c56aa901 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,9 @@ apt (0.7.10) UNRELEASED; urgency=low
work properly in initramfs, closes: #448316.
* Applied patch from Robert Millan <rmh@aybabtu.com> to make apt-key and
apt-get to ignore time conflicts, closes: #451328.
+ * Applied patch from Peter Eisentraut <peter_e@gmx.net> to fix a
+ grammatical error ("manual installed" -> "manually installed"),
+ closes: #438136.
[ Program translations ]
- Basque updated. Closes: #453088
@@ -43,7 +46,10 @@ apt (0.7.10) UNRELEASED; urgency=low
* ftparchive/multicompress.cc:
- support lzma output
- -- Otavio Salvador <otavio@ossystems.com.br> Sun, 16 Dec 2007 18:23:52 -0200
+ [ Otavio Salvador ]
+ *
+
+ -- Otavio Salvador <otavio@ossystems.com.br> Sun, 16 Dec 2007 18:34:40 -0200
apt (0.7.9) unstable; urgency=low