Add conflict with manpages-pl

diff --git a/debian/changelog b/debian/changelog
index 96f29268cd963d100d9b08db51307638ffc1bc70..24bea801d6a199d3338fe6aa68bbe9324e269c83 100644 (file)
--- 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
   * 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:
 
   [ Julian Andres Klode ]
   * cmdline/apt-mark:

diff --git a/debian/control b/debian/control
index c2b6c17a52cbd95ff9271f72a7eca2c9011d4072..9cd3888b1be89aa7499947bf4769f7c62a86e572 100644 (file)
--- 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}
 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
 Provides: ${libapt-pkg:provides}
 Conflicts: python-apt (<< 0.7.93.2~)
 Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt