From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 3 Jan 2008 12:55:39 +0000 (+0100)
Subject: merged with apt--mvo
X-Git-Tag: 0.7.24ubuntu1~111
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/ed096a82b5ce995058951bfb74679ce1bc73fc01

merged with apt--mvo
---

ed096a82b5ce995058951bfb74679ce1bc73fc01
diff --cc debian/changelog
index 40882faa6,52625ee2d..34037f262
--- a/debian/changelog
+++ b/debian/changelog
@@@ -39,42 -36,6 +39,44 @@@ apt (0.7.9ubuntu2) hardy; urgency=lo
    * debian/apt.conf.daily:
      - print warning if the cache can not be locked (closes: #454561),
        thanks to Bastian Kleineidam
++  * debian/control:
++    - build against libdb-dev (instead of libdb4.4-dev)
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 03 Jan 2008 11:31:45 +0100
 +  
 +apt (0.7.9ubuntu1) hardy; urgency=low
 +
 +  * merged from http://bzr.debian.org/apt/apt/debian-sid/, remaining
 +    changes:
 +    - mirror download method (pending merge with debian)
 +    - no pdiff download by default (unsuitable for ubuntu)
 +    - no recommends-by-default yet
 +    - add "Original-Maintainer" field to tagfile
 +    - show warning on apt-get source if the package is maintained
 +      in a VCS (pedinging merge with debian)
 +    - use ubuntu-archive keyring instead of debians one
 +    - support metapackages section for autoremoval
 +    - debian maintainer field change
 +    - send ubuntu string in user-agent
 +  
 +  * Changes from the debian-sid bzr branch (but not uploaded to debian
 +    yet):
 +  
 +  [ 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.
 +
 +  [ Program translations ]
 +    - Basque updated. Closes: #453088
 +
 +  [ Michael Vogt ]
 +  * debian/rules
 +    - fix https install location
    * methods/gpgv.cc:
      - remove cruft code that caused timestamp/I-M-S issues
    * ftparchive/contents.cc:
@@@ -84,6 -43,12 +86,8 @@@
    * 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)
  
    [ Chris Cheney ]
    * ftparchive/contents.cc: