diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-05-02 09:40:26 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-05-02 09:40:26 +0200 |
| commit | f4fd0a1c34babf8fbac71bc3471b41b411e414b2 (patch) | |
| tree | 505cc791de97dbfd8d1f979c651bb3336f69028a /debian/control | |
| parent | ecc8d43394155ea99960f66ed35713c701801c3f (diff) | |
| parent | a63bbd7e93ec5e231d5d9b0b33cffec5cf6192d0 (diff) | |
* merged from the debian-sid bzr branch
* apt-pkg/depcache.cc:
- Really release action groups only once (Closes: #622744)
- Make purge work again for config-files (LP: #244598) (Closes: #150831)
* debian/apt.cron.daily:
- Check power after wait, patch by manuel-soto (LP: #705269)
* debian/control:
- Move ${shlibs:Depends} to Pre-Depends, as we do not want APT
unpacked if a library is too old and thus break upgrades
* doc/apt-key.8.xml:
- Document apt-key net-update (LP: #192810)
* apt-pkg/acquire-item.cc:
- Only try to rename existing Release files (Closes: #622912)
* apt-pkg/indexcopy.cc:
- Use RealFileExists() instead of FileExists(), allows amongst other
things a directory named Sources to exist on a CD-ROM (LP: #750694).
* apt-pkg/acquire-item.cc:
- Use Release files even if they cannot be verified (LP: #704595)
* cmdline/apt-get.cc:
- Do not install recommends for build-dep (Closes: #454479) (LP: #245273)
* apt-pkg/deb/deblistparser.cc:
- Handle no space before "[" in build-dependencies (LP: #72344)
* apt-pkg/policy.cc:
- Allow pinning by glob() expressions, and regular expressions
surrounded by slashes (the "/" character) (LP: #399474)
(Closes: #121132)
* debian/control:
- Set Standards-Version to 3.9.2
* mirror method:
- do not crash if the mirror file fails to download
* apt-pkg/aptconfiguration.cc:
- fix comparing for a empty string
* debian/apt.cron.daily:
- run unattended-upgrades even if there was a error during
the apt-get update (LP: #676295)
* apt-pkg/pkgcache.cc:
- use the native Architecture stored in the cache header instead of
loading it from configuration as suggested by Julian Andres Klode
Diffstat (limited to 'debian/control')
| -rw-r--r-- | debian/control | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/control b/debian/control index 36573da4b..e966c1e34 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org> Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>, Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>, Julian Andres Klode <jak@debian.org> -Standards-Version: 3.9.0 +Standards-Version: 3.9.2 Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 7.2.3~), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen Build-Conflicts: autoconf2.13, automake1.4 Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ @@ -14,10 +14,10 @@ Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/ Package: apt Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, gnupg Replaces: manpages-pl (<< 20060617-3~) Provides: ${libapt-pkg:provides} -Recommends: ubuntu-keyring, gpg +Recommends: ubuntu-keyring Conflicts: python-apt (<< 0.7.93.2~) Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt Description: Advanced front-end for dpkg |