From d6a62c26e674c219357de1a6e3b58234510eba65 Mon Sep 17 00:00:00 2001 From: dpash Date: Wed, 14 Dec 2005 08:38:42 +0000 Subject: [PATCH] Fix the Conflicts and Replaces line for sarge backporting Remove the irssi-snapshot dummy packages as they weren't needed for Sid. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4164 dbcabf3a-b0e7-0310-adc4-f8d773084564 --- debian/changelog | 7 +++++++ debian/control | 22 ++++------------------ 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index ba373768..93f61e47 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +irssi (0.8.10-2) unstable; urgency=low + + * Not uploaded to Debian (work in progress) + * Fix Conflicts and Replaces lines to make backporting to sarge easier + + -- David Pashley Wed, 14 Dec 2005 08:40:18 +0000 + irssi (0.8.10-1) unstable; urgency=low * new upstream release diff --git a/debian/control b/debian/control index 32659e85..e56dedda 100644 --- a/debian/control +++ b/debian/control @@ -9,8 +9,8 @@ Package: irssi Architecture: any Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, perl-base(>= 5.8.1) Suggests: irssi-scripts (>= 2) -Conflicts: irssi-scripts (= 1), irssi-common, irssi-text (<= 0.8.9-3.1), irssi-snapshot ( <= 0.8.9-3.1) -Replaces: irssi-scripts (<= 8), irssi-text (<= 0.8.9-3.1), irssi-snapshot ( <= 0.8.9-3.1) +Conflicts: irssi-scripts (= 1), irssi-common, irssi-text (<= 0.8.9-3.1), irssi-snapshot (<= 0.8.9-3.1) +Replaces: irssi-scripts (<= 8), irssi-text (<= 0.8.9-3.1), irssi-snapshot (<= 0.8.9-3.1) Provides: irssi-text, irssi-snapshot Description: text-mode version of the irssi IRC client Irssi is an IRC client from the author of yagirc, Timo Sirainen. It has a @@ -26,8 +26,8 @@ Description: text-mode version of the irssi IRC client Package: irssi-dev Architecture: any Depends: irssi -Conflicts: irssi-snapshot-dev ( <= 0.8.6+cvs.20031114-1) -Replaces: irssi-snapshot-dev ( <= 0.8.6+cvs.20031114-1) +Conflicts: irssi-snapshot-dev (<= 0.8.6+cvs.20031114-1) +Replaces: irssi-snapshot-dev (<= 0.8.6+cvs.20031114-1) Provides: irssi-snapshot-dev Description: text-mode version of the irssi IRC client development files Irssi is an IRC client from the author of yagirc, Timo Sirainen. It has a @@ -43,17 +43,3 @@ Depends: irssi Description: irssi dummy transition package This is a dummy transition package from irssi-text and is safe to remove. - -Package: irssi-snapshot -Architecture: any -Depends: irssi -Description: irssi dummy transition package - This is a dummy transition package from irssi-snapshot and is safe to - remove. - -Package: irssi-snapshot-dev -Architecture: any -Depends: irssi-dev -Description: irssi dummy transition package - This is a dummy transition package from irssi-snapshot-dev and is safe - to remove.