]> git.saurik.com Git - apt.git/commitdiff
* Applied patch from Peter Eisentraut <peter_e@gmx.net> to fix a
authorOtavio Salvador <otavio@ossystems.com.br>
Sun, 16 Dec 2007 20:35:58 +0000 (18:35 -0200)
committerOtavio Salvador <otavio@ossystems.com.br>
Sun, 16 Dec 2007 20:35:58 +0000 (18:35 -0200)
  grammatical error ("manual installed" -> "manually installed"),
  closes: #438136.
*

apt-pkg/algorithms.cc
cmdline/apt-get.cc
debian/changelog

index 62727a852fd01504e7cd27820913b153449f6231..158f9c258f4b1c6c973a6c2d2d29fc5c569f6c0e 100644 (file)
@@ -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);
         }
index 3bcacb293990fec7f76a9913520e9ad005c25835..486e995cc8343a7e93e6d0ab28f001bfa0699308 100644 (file)
@@ -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++;
index 8e3f9ab38d9a67a21c1e81145fb0cdaed52d0dcc..4c56aa901ca0515a2dfdab85a5fd0d77560ddb34 100644 (file)
@@ -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