diff options
| author | Michael Vogt <mvo@debian.org> | 2014-04-10 09:39:35 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-04-10 09:39:35 +0200 |
| commit | a1a253e8be978998b66af62240a25864db2cc694 (patch) | |
| tree | 485efb6b77d063b08045153478e704e804242b7e /debian | |
| parent | 4c3722e3a74f183b331b0a782017ae442ca143fb (diff) | |
| parent | 5ff678f7a22bb3206f5e46fcbdd00e56cb44b99e (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 d780278bf..c5604bc0c 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~), sun-java6-jdk, sun-java5-jdk -Breaks: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~), sun-java6-jdk, sun-java5-jdk +Replaces: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~), sun-java6-jdk (>> 0), sun-java5-jdk (>> 0), openjdk-6-jdk (<< 6b24-1.11-0ubuntu1~) +Breaks: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~), sun-java6-jdk (>> 0), sun-java5-jdk (>> 0), openjdk-6-jdk (<< 6b24-1.11-0ubuntu1~) Conflicts: python-apt (<< 0.7.93.2~) Suggests: aptitude | synaptic | wajig, dpkg-dev (>= 1.17.2), apt-doc, python-apt Description: commandline package manager |