* merged the apt--DoListUpdate branch, this provides a common interface

  for "apt-get update" like operations for the frontends and also provides
  hooks to run stuff in APT::Update::{Pre,Post}-Invoke
* merged the apt--DoListUpdate branch, this provides a common interface
  for "apt-get update" like operations for the frontends and also provides
  hooks to run stuff in APT::Update::{Pre,Post}-Invoke

diff --cc apt-pkg/deb/dpkgpm.cc
index afedc3c,34e1664..8123a7a
--- 1/apt-pkg/deb/dpkgpm.cc
--- 2/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@@ -12,9 -12,9 +12,10 @@@
  #include <apt-pkg/error.h>
  #include <apt-pkg/configuration.h>
  #include <apt-pkg/depcache.h>
 +#include <apt-pkg/pkgrecords.h>
  #include <apt-pkg/strutl.h>
  #include <apti18n.h>
+ #include <apt-pkg/fileutl.h>
  
  #include <unistd.h>
  #include <stdlib.h>

diff --cc apt-pkg/deb/dpkgpm.h
Simple merge

diff --cc cmdline/apt-get.cc
Simple merge

diff --cc debian/changelog
index 34037f2,9f78d59..22555e5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,13 +1,14 @@@
 -apt (0.7.10) UNRELEASED; urgency=low
++apt (0.7.9ubuntu3) hardy; urgency=low
++
++  * merged the apt--DoListUpdate branch, this provides a common interface
++    for "apt-get update" like operations for the frontends and also provides
++    hooks to run stuff in APT::Update::{Pre,Post}-Invoke
++
++ -- Michael Vogt <egon@localhost.localdomain>  Mon, 07 Jan 2008 17:23:32 +0100
++
 +apt (0.7.9ubuntu2) hardy; urgency=low
  
    [ Otavio Salvador ]
 -  * Applied patch from Mike O'Connor <stew@vireo.org> to add a manpage to
 -    apt-mark, closes: #430207.
 -  * Applied patch from Andrei Popescu <andreimpopescu@gmail.com> to add a
 -    note about some frontends in apt.8 manpage, closes: #438545.
 -  * Applied patch from Aurelien Jarno <aurel32@debian.org> to avoid CPU
 -    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 and a
      patch from Robert Millan <rmh@aybabtu.com> to fix parallel building,
@@@ -86,8 -43,15 +94,11 @@@ apt (0.7.9ubuntu1) hardy; urgency=lo
    * apt-pkg/acquire-item.{cc,h}:
      - make the authentication download code more robust against
        servers/proxies with broken If-Range implementations
 -  * apt-pkg/packagemanager.{cc,h}:
 -    - propergate the Immediate flag to make hitting the 
 -      "E: Internal Error, Could not perform immediate configuration (2)"
 -      harder
    * debian/control:
      - build against libdb-dev (instead of libdb4.4-dev)
+   * merged the apt--DoListUpdate branch, this provides a common interface
+     for "apt-get update" like operations for the frontends and also provides
+     hooks to run stuff in APT::Update::{Pre,Post}-Invoke
  
    [ Chris Cheney ]
    * ftparchive/contents.cc:

diff --cc doc/examples/configure-index
Simple merge