diff options
| author | Michael Vogt <mvo@debian.org> | 2013-10-22 16:53:32 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-10-22 16:53:32 +0200 |
| commit | f62f17b489405432a3125e51471d8a00e78c5170 (patch) | |
| tree | ce2a6e077cb0846e75cbb3d583f4152608100adb /debian/control | |
| parent | 9aa9db9c88fca3a9266427b0d5cc9ad53df7207e (diff) | |
| parent | c08cf1dc784a98a253296a51433f6de7d16d3125 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
cmdline/apt-key
configure.ac
debian/apt.auto-removal.sh
debian/changelog
debian/control
debian/rules
po/apt-all.pot
po/ar.po
po/ast.po
po/bg.po
po/bs.po
po/ca.po
po/cs.po
po/cy.po
po/da.po
po/de.po
po/dz.po
po/el.po
po/es.po
po/eu.po
po/fi.po
po/fr.po
po/gl.po
po/hu.po
po/it.po
po/ja.po
po/km.po
po/ko.po
po/ku.po
po/lt.po
po/mr.po
po/nb.po
po/ne.po
po/nl.po
po/nn.po
po/pl.po
po/pt.po
po/pt_BR.po
po/ro.po
po/ru.po
po/sk.po
po/sl.po
po/sv.po
po/th.po
po/tl.po
po/uk.po
po/vi.po
po/zh_CN.po
po/zh_TW.po
Diffstat (limited to 'debian/control')
| -rw-r--r-- | debian/control | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/debian/control b/debian/control index e43a155f1..fef346843 100644 --- a/debian/control +++ b/debian/control @@ -3,10 +3,9 @@ Section: admin Priority: important Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> 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>, +Uploaders: Michael Vogt <mvo@debian.org>, Christian Perrier <bubulle@debian.org>, Julian Andres Klode <jak@debian.org> -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.4~), zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, @@ -19,7 +18,8 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=apt/apt.git Package: apt Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ubuntu-keyring, gnupg -Replaces: manpages-pl (<< 20060617-3~), manpages-it +Replaces: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~) +Breaks: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~) Conflicts: python-apt (<< 0.7.93.2~) Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, xz-utils, python-apt Description: commandline package manager @@ -42,9 +42,9 @@ Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: apt (<< 0.9.4~) +Breaks: apt (<< 0.9.4~), libapt-inst1.5 (<< 0.9.9~) Section: libs -Description: package managment runtime library +Description: package management runtime library This library provides the common functionality for searching and managing packages as well as information about packages. Higher-level package managers can depend upon this library. @@ -108,9 +108,9 @@ Package: apt-utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: xz-utils -Description: package managment related utility programs +Description: package management related utility programs This package contains some less used commandline utilities related - to package managment with APT. + to package management with APT. . * apt-extracttemplates is used by debconf to prompt for configuration questions before installation. |