* Applied patch from Alexander Winston <alexander.winston@comcast.net>

  to use 'min' as symbol for minute, closes: #219034.

diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index 006452af4888e786401c956c63b852a865508c1e..a04c266ba1e9db9d378415e93d9472490c39bd26 100644 (file)
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -331,19 +331,19 @@ string TimeToStr(unsigned long Sec)
    {
       if (Sec > 60*60*24)
       {
-        sprintf(S,"%lid %lih%lim%lis",Sec/60/60/24,(Sec/60/60) % 24,(Sec/60) % 60,Sec % 60);
+        sprintf(S,"%lid %lih%limin%lis",Sec/60/60/24,(Sec/60/60) % 24,(Sec/60) % 60,Sec % 60);
         break;
       }
       
       if (Sec > 60*60)
       {
-        sprintf(S,"%lih%lim%lis",Sec/60/60,(Sec/60) % 60,Sec % 60);
+        sprintf(S,"%lih%limin%lis",Sec/60/60,(Sec/60) % 60,Sec % 60);
         break;
       }
       
       if (Sec > 60)
       {
-        sprintf(S,"%lim%lis",Sec/60,Sec % 60);
+        sprintf(S,"%limin%lis",Sec/60,Sec % 60);
         break;
       }
       

diff --git a/debian/changelog b/debian/changelog
index 4db75606375db5398e6bb75646d23f6453b0d7c9..1429623a08e7f9ced0d4de02e63324810eec1616 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,10 +12,12 @@ apt (0.7.10) UNRELEASED; urgency=low
     with newest dpkg-shlibdeps changing the packaging building order and a
     patch from Robert Millan <rmh@aybabtu.com> to fix parallel building,
     closes: #452862.
+  * Applied patch from Alexander Winston <alexander.winston@comcast.net>
+    to use 'min' as symbol for minute, closes: #219034.
 
   [ Program translations ]
     - Basque updated. Closes: #453088
-  
+
   [ Michael Vogt ]
   * debian/rules
     - fix https install location
@@ -23,7 +25,7 @@ apt (0.7.10) UNRELEASED; urgency=low
     - print warning if the cache can not be locked (closes: #454561),
       thanks to Bastian Kleineidam
 
- -- Michael Vogt <mvo@debian.org>  Thu, 06 Dec 2007 14:38:31 +0100
+ -- Otavio Salvador <otavio@ossystems.com.br>  Sat, 08 Dec 2007 12:13:58 -0200
 
 apt (0.7.9) unstable; urgency=low