Просмотр исходного кода

* Applied patch from Peter Eisentraut <peter_e@gmx.net> to fix a
grammatical error ("manual installed" -> "manually installed"),
closes: #438136.
*

Otavio Salvador лет назад: 18
Родитель
Сommit
da543ed87d
3 измененных файлов с 10 добавлено и 4 удалено
  1. 2 2
      apt-pkg/algorithms.cc
  2. 1 1
      cmdline/apt-get.cc
  3. 7 1
      debian/changelog

+ 2 - 2
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);
 	 }

+ 1 - 1
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++;

+ 7 - 1
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