diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2010-03-19 11:00:36 +0100 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2010-03-19 11:00:36 +0100 |
| commit | e234fa49da6ae970227358a4275d9bf4344c21b5 (patch) | |
| tree | 00797f87766d722cfe162af3b0c5bb07cfe6c401 /debian | |
| parent | 6083d5ec97c605df51633cf6522df1323f69c29c (diff) | |
| parent | 9f240996cf1c5c10b5cdcca3b59a302d28e49608 (diff) | |
merge with debian-sid to get new pl-manpage
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/control | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index cd5f2ae1b..d08bfb20c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,10 @@ apt (0.7.26) UNRELEASED; urgency=low [ Christian Perrier ] * German translation update. Closes: #571037 * 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. [ David Kalnischkies ] * [BREAK] merge MultiArch-ABI. We don't support MultiArch, diff --git a/debian/control b/debian/control index b7c3e5712..5843820d7 100644 --- a/debian/control +++ b/debian/control @@ -13,6 +13,7 @@ Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Package: apt Architecture: any Depends: ${shlibs:Depends}, debian-archive-keyring, ${misc:Depends} +Replaces: 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 |