From 129977045b1f04d017c5c7019461fb7a1d2a3892 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 8 Dec 2007 12:05:48 -0200 Subject: mark as unreleased since it has not been uploaded yet --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3154720e5..15d5235ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.7.10) unstable; urgency=low +apt (0.7.10) UNRELEASED; urgency=low [ Otavio Salvador ] * Applied patch from Mike O'Connor to add a manpage to -- cgit v1.2.3 From b5a6232deec3c55a3fb925aab67527f42716b278 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 8 Dec 2007 12:11:15 -0200 Subject: Amend patch from #452862 using a fix proposed by Robert Millan to fix parallel buildings --- debian/changelog | 3 ++- debian/rules | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 15d5235ea..4db756063 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,7 +9,8 @@ apt (0.7.10) UNRELEASED; urgency=low getting crazy when /dev/null is redirected to stdin (which breaks buildds), closes: #452858. * Applied patch from Aurelien Jarno to fix building - with newest dpkg-shlibdeps changing the packaging building order, + with newest dpkg-shlibdeps changing the packaging building order and a + patch from Robert Millan to fix parallel building, closes: #452862. [ Program translations ] diff --git a/debian/rules b/debian/rules index 5989934b4..006d2de8a 100755 --- a/debian/rules +++ b/debian/rules @@ -294,7 +294,7 @@ apt-utils: build debian/shlibs.local dh_md5sums -p$@ dh_builddeb -p$@ -apt-transport-https: build debian/shlibs.local +apt-transport-https: build debian/shlibs.local libapt-pkg-dev dh_testdir -p$@ dh_testroot -p$@ dh_clean -p$@ -k -- cgit v1.2.3 From f6c702eba601aa3ecf253d1a4d9119949a0a2cf9 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 8 Dec 2007 12:15:21 -0200 Subject: * Applied patch from Alexander Winston to use 'min' as symbol for minute, closes: #219034. --- apt-pkg/contrib/strutl.cc | 6 +++--- 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 to fix parallel building, closes: #452862. + * Applied patch from Alexander Winston + 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 Thu, 06 Dec 2007 14:38:31 +0100 + -- Otavio Salvador Sat, 08 Dec 2007 12:13:58 -0200 apt (0.7.9) unstable; urgency=low -- cgit v1.2.3