merged from debian-sid

diff --combined debian/changelog
index 854bec8,1429623..671145f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -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,30 -9,23 +9,36 @@@
      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:
 +    - fix error output
 +  * apt-pkg/acquire-item.{cc,h}:
 +    - make the authentication download code more robust against
 +      servers/proxies with broken If-Range implementations
 +
 +  [ Chris Cheney ]
 +  * ftparchive/contents.cc:
 +    - support lzma data members
 +  * 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