diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2007-12-08 12:15:21 -0200 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2007-12-08 12:15:21 -0200 |
| commit | f6c702eba601aa3ecf253d1a4d9119949a0a2cf9 (patch) | |
| tree | 4ddf00495dfb907654fd831db4ea28b911688c79 | |
| parent | b5a6232deec3c55a3fb925aab67527f42716b278 (diff) | |
* Applied patch from Alexander Winston <alexander.winston@comcast.net>
to use 'min' as symbol for minute, closes: #219034.
| -rw-r--r-- | apt-pkg/contrib/strutl.cc | 6 | ||||
| -rw-r--r-- | debian/changelog | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 006452af4..a04c266ba 100644 --- 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 4db756063..1429623a0 100644 --- 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 |