merged from debian-sid

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/apt.cron.daily b/debian/apt.cron.daily
index 5524c16eef0482eeeb6ae49c3690bd6103327783..1d4df56b63ccd7a06f3633cc01d56e33ed3ec104 100644 (file)
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -172,6 +172,7 @@ fi
 
 # check if we can lock the cache and if the cache is clean
 if ! apt-get check -q -q 2>/dev/null; then
+    echo "$0: could not lock the APT cache"
     exit 1
 fi
 

diff --git a/debian/changelog b/debian/changelog
index 854bec8c665735e0a1df2dedc3bc553e654d2cf5..671145fdee001f1fe8dbdc619877430ef3825313 100644 (file)
--- 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 <stew@vireo.org> to add a manpage to
@@ -9,15 +9,21 @@ apt (0.7.10) unstable; urgency=low
     getting crazy when /dev/null is redirected to stdin (which breaks
     buildds), closes: #452858.
   * Applied patch from Aurelien Jarno <aurel32@debian.org> 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 <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
+  * debian/apt.conf.daily:
+    - print warning if the cache can not be locked (closes: #454561),
+      thanks to Bastian Kleineidam
   * methods/gpgv.cc:
     - remove cruft code that caused timestamp/I-M-S issues
   * ftparchive/contents.cc:
@@ -32,7 +38,7 @@ apt (0.7.10) unstable; urgency=low
   * ftparchive/multicompress.cc:
     - support lzma output
 
- -- Michael Vogt <mvo@debian.org>  Wed, 28 Nov 2007 17:10:49 +0100
+ -- Otavio Salvador <otavio@ossystems.com.br>  Sat, 08 Dec 2007 12:13:58 -0200
 
 apt (0.7.9) unstable; urgency=low
 

diff --git a/debian/rules b/debian/rules
index 5989934b4811403592d079cbd192c85f7395a8bc..006d2de8a61d3a68535aad60c4b6336091e4eccf 100755 (executable)
--- 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