* merged lp:~mvo/apt/history

  - this writes a /var/log/apt/history tagfile that contains details
    from the transaction (complements term.log)

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

diff --cc debian/changelog
index 53dfcce12e4f012a8e02ee688cfb6c156df8f921,c75ea227e0ee14b007ad64c93f0596be5cfa825f..eb50b4c78ea76edeefac897ba4d95f4d78c3ed79
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,4 +1,12 @@@
 -apt (0.7.25) UNRELEASED; urgency=low
++apt (0.7.25.1) UNRELEASED; urgency=low
++
++  * merged lp:~mvo/apt/history
++    - this writes a /var/log/apt/history tagfile that contains details
++      from the transaction (complements term.log)
++
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 18 Dec 2009 16:54:18 +0100
++
 +apt (0.7.25) unstable; urgency=low
  
    [ Christian Perrier ]
    * Fix apt-ftparchive(1) wrt description of the "-o" option.

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