diff options
| author | Michael Vogt <mvo@debian.org> | 2014-04-01 16:12:22 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-04-01 16:12:22 +0200 |
| commit | d13bb95849fd168200554972b4295c40933e2461 (patch) | |
| tree | 6a5044088b4164c29a76edbf34b30dfb4b7f52d1 /debian | |
| parent | 8a1c9010137a8c49d9808f2db34b9ee277138986 (diff) | |
| parent | c2d859fc8e2b2c74c3da5c722bd31b54d7020868 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/control b/debian/control index c9b1f4252..d780278bf 100644 --- a/debian/control +++ b/debian/control @@ -20,8 +20,8 @@ XS-Testsuite: autopkgtest Package: apt Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${apt:keyring}, gnupg -Replaces: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~) -Breaks: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~) +Replaces: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~), sun-java6-jdk, sun-java5-jdk +Breaks: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~), sun-java6-jdk, sun-java5-jdk Conflicts: python-apt (<< 0.7.93.2~) Suggests: aptitude | synaptic | wajig, dpkg-dev (>= 1.17.2), apt-doc, python-apt Description: commandline package manager |