diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2013-04-23 08:08:54 +0200 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2013-04-23 08:08:54 +0200 |
commit | 3444603f5ff2b4c4816e45e686e06e01df31cdc4 (patch) | |
tree | b0e63e9bc86ca6d39f6987381ca7bfa64e186048 /debian/control | |
parent | 52d5690b47bd4efe425fa23d9f6559bb44324cd1 (diff) | |
parent | 3278fe66567d149ea92c1afa78941f2bc3c71c85 (diff) |
merged debian-sid branch and resolved conflicts
Diffstat (limited to 'debian/control')
-rw-r--r-- | debian/control | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/control b/debian/control index 0a1b964ec..c46698ebe 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/ Package: apt Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, debian-archive-keyring, gnupg -Replaces: manpages-pl (<< 20060617-3~) +Replaces: manpages-pl (<< 20060617-3~), manpages-it Conflicts: python-apt (<< 0.7.93.2~) Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, xz-utils, python-apt Description: commandline package manager |