From 5c867d67269254dc44e18151c87f7192f7c88bfc Mon Sep 17 00:00:00 2001
From: dpash <dpash@dbcabf3a-b0e7-0310-adc4-f8d773084564>
Date: Thu, 13 Oct 2005 23:37:36 +0000
Subject: [PATCH]   * New upstream version   * Disable the GnuTLS patch for
 now.   * Added Provides, Replaces and Conflicts for irssi-text and
 irssi-snapshot

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4039 dbcabf3a-b0e7-0310-adc4-f8d773084564
---
 debian/changelog      | 8 ++++++++
 debian/control        | 8 ++++++--
 debian/patches/00list | 4 ++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 99b52051..7a5f0eaf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+irssi (0.8.10~rc6-1) unstable; urgency=low
+
+  * New upstream version
+  * Disable the GnuTLS patch for now.
+  * Added Provides, Replaces and Conflicts for irssi-text and irssi-snapshot 
+
+ -- David Pashley <david@davidpashley.com>  Fri, 14 Oct 2005 00:39:15 +0100
+
 irssi (0.8.10~rc5-1) unstable; urgency=low
 
   * Initial packaging to unify irssi-text and irssi-snapshot
diff --git a/debian/control b/debian/control
index 1f412e1d..55ed28c5 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,9 @@ 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
-Replaces: irssi-scripts (<= 8)
+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
  text, GTK and GNOME interface (with integration to the GNOME panel).
@@ -25,6 +26,9 @@ 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)
+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
  text, GTK and GNOME interface (with integration to the GNOME panel).
diff --git a/debian/patches/00list b/debian/patches/00list
index e5663620..cf72ec84 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,3 @@
 05upgrade-check-binary
-06gnutls-support
-07gnutls-support-automakery
+#06gnutls-support
+#07gnutls-support-automakery