summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-08-22 23:00:31 +0200
committerMichael Vogt <mvo@debian.org>2013-08-22 23:00:31 +0200
commit6fd51a5f4300f4b1563cdf2a34f59e6bbaacb838 (patch)
tree6469d9c9f58ebce2557a9689b8907752990734b3 /debian
parent329dea2d39d2518e43f0761c1c89990857e197ad (diff)
parent2510eea4a0922b7b6da8099deb70ca87851633ce (diff)
Merge branch 'debian/sid' of ssh://git.debian.org/git/apt/apt into debian/sid
Diffstat (limited to 'debian')
-rw-r--r--debian/control5
1 files changed, 3 insertions, 2 deletions
diff --git a/debian/control b/debian/control
index ca18ff01f..3c5d14fe8 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,8 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=apt/apt.git
Package: apt
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, debian-archive-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
@@ -41,7 +42,7 @@ 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 management runtime library
This library provides the common functionality for searching and