summaryrefslogtreecommitdiff
path: root/debian/control
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2010-03-14 16:47:48 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2010-03-14 16:47:48 +0100
commita7307a8727c85b0166339a54fb14ba3812f7a608 (patch)
treee576e87289b2fbf4f3f421c0b5495636eb6992b0 /debian/control
parentea5624c3d04c35f5a269b6f7431c135330c9b9b5 (diff)
parentb14f32f9b8c406706fd7735ffb13ae5c377baefe (diff)
merge with debian-sid, update-po for manpages and fix a few more
typos in doc/po/es.po to generate the manpages properly. [ Christian Perrier ] * German translation update. Closes: #571037 * Spanish manpages translation update. Closes: #573293 [ Julian Andres Klode ] * cmdline/apt-mark: - Use the new python-apt API (and conflict with python-apt << 0.7.93.2). * apt-inst/contrib/arfile.h: - Add public ARArchive::Members() which returns the list of members. * debian/rules: - Fix the libraries name to be e.g. libapt-pkg4.9 instead of libapt-pkg-4.9.
Diffstat (limited to 'debian/control')
-rw-r--r--debian/control1
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/control b/debian/control
index daff242f0..0cf092c25 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Package: apt
Architecture: any
Depends: ${shlibs:Depends}, debian-archive-keyring, ${misc:Depends}
Provides: ${libapt-pkg:provides}
+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
This is Debian's next generation front-end for the dpkg package manager.