diff options
| author | bubulle@debian.org <> | 2010-03-19 10:19:15 +0700 |
|---|---|---|
| committer | bubulle@debian.org <> | 2010-03-19 10:19:15 +0700 |
| commit | 9f240996cf1c5c10b5cdcca3b59a302d28e49608 (patch) | |
| tree | b467653e85b2bf88c923d9e716461c0b9d5d9166 /debian | |
| parent | cbc82092fa943fece47a973ba7582f6b14d7d4e8 (diff) | |
| download | apt-9f240996cf1c5c10b5cdcca3b59a302d28e49608.tar.gz | |
Add conflict with manpages-pl
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 96f29268c..24bea801d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ apt (0.7.26~exp3) UNRELEASED; urgency=low * Spanish manpages translation update. Closes: #573293 * Dutch translation update. Closes: #573946 * Polish manpages translation update. Closes: #574558 + * Add "manpages-pl (<< 20060617-3~)" to avoid file conflicts with + that package that was providing some manpages for APT utilities. [ Julian Andres Klode ] * cmdline/apt-mark: diff --git a/debian/control b/debian/control index c2b6c17a5..9cd3888b1 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Package: apt Architecture: any Depends: ${shlibs:Depends}, debian-archive-keyring, ${misc:Depends} -Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) +Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7), manpages-pl (<< 20060617-3~) Provides: ${libapt-pkg:provides} Conflicts: python-apt (<< 0.7.93.2~) Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt |