Przeglądaj źródła

* Applied patch from Alexander Winston <alexander.winston@comcast.net>
to use 'min' as symbol for minute, closes: #219034.

Otavio Salvador 18 lat temu
rodzic
commit
f6c702eba6
2 zmienionych plików z 7 dodań i 5 usunięć
  1. 3 3
      apt-pkg/contrib/strutl.cc
  2. 4 2
      debian/changelog

+ 3 - 3
apt-pkg/contrib/strutl.cc

@@ -331,19 +331,19 @@ string TimeToStr(unsigned long Sec)
    {
    {
       if (Sec > 60*60*24)
       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;
 	 break;
       }
       }
       
       
       if (Sec > 60*60)
       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;
 	 break;
       }
       }
       
       
       if (Sec > 60)
       if (Sec > 60)
       {
       {
-	 sprintf(S,"%lim%lis",Sec/60,Sec % 60);
+	 sprintf(S,"%limin%lis",Sec/60,Sec % 60);
 	 break;
 	 break;
       }
       }
       
       

+ 4 - 2
debian/changelog

@@ -12,10 +12,12 @@ apt (0.7.10) UNRELEASED; urgency=low
     with newest dpkg-shlibdeps changing the packaging building order and a
     with newest dpkg-shlibdeps changing the packaging building order and a
     patch from Robert Millan <rmh@aybabtu.com> to fix parallel building,
     patch from Robert Millan <rmh@aybabtu.com> to fix parallel building,
     closes: #452862.
     closes: #452862.
+  * Applied patch from Alexander Winston <alexander.winston@comcast.net>
+    to use 'min' as symbol for minute, closes: #219034.
 
 
   [ Program translations ]
   [ Program translations ]
     - Basque updated. Closes: #453088
     - Basque updated. Closes: #453088
-  
+
   [ Michael Vogt ]
   [ Michael Vogt ]
   * debian/rules
   * debian/rules
     - fix https install location
     - 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),
     - print warning if the cache can not be locked (closes: #454561),
       thanks to Bastian Kleineidam
       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
 apt (0.7.9) unstable; urgency=low