debian/changelog | 3 +-- debian/control | 1 - 2 files changed, 1 insertion(+), 3 deletions(-)
New commits: commit 3d445fddff15ea7e108ba577f44df5b3853976e3 Author: Timo Aaltonen <[EMAIL PROTECTED]> Date: Sat May 19 14:12:22 2007 +0300 Remove Conflicts:, which shouldn't be necessary. diff --git a/debian/changelog b/debian/changelog index 4eea4ba..668413d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,7 @@ xauth (1:1.0.2-1) UNRELEASED; urgency=low - Rename Package and Source. - Remove unnecessary Build-Deps. - Modify description. - - Conflicts/Replaces: xbase-clients (<= 1:7.2.ds2-3) to make - upgrades smoother. + - Replaces: xbase-clients (<= 1:7.2.ds2-3) to make upgrades smoother. * debian/copyright: Leave only copyright notices that relate to this package. * debian/xauth.install, rules: Edit to reflect new packaging. diff --git a/debian/control b/debian/control index a1d085e..2002144 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,6 @@ Package: xauth Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, cpp Pre-Depends: x11-common (>= 1:7.0.0) -Conflicts: xbase-clients (<= 1:7.2.ds2-3) Replaces: xbase-clients (<= 1:7.2.ds2-3) Suggests: pdksh Description: X authentication utility -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]