Index: .bzrignore
===================================================================
--- .bzrignore	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ .bzrignore	(revision b135438c4c6aeb5a7cd3403f0cf37e741d589cd3)
@@ -2,2 +2,3 @@
 config.h
 bitlbee
+debian
Index: Makefile
===================================================================
--- Makefile	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ Makefile	(revision b135438c4c6aeb5a7cd3403f0cf37e741d589cd3)
@@ -10,5 +10,5 @@
 
 # Program variables
-objects = account.o bitlbee.o commands.o conf.o crypting.o help.o ini.o irc.o log.o nick.o query.o set.o unix.o url.o user.o debug.o
+objects = account.o bitlbee.o commands.o conf.o crypting.o help.o ini.o irc.o log.o nick.o query.o set.o unix.o url.o user.o
 subdirs = protocols
 
Index: bitlbee.c
===================================================================
--- bitlbee.c	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ bitlbee.c	(revision b135438c4c6aeb5a7cd3403f0cf37e741d589cd3)
@@ -41,6 +41,4 @@
 		                     &size );
 	
-	count_io_event(source, "main");
-	
 	log_message( LOGLVL_INFO, "Creating new connection with fd %d.", new_socket );
 	irc_new( new_socket );
@@ -125,6 +123,4 @@
 	int st;
 	
-	count_io_event(source, "main");
-
 	if( condition & G_IO_ERR || condition & G_IO_HUP )
 	{
@@ -181,6 +177,4 @@
 	time_t newtime;
 #endif
-
-	count_io_event(source, "main");
 
 #ifdef FLOOD_SEND	
Index: bitlbee.h
===================================================================
--- bitlbee.h	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ bitlbee.h	(revision b135438c4c6aeb5a7cd3403f0cf37e741d589cd3)
@@ -107,5 +107,4 @@
 #include "help.h"
 #include "query.h"
-#include "debug.h"
 #include "sock.h"
 
Index: commands.c
===================================================================
--- commands.c	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ commands.c	(revision b135438c4c6aeb5a7cd3403f0cf37e741d589cd3)
@@ -52,5 +52,4 @@
 	{ "import_buddies", 1, cmd_import_buddies },
 	{ "qlist",          0, cmd_qlist },
-	{ "dump",	    0, cmd_dump },
 	{ NULL }
 };
@@ -785,9 +784,2 @@
 	return( 0 );
 }
-
-int cmd_dump( irc_t *irc, char **cmd ) {
-	write_io_activity();
-	irc_usermsg(irc, "Wrote GIO activity log to disk.");	
-	
-	return( 0 );
-}
Index: conf.c
===================================================================
--- conf.c	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ conf.c	(revision b135438c4c6aeb5a7cd3403f0cf37e741d589cd3)
@@ -2,5 +2,5 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2004 Wilmer van der Gaast and others                *
+  * Copyright 2002-2005 Wilmer van der Gaast and others                *
   \********************************************************************/
 
Index: bian/README.Debian
===================================================================
--- debian/README.Debian	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ 	(revision )
@@ -1,12 +1,0 @@
-Debconf should have asked you on what port you want BitlBee to run. If it
-did not, the port number is 6667 or 6668. (6668 if you already got an ircd
-running at 6667)
-
-Fire up your favourite IRC client and connect to localhost:6667 (or 6668),
-and read the documentation (type help for a list of commands).
-
-Have fun!
-
-The /usr/share/doc/bitlbee/examples/ directory contains some programs and
-scripts you might like or need. They're not really examples but it's quite
-normal behaviour to put small contrib stuff like that in there.
Index: bian/bitlbee.conffiles
===================================================================
--- debian/bitlbee.conffiles	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ 	(revision )
@@ -1,2 +1,0 @@
-/etc/bitlbee/motd.txt
-/etc/bitlbee/bitlbee.conf
Index: bian/bitlbee.config
===================================================================
--- debian/bitlbee.config	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ 	(revision )
@@ -1,19 +1,0 @@
-#!/bin/sh -e
-
-. /usr/share/debconf/confmodule
-
-db_title BitlBee
-
-db_get bitlbee/serveport
-if [ "$RET" = "stillhavetoask" ]; then
-	if netstat -ltn | grep ':6667' 2> /dev/null > /dev/null; then
-		port=6668;
-	else
-		port=6667;
-	fi
-	db_set bitlbee/serveport $port;
-fi
-
-if db_input medium bitlbee/serveport; then
-	db_go;
-fi
Index: bian/bitlbee.postinst
===================================================================
--- debian/bitlbee.postinst	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ 	(revision )
@@ -1,22 +1,0 @@
-#!/bin/sh -e
-
-. /usr/share/debconf/confmodule
-
-db_get bitlbee/serveport
-PORT="$RET"
-
-TCPD='/usr/sbin/tcpd'
-CONFDIR=/var/lib/bitlbee/
-
-update-inetd --remove '/usr/sbin/bitlbee.*$'
-if [ -n "$PORT" ]; then
-	update-inetd --group OTHER --add "$PORT"'\tstream\ttcp\tnowait\tbitlbee\t'"$TCPD"'\t/usr/sbin/bitlbee'
-fi
-
-if [ -d $CONFDIR ] && chown bitlbee $CONFDIR; then
-	echo 'BitlBee (probably) already installed, skipping user/configdir installation'
-	exit 0;
-fi
-
-adduser --system --home /var/lib/bitlbee/ --disabled-login --disabled-password bitlbee
-chmod 700 /var/lib/bitlbee/
Index: bian/bitlbee.postrm
===================================================================
--- debian/bitlbee.postrm	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ 	(revision )
@@ -1,12 +1,0 @@
-#!/bin/sh -e
-
-[ "$1" = "purge" ] || exit 0
-
-if [ -e /usr/share/debconf/confmodule ]; then
-	. /usr/share/debconf/confmodule;
-	db_purge;
-fi
-
-update-inetd --remove '/usr/sbin/bitlbee.*$'
-
-deluser --remove-home bitlbee || true
Index: bian/bitlbee.preinst
===================================================================
--- debian/bitlbee.preinst	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ 	(revision )
@@ -1,4 +1,0 @@
-#!/bin/sh -e
-
-## To prevent the help function from breaking in  currently running BitlBee processes
-rm -f /usr/share/bitlbee/help.txt
Index: bian/bitlbee.templates
===================================================================
--- debian/bitlbee.templates	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ 	(revision )
@@ -1,57 +1,0 @@
-Template: bitlbee/serveport
-Type: string
-Default: stillhavetoask
-Description: On what TCP port should BitlBee listen for connections?
- BitlBee normally listens on the regular IRC port, 6667. This might not be
- a very good idea when you're running a real IRC daemon as well. 6668 might
- be a good alternative. Leaving this value blank means that BitlBee will not
- be run automatically.
-Description-cs: Na kterém TCP portu má BitlBee naslouchat pøíchozím spojením?
- BitlBee normálnì naslouchá na bì¾ném IRC portu 6667. Pokud máte spu¹tìný i
- reálný IRC daemon, tak to nemusí být nejlep¹í nápad. Vhodná alternativa
- mù¾e být 6668. Ponecháte-li pole prázdné, znamená to, ¾e se BitlBee nebude
- spou¹tìt automaticky.
-Description-de: An welchem TCP-Port soll BitlBee auf Verbindungen warten?
- BitlBee lauscht normalerweise an dem üblichen IRC-Port 6667. Dies ist aber
- keine gute Idee, wenn Sie außerdem noch einen richtigen IRC-Dienst
- betreiben. Das Port 6668 ist eine gute Alternative. Wenn Sie keinen Wert
- eingeben, wird BitlBee nicht automatisch starten.
-Description-es: ¿En qué puerto TCP quiere que BitlBee escuche conexiones?
- BitlBee normalmente escucha en el puerto 6667, que se usa también para
- IRC. Por esta razón no es muy buena idea poner a BitlBee a escuchar en ese
- puerto si también se está ejecutando un demonio real de IRC, en este caso
- el puerto 6668 puede ser una buena alternativa. Si deja este valor en
- blanco BitlBee no se ejecutará automáticamente.
-Description-fr: Sur quel port TCP BitlBee doit-il être à l'écoute ?
- BitlBee est usuellement à l'écoute sur le port IRC standard : 6667. Cela
- n'est pas forcément un choix adapté si vous utilisez en même temps un vrai
- démon IRC. Dans ce cas, choisir 6668 est conseillé. Si vous ne souhaitez
- pas lancer BitlBee automatiquement, veuillez laissez ce champs vide.
-Description-ja: BitlBee ¤Ï¡¢ÀÜÂ³¤Î¤¿¤á¤Ë¤É¤Î TCP ¥Ý¡¼¥È¤ò listen ¤·¤Þ¤¹¤«?
- BitlBee ¤ÏÄÌ¾ï¤Î¾ì¹ç¡¢É¸½à¤Î IRC ¥Ý¡¼¥ÈÈÖ¹æ¤Ç¤¢¤ë 6667 ¤ò listen
- ¤·¤Þ¤¹¡£Æ±ÍÍ¤Ë¤·¤Æ¼ÂºÝ¤Î IRC
- ¥Ç¡¼¥â¥ó¤òÆ°ºî¤µ¤»¤Æ¤¤¤ë¾ì¹ç¡¢¤³¤ì¤Ï¤¢¤Þ¤êÎÉ¤¤¹Í¤¨¤Ç¤ÏÌµ¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£Âå¤ï¤ê¤Ë
- 6668 ¤ò»È¤¦¤Î¤¬ÎÉ¤¤¤«¤âÃÎ¤ì¤Þ¤»¤ó¡£¤³¤ì¤ò¶õ¤Î¤Þ¤Þ¤Ë¤·¤Æ¤ª¤±¤Ð¡¢BitlBee
- ¤Ï¼«Æ°Åª¤Ë¤Ïµ¯Æ°¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£
-Description-nl: Op welke TCP poort moet BitlBee draaien?
- Normaal 'luistert' BitlBee op de gebruikelijke IRC poort, 6667. Als je al
- een andere IRC daemon draait is dat onmogelijk. Kies dan bijvoorbeeld voor
- poort 6668. Als je niet wil dat BitlBee automatisch gestart wordt, vul
- hier dan niets in.
-Description-pt_BR: Em qual porta TCP o BitlBee deverá ouvir por conexões ?
- O BitlBee normalmente ouve na porta de IRC padrão, 6667. Porém, esta pode
- não ser uma boa idéia quando você está rodando um daemon IRC real também.
- 6689 pode ser uma boa alternativa. Deixar esse valor em branco significa
- que o BitlBee não será executado automaticamente.
-Description-sv: På vilken TCP-port ska BitlBee lyssna på efter anslutningar?
- BitlBee lyssnar normalt på den standardporten för IRC, 6667. Detta kanske
- inte är en bra ide om du kör en riktig IRC-daemon på samma system. 6668
- kan vara ett bra alternativ då. Lämnar du detta värde blankt betyder det
- att BitlBee inte kommer att startas automatiskt.
-Description-vi: TrÃ¬nh BitlBee nÃªn láº¯ng nghe sá»± káº¿t ná»i trÃªn cá»ng TCP nÃ o?
- TrÃ¬nh BitlBee thÆ°á»ng láº¯ng nghe trÃªn cá»ng IRC bÃ¬nh thÆ°á»ng,
- 6667. CÃ³ láº½ nÃ³ khÃ´ng pháº£i lÃ  má»t Ã½ kiáº¿n tá»t náº¿u báº¡n
- cÅ©ng cÃ³ cháº¡y má»t trÃ¬nh ná»n (dÃ¦mon) IRC tháº­t. NhÆ° tháº¿ thÃ¬,
- cá»ng 6668 cÃ³ thá» lÃ  má»t Äiá»u thay tháº¿ tá»t. Náº¿u báº¡n bá»
- giÃ¡ trá» nÃ y rá»ng, thÃ¬ trÃ¬nh BitlBee sáº½ khÃ´ng tá»± Äá»ng
- cháº¡y.
Index: bian/bitlbee.templates.master
===================================================================
--- debian/bitlbee.templates.master	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ 	(revision )
@@ -1,8 +1,0 @@
-Template: bitlbee/serveport
-Type: string
-Default: stillhavetoask
-_Description: On what TCP port should BitlBee listen for connections?
- BitlBee normally listens on the regular IRC port, 6667. This might not be
- a very good idea when you're running a real IRC daemon as well. 6668 might
- be a good alternative. Leaving this value blank means that BitlBee will not
- be run automatically.
Index: bian/changelog
===================================================================
--- debian/changelog	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ 	(revision )
@@ -1,235 +1,0 @@
-bitlbee (0.99-1) unstable; urgency=low
-
-  * Should build on Debian GNU/kFreeBSD now. (Closes: #336965)
-  * New upstream version.
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Thu,  3 Nov 2005 21:06:53 +0100
-
-bitlbee (0.93a-1) unstable; urgency=low
-
-  * Added Swedish and Spanish translations. (Closes: #333881, #331302)
-  * Changed debconf dependency. (Closes: #331762)
-  * Changed libgnutls dependency. (Closes: #335751)
-  * Fixed one crash-on-disconnect bug in the OSCAR module.
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Tue,  1 Nov 2005 18:25:56 +0100
-
-bitlbee (0.92-2) unstable; urgency=low
-
-  * Added the patch that allows to connect to alternate Jabber servers.
-    Necessary for connecting to Google Talk. (Closes: #324832)
-  * Also possibly fixes some more problems with losing data when disk is
-    full.
-  * Added Vietnamese and Brazilian DebConf translations. Sorry for being
-    so late. (Closes: #297058, #313158)
-
- -- Wilmer van der Gaast <lintux@debian.org>  Thu,  8 Sep 2005 19:55:56 +0200
-
-bitlbee (0.92-1) unstable; urgency=low
-
-  * New upstream release.
-  * Implemented support for the IRC WATCH command and got rid of the
-    IRC_MAX_ARGS limit. (Closes: #283504)
-  * Added Czech translation. (Closes: #293615)
-
- -- Wilmer van der Gaast <lintux@debian.org>  Thu, 24 Feb 2005 17:11:32 +0100
-
-bitlbee (0.91-3) unstable; urgency=low
-
-  * Fixed a small bug in postrm which caused problems when removing/upgrading.
-
- -- Wilmer van der Gaast <lintux@debian.org>  Sun, 10 Oct 2004 08:59:52 +0200
-
-bitlbee (0.91-2) unstable; urgency=low
-
-  * Removed the part that messes with tcpd configuration files because it
-    causes troubles for some people and because it's no problem for users
-    to edit those files by hand. (Closes: #275418)
-    When upgrading from previous versions, the bitlbee line won't be removed
-    from your tcpd conffiles. (This is only done when purging a BitlBee
-    install) You don't have to worry about BitlBee suddenly opening for the
-    whole world because of the removal of this feature.
-  * Updated German translation. (Closes: #274655)
-  * Removed the unreliable check for an existing BitlBee installation (a
-    /etc/passwd grep) and replaced it with something more reliable.
-
- -- Wilmer van der Gaast <lintux@debian.org>  Sat,  9 Oct 2004 19:06:33 +0200
-
-bitlbee (0.91-1) unstable; urgency=low
-
-  * info-command works for Jabber connections now. (Closes: #232712)
-  * Saner code for duplicate nickname prevention. (Closes: #234285)
-  * Support for Jabber connections over SSL. (Closes: #252458)
-  * If the user chooses for noinetd.conf installation, this setting is now
-    remembered during reinstalls. (Closes: #260533)
-  * An up-to-date Japanse DebConf template. (Closes: #271091)
-
- -- Wilmer van der Gaast <lintux@debian.org>  Sat, 25 Sep 2004 18:18:17 +0200
-
-bitlbee (0.90a-2) unstable; urgency=low
-
-  * Using libgnutls11 now. (Closes: #264740)
-  * postinst no longer appends newlines to hosts.* because grep already
-    makes sure the last line is terminated with a newline. (Closes: #253278)
-  * Added Japanese DebConf templates. (Closes: #259801)
-  * Installing BitlBee in inetd.conf is now optional. (Closes: #260533)
-
- -- Wilmer van der Gaast <lintux@debian.org>  Mon,  6 Sep 2004 20:04:22 +0200
-
-bitlbee (0.90a-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Wilmer van der Gaast <lintux@debian.org>  Mon, 28 Jun 2004 20:30:26 +0200
-
-bitlbee (0.90-1) unstable; urgency=low
-
-  * New upstream release.
-  * Added German DebConf translation. (Closes: #250787)
-
- -- Wilmer van der Gaast <lintux@debian.org>  Sat, 29 May 2004 11:51:56 +0200
-
-bitlbee (0.85a-1) unstable; urgency=low
-
-  * New upstream release. This one should fix build problems on arm.
-
- -- Wilmer van der Gaast <lintux@debian.org>  Thu, 25 Mar 2004 00:12:33 +0100
-
-bitlbee (0.85-1) unstable; urgency=low
-
-  * New upstream release.
-  * This version has a command line switch to specify alternate configuration
-    files/settings directories. (Closes: #207060)
-
- -- Wilmer van der Gaast <lintux@debian.org>  Sat, 13 Mar 2004 22:19:35 +0100
-
-bitlbee (0.84-2) unstable; urgency=low
-
-  * Converted debconf templates to po2debconf format, without breaking
-    building on older (non-po2debconf) systems. Thanks to Martin Quinson.
-    (Closes: #205816)
-  * Added French debconf templates. Thanks to Christian Perrier.
-    (Closes: #206593)
-
- -- Wilmer van der Gaast <lintux@debian.org>  Wed,  3 Mar 2004 21:19:12 +0100
-
-bitlbee (0.84-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Wilmer van der Gaast <lintux@debian.org>  Fri, 13 Feb 2004 20:13:53 +0100
-
-bitlbee (0.83-2) unstable; urgency=low
-
-  * Removed libsoup dependency, BitlBee now uses libgnutls directly.
-    (Closes: #208475, #230895)
-  * Now including preprocessed documentation files to save some time on
-    slow buildd's (and fix build problems on archs without a working
-    sgmltools package).
-
- -- Wilmer van der Gaast <lintux@debian.org>  Fri,  6 Feb 2004 01:26:27 +0100
-
-bitlbee (0.83-1) unstable; urgency=low
-
-  * Added bitlbee.conf to conffiles. Should've done that before, sorry.
-  * Sorry, still with MSN support disabled, because Debian's default
-    libsoup package won't work with BitlBee-MSN.
-
- -- Wilmer van der Gaast <lintux@debian.org>  Wed, 31 Dec 2003 00:56:57 +0100
-
-bitlbee (0.82-1) unstable; urgency=low
-
-  * New upstream release.
-  * Disabled MSN support in the Debian version for now, because it needs
-    a patched version of libsoup. If you want MSN support, you'll have to
-    create one yourself and install a patched version of libsoup.
-
- -- Wilmer van der Gaast <lintux@debian.org>  Fri, 31 Oct 2003 21:51:01 +0100
-
-bitlbee (0.81a-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Wilmer van der Gaast <lintux@debian.org>  Wed, 16 Oct 2003 16:21:31 +0200
-
-bitlbee (0.81-1) unstable; urgency=low
-
-  * New upstream release.
-  * Fixes Yahoo! problems. (Closes: #213876)
-
- -- Wilmer van der Gaast <lintux@debian.org>  Wed, 15 Oct 2003 16:00:00 +0200
-
-bitlbee (0.80-1) unstable; urgency=low
-
-  * New upstream release.
-  * preinst now unlinks the old helpfile while upgrading, see README.Debian
-    for details.
-  * 'Upgraded' to standards 3.5.9.
-  * "jabber: Non-ascii away messages not supported" patch included.
-    (Closes: #195852)
-
- -- Wilmer van der Gaast <lintux@debian.org>  Tue, 24 Jun 2003 20:00:00 +0200
-
-bitlbee (0.74a-1) unstable; urgency=low
-
-  * This one actually does contain the bugfix 0.74 should've had.
-
- -- Wilmer van der Gaast <lintux@debian.org>  Wed, 11 Jun 2003 13:44:01 +0200
-
-bitlbee (0.74-1) unstable; urgency=high
-
-  * Security release, fixing a little not-too-dangerous security bug.
-
- -- Wilmer van der Gaast <lintux@debian.org>  Tue, 10 Jun 2003 22:50:19 +0200
-
-bitlbee (0.73-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Wilmer van der Gaast <lintux@debian.org>  Sun, 13 Apr 2003 01:20:49 +0200
-
-bitlbee (0.72-2) unstable; urgency=low
-
-  * Now uses '127.0.0.1' as default for hosts.allow instead of 'localhost'.
-    (Closes: #174219)
-  * Fixed some other portability issues. (Closes: #177394)
-  * Added w3m builddep, needed for .txt documentation generation.
-  * Removed jadetex builddep because it seems not to be necessary after all.
-
- -- Wilmer van der Gaast <lintux@debian.org>  Tue, 21 Jan 2003 01:35:46 +0100
-
-bitlbee (0.72-1) unstable; urgency=low
-
-  * BitlBee doesn't have tcpd in it anymore; external tcpd is used now.
-  * Added an examples/ directory.
-  * Fixed arm/ppc/s390 portability issue on char signedness. (Closes: #161026)
-
- -- Wilmer van der Gaast <lintux@debian.org>  Thu, 19 Dec 2002 00:24:29 +0100
-
-bitlbee (0.71-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Wilmer van der Gaast <lintux@debian.org>  Mon, 16 Sep 2002 01:02:09 +0200
-
-bitlbee (0.7-2) unstable; urgency=low
-
-  * Second try at a good upload.
-
- -- Wilmer van der Gaast <lintux@debian.org>  Thu, 15 Aug 2002 20:14:54 +0200
-
-bitlbee (0.7-1) unstable; urgency=low
-
-  * First public release. (Closes: #153190)
-
- -- Wilmer van der Gaast <lintux@debian.org>  Sat, 10 Aug 2002 04:47:07 +0200
-
-bitlbee (0.6-1) unstable; urgency=low
-
-  * Initial Release. (Testing only, not for release.)
-
- -- Wilmer van der Gaast <lintux@debian.org>  Wed, 10 Jul 2002 11:02:28 +0200
-
-Local variables:
-mode: debian-changelog
-End:
Index: bian/control
===================================================================
--- debian/control	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ 	(revision )
@@ -1,13 +1,0 @@
-Source: bitlbee
-Section: net
-Priority: optional
-Maintainer: Wilmer van der Gaast <wilmer@gaast.net>
-Standards-Version: 3.5.9
-Build-Depends: libglib2.0-dev | libglib-dev, libgnutls-dev | libnss-dev (>= 1.6), debconf-2.0
-
-Package: bitlbee
-Architecture: any
-Depends: ${shlibs:Depends}, adduser, netbase, netkit-inetd, net-tools, ${debconf-depends}, debianutils (>= 1.16), tcpd
-Description: An IRC to other chat networks gateway
- This program can be used as an IRC server which forwards everything you
- say to people on other chat networks: Jabber, ICQ, AIM, MSN and Yahoo.
Index: bian/copyright
===================================================================
--- debian/copyright	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ 	(revision )
@@ -1,895 +1,0 @@
-This package was debianized by Wilmer van der Gaast <lintux@debian.org> on
-Mon,  8 Jul 2002 13:17:42 +0200.
-
-The source can be downloaded from http://www.bitlbee.org/
-
-Authors: Wilmer van der Gaast, Sjoerd Hemminga, Jelmer Vernooij,
-         Maurits Dijkstra and others.
-
-Mainly Copyright 2002-2004 Wilmer van der Gaast.
-Some parts are borrowed from Gaim (version 0.58) <http://gaim.sf.net/>.
-For the copyrights on those parts, please read the Gaim source code.
-
-BitlBee License:
-
-============================================================================
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License with
-  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  Suite 330, Boston, MA  02111-1307  USA
-============================================================================
-
-
-
-Parts of the program (parts of the Jabber module, the XML parser to be more
-specific) are licensed under the Mozilla license (version 1.1):
-
-============================================================================
-                          MOZILLA PUBLIC LICENSE
-                                Version 1.1
-
-                              ---------------
-
-1. Definitions.
-
-     1.0.1. "Commercial Use" means distribution or otherwise making the
-     Covered Code available to a third party.
-
-     1.1. "Contributor" means each entity that creates or contributes to
-     the creation of Modifications.
-
-     1.2. "Contributor Version" means the combination of the Original
-     Code, prior Modifications used by a Contributor, and the Modifications
-     made by that particular Contributor.
-
-     1.3. "Covered Code" means the Original Code or Modifications or the
-     combination of the Original Code and Modifications, in each case
-     including portions thereof.
-
-     1.4. "Electronic Distribution Mechanism" means a mechanism generally
-     accepted in the software development community for the electronic
-     transfer of data.
-
-     1.5. "Executable" means Covered Code in any form other than Source
-     Code.
-
-     1.6. "Initial Developer" means the individual or entity identified
-     as the Initial Developer in the Source Code notice required by Exhibit
-     A.
-
-     1.7. "Larger Work" means a work which combines Covered Code or
-     portions thereof with code not governed by the terms of this License.
-
-     1.8. "License" means this document.
-
-     1.8.1. "Licensable" means having the right to grant, to the maximum
-     extent possible, whether at the time of the initial grant or
-     subsequently acquired, any and all of the rights conveyed herein.
-
-     1.9. "Modifications" means any addition to or deletion from the
-     substance or structure of either the Original Code or any previous
-     Modifications. When Covered Code is released as a series of files, a
-     Modification is:
-          A. Any addition to or deletion from the contents of a file
-          containing Original Code or previous Modifications.
-
-          B. Any new file that contains any part of the Original Code or
-          previous Modifications.
-
-     1.10. "Original Code" means Source Code of computer software code
-     which is described in the Source Code notice required by Exhibit A as
-     Original Code, and which, at the time of its release under this
-     License is not already Covered Code governed by this License.
-
-     1.10.1. "Patent Claims" means any patent claim(s), now owned or
-     hereafter acquired, including without limitation,  method, process,
-     and apparatus claims, in any patent Licensable by grantor.
-
-     1.11. "Source Code" means the preferred form of the Covered Code for
-     making modifications to it, including all modules it contains, plus
-     any associated interface definition files, scripts used to control
-     compilation and installation of an Executable, or source code
-     differential comparisons against either the Original Code or another
-     well known, available Covered Code of the Contributor's choice. The
-     Source Code can be in a compressed or archival form, provided the
-     appropriate decompression or de-archiving software is widely available
-     for no charge.
-
-     1.12. "You" (or "Your")  means an individual or a legal entity
-     exercising rights under, and complying with all of the terms of, this
-     License or a future version of this License issued under Section 6.1.
-     For legal entities, "You" includes any entity which controls, is
-     controlled by, or is under common control with You. For purposes of
-     this definition, "control" means (a) the power, direct or indirect,
-     to cause the direction or management of such entity, whether by
-     contract or otherwise, or (b) ownership of more than fifty percent
-     (50%) of the outstanding shares or beneficial ownership of such
-     entity.
-
-2. Source Code License.
-
-     2.1. The Initial Developer Grant.
-     The Initial Developer hereby grants You a world-wide, royalty-free,
-     non-exclusive license, subject to third party intellectual property
-     claims:
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Initial Developer to use, reproduce,
-          modify, display, perform, sublicense and distribute the Original
-          Code (or portions thereof) with or without Modifications, and/or
-          as part of a Larger Work; and
-
-          (b) under Patents Claims infringed by the making, using or
-          selling of Original Code, to make, have made, use, practice,
-          sell, and offer for sale, and/or otherwise dispose of the
-          Original Code (or portions thereof).
-
-          (c) the licenses granted in this Section 2.1(a) and (b) are
-          effective on the date Initial Developer first distributes
-          Original Code under the terms of this License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: 1) for code that You delete from the Original Code; 2)
-          separate from the Original Code;  or 3) for infringements caused
-          by: i) the modification of the Original Code or ii) the
-          combination of the Original Code with other software or devices.
-
-     2.2. Contributor Grant.
-     Subject to third party intellectual property claims, each Contributor
-     hereby grants You a world-wide, royalty-free, non-exclusive license
-
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor, to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications
-          created by such Contributor (or portions thereof) either on an
-          unmodified basis, with other Modifications, as Covered Code
-          and/or as part of a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or
-          selling of  Modifications made by that Contributor either alone
-          and/or in combination with its Contributor Version (or portions
-          of such combination), to make, use, sell, offer for sale, have
-          made, and/or otherwise dispose of: 1) Modifications made by that
-          Contributor (or portions thereof); and 2) the combination of
-          Modifications made by that Contributor with its Contributor
-          Version (or portions of such combination).
-
-          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-          effective on the date Contributor first makes Commercial Use of
-          the Covered Code.
-
-          (d)    Notwithstanding Section 2.2(b) above, no patent license is
-          granted: 1) for any code that Contributor has deleted from the
-          Contributor Version; 2)  separate from the Contributor Version;
-          3)  for infringements caused by: i) third party modifications of
-          Contributor Version or ii)  the combination of Modifications made
-          by that Contributor with other software  (except as part of the
-          Contributor Version) or other devices; or 4) under Patent Claims
-          infringed by Covered Code in the absence of Modifications made by
-          that Contributor.
-
-3. Distribution Obligations.
-
-     3.1. Application of License.
-     The Modifications which You create or to which You contribute are
-     governed by the terms of this License, including without limitation
-     Section 2.2. The Source Code version of Covered Code may be
-     distributed only under the terms of this License or a future version
-     of this License released under Section 6.1, and You must include a
-     copy of this License with every copy of the Source Code You
-     distribute. You may not offer or impose any terms on any Source Code
-     version that alters or restricts the applicable version of this
-     License or the recipients' rights hereunder. However, You may include
-     an additional document offering the additional rights described in
-     Section 3.5.
-
-     3.2. Availability of Source Code.
-     Any Modification which You create or to which You contribute must be
-     made available in Source Code form under the terms of this License
-     either on the same media as an Executable version or via an accepted
-     Electronic Distribution Mechanism to anyone to whom you made an
-     Executable version available; and if made available via Electronic
-     Distribution Mechanism, must remain available for at least twelve (12)
-     months after the date it initially became available, or at least six
-     (6) months after a subsequent version of that particular Modification
-     has been made available to such recipients. You are responsible for
-     ensuring that the Source Code version remains available even if the
-     Electronic Distribution Mechanism is maintained by a third party.
-
-     3.3. Description of Modifications.
-     You must cause all Covered Code to which You contribute to contain a
-     file documenting the changes You made to create that Covered Code and
-     the date of any change. You must include a prominent statement that
-     the Modification is derived, directly or indirectly, from Original
-     Code provided by the Initial Developer and including the name of the
-     Initial Developer in (a) the Source Code, and (b) in any notice in an
-     Executable version or related documentation in which You describe the
-     origin or ownership of the Covered Code.
-
-     3.4. Intellectual Property Matters
-          (a) Third Party Claims.
-          If Contributor has knowledge that a license under a third party's
-          intellectual property rights is required to exercise the rights
-          granted by such Contributor under Sections 2.1 or 2.2,
-          Contributor must include a text file with the Source Code
-          distribution titled "LEGAL" which describes the claim and the
-          party making the claim in sufficient detail that a recipient will
-          know whom to contact. If Contributor obtains such knowledge after
-          the Modification is made available as described in Section 3.2,
-          Contributor shall promptly modify the LEGAL file in all copies
-          Contributor makes available thereafter and shall take other steps
-          (such as notifying appropriate mailing lists or newsgroups)
-          reasonably calculated to inform those who received the Covered
-          Code that new knowledge has been obtained.
-
-          (b) Contributor APIs.
-          If Contributor's Modifications include an application programming
-          interface and Contributor has knowledge of patent licenses which
-          are reasonably necessary to implement that API, Contributor must
-          also include this information in the LEGAL file.
-
-               (c)    Representations.
-          Contributor represents that, except as disclosed pursuant to
-          Section 3.4(a) above, Contributor believes that Contributor's
-          Modifications are Contributor's original creation(s) and/or
-          Contributor has sufficient rights to grant the rights conveyed by
-          this License.
-
-     3.5. Required Notices.
-     You must duplicate the notice in Exhibit A in each file of the Source
-     Code.  If it is not possible to put such notice in a particular Source
-     Code file due to its structure, then You must include such notice in a
-     location (such as a relevant directory) where a user would be likely
-     to look for such a notice.  If You created one or more Modification(s)
-     You may add your name as a Contributor to the notice described in
-     Exhibit A.  You must also duplicate this License in any documentation
-     for the Source Code where You describe recipients' rights or ownership
-     rights relating to Covered Code.  You may choose to offer, and to
-     charge a fee for, warranty, support, indemnity or liability
-     obligations to one or more recipients of Covered Code. However, You
-     may do so only on Your own behalf, and not on behalf of the Initial
-     Developer or any Contributor. You must make it absolutely clear than
-     any such warranty, support, indemnity or liability obligation is
-     offered by You alone, and You hereby agree to indemnify the Initial
-     Developer and every Contributor for any liability incurred by the
-     Initial Developer or such Contributor as a result of warranty,
-     support, indemnity or liability terms You offer.
-
-     3.6. Distribution of Executable Versions.
-     You may distribute Covered Code in Executable form only if the
-     requirements of Section 3.1-3.5 have been met for that Covered Code,
-     and if You include a notice stating that the Source Code version of
-     the Covered Code is available under the terms of this License,
-     including a description of how and where You have fulfilled the
-     obligations of Section 3.2. The notice must be conspicuously included
-     in any notice in an Executable version, related documentation or
-     collateral in which You describe recipients' rights relating to the
-     Covered Code. You may distribute the Executable version of Covered
-     Code or ownership rights under a license of Your choice, which may
-     contain terms different from this License, provided that You are in
-     compliance with the terms of this License and that the license for the
-     Executable version does not attempt to limit or alter the recipient's
-     rights in the Source Code version from the rights set forth in this
-     License. If You distribute the Executable version under a different
-     license You must make it absolutely clear that any terms which differ
-     from this License are offered by You alone, not by the Initial
-     Developer or any Contributor. You hereby agree to indemnify the
-     Initial Developer and every Contributor for any liability incurred by
-     the Initial Developer or such Contributor as a result of any such
-     terms You offer.
-
-     3.7. Larger Works.
-     You may create a Larger Work by combining Covered Code with other code
-     not governed by the terms of this License and distribute the Larger
-     Work as a single product. In such a case, You must make sure the
-     requirements of this License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
-     If it is impossible for You to comply with any of the terms of this
-     License with respect to some or all of the Covered Code due to
-     statute, judicial order, or regulation then You must: (a) comply with
-     the terms of this License to the maximum extent possible; and (b)
-     describe the limitations and the code they affect. Such description
-     must be included in the LEGAL file described in Section 3.4 and must
-     be included with all distributions of the Source Code. Except to the
-     extent prohibited by statute or regulation, such description must be
-     sufficiently detailed for a recipient of ordinary skill to be able to
-     understand it.
-
-5. Application of this License.
-
-     This License applies to code to which the Initial Developer has
-     attached the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
-     6.1. New Versions.
-     Netscape Communications Corporation ("Netscape") may publish revised
-     and/or new versions of the License from time to time. Each version
-     will be given a distinguishing version number.
-
-     6.2. Effect of New Versions.
-     Once Covered Code has been published under a particular version of the
-     License, You may always continue to use it under the terms of that
-     version. You may also choose to use such Covered Code under the terms
-     of any subsequent version of the License published by Netscape. No one
-     other than Netscape has the right to modify the terms applicable to
-     Covered Code created under this License.
-
-     6.3. Derivative Works.
-     If You create or use a modified version of this License (which you may
-     only do in order to apply it to code which is not already Covered Code
-     governed by this License), You must (a) rename Your license so that
-     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
-     "MPL", "NPL" or any confusingly similar phrase do not appear in your
-     license (except to note that your license differs from this License)
-     and (b) otherwise make it clear that Your version of the license
-     contains terms which differ from the Mozilla Public License and
-     Netscape Public License. (Filling in the name of the Initial
-     Developer, Original Code or Contributor in the notice described in
-     Exhibit A shall not of themselves be deemed to be modifications of
-     this License.)
-
-7. DISCLAIMER OF WARRANTY.
-
-     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
-     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
-     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
-     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-8. TERMINATION.
-
-     8.1.  This License and the rights granted hereunder will terminate
-     automatically if You fail to comply with terms herein and fail to cure
-     such breach within 30 days of becoming aware of the breach. All
-     sublicenses to the Covered Code which are properly granted shall
-     survive any termination of this License. Provisions which, by their
-     nature, must remain in effect beyond the termination of this License
-     shall survive.
-
-     8.2.  If You initiate litigation by asserting a patent infringement
-     claim (excluding declatory judgment actions) against Initial Developer
-     or a Contributor (the Initial Developer or Contributor against whom
-     You file such action is referred to as "Participant")  alleging that:
-
-     (a)  such Participant's Contributor Version directly or indirectly
-     infringes any patent, then any and all rights granted by such
-     Participant to You under Sections 2.1 and/or 2.2 of this License
-     shall, upon 60 days notice from Participant terminate prospectively,
-     unless if within 60 days after receipt of notice You either: (i)
-     agree in writing to pay Participant a mutually agreeable reasonable
-     royalty for Your past and future use of Modifications made by such
-     Participant, or (ii) withdraw Your litigation claim with respect to
-     the Contributor Version against such Participant.  If within 60 days
-     of notice, a reasonable royalty and payment arrangement are not
-     mutually agreed upon in writing by the parties or the litigation claim
-     is not withdrawn, the rights granted by Participant to You under
-     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
-     the 60 day notice period specified above.
-
-     (b)  any software, hardware, or device, other than such Participant's
-     Contributor Version, directly or indirectly infringes any patent, then
-     any rights granted to You by such Participant under Sections 2.1(b)
-     and 2.2(b) are revoked effective as of the date You first made, used,
-     sold, distributed, or had made, Modifications made by that
-     Participant.
-
-     8.3.  If You assert a patent infringement claim against Participant
-     alleging that such Participant's Contributor Version directly or
-     indirectly infringes any patent where such claim is resolved (such as
-     by license or settlement) prior to the initiation of patent
-     infringement litigation, then the reasonable value of the licenses
-     granted by such Participant under Sections 2.1 or 2.2 shall be taken
-     into account in determining the amount or value of any payment or
-     license.
-
-     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
-     all end user license agreements (excluding distributors and resellers)
-     which have been validly granted by You or any distributor hereunder
-     prior to termination shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
-     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
-     The Covered Code is a "commercial item," as that term is defined in
-     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-     software" and "commercial computer software documentation," as such
-     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
-     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
-     all U.S. Government End Users acquire Covered Code with only those
-     rights set forth herein.
-
-11. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject
-     matter hereof. If any provision of this License is held to be
-     unenforceable, such provision shall be reformed only to the extent
-     necessary to make it enforceable. This License shall be governed by
-     California law provisions (except to the extent applicable law, if
-     any, provides otherwise), excluding its conflict-of-law provisions.
-     With respect to disputes in which at least one party is a citizen of,
-     or an entity chartered or registered to do business in the United
-     States of America, any litigation relating to this License shall be
-     subject to the jurisdiction of the Federal Courts of the Northern
-     District of California, with venue lying in Santa Clara County,
-     California, with the losing party responsible for costs, including
-     without limitation, court costs and reasonable attorneys' fees and
-     expenses. The application of the United Nations Convention on
-     Contracts for the International Sale of Goods is expressly excluded.
-     Any law or regulation which provides that the language of a contract
-     shall be construed against the drafter shall not apply to this
-     License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly,
-     out of its utilization of rights under this License and You agree to
-     work with Initial Developer and Contributors to distribute such
-     responsibility on an equitable basis. Nothing herein is intended or
-     shall be deemed to constitute any admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
-     Initial Developer may designate portions of the Covered Code as
-     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
-     Developer permits you to utilize portions of the Covered Code under
-     Your choice of the NPL or the alternative licenses, if any, specified
-     by the Initial Developer in the file described in Exhibit A.
-
-EXHIBIT A -Mozilla Public License.
-
-     ``The contents of this file are subject to the Mozilla Public License
-     Version 1.1 (the "License"); you may not use this file except in
-     compliance with the License. You may obtain a copy of the License at
-     http://www.mozilla.org/MPL/
-
-     Software distributed under the License is distributed on an "AS IS"
-     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-     License for the specific language governing rights and limitations
-     under the License.
-
-     The Original Code is ______________________________________.
-
-     The Initial Developer of the Original Code is ________________________.
-     Portions created by ______________________ are Copyright (C) ______
-     _______________________. All Rights Reserved.
-
-     Contributor(s): ______________________________________.
-
-     Alternatively, the contents of this file may be used under the terms
-     of the _____ license (the  "[___] License"), in which case the
-     provisions of [______] License are applicable instead of those
-     above.  If you wish to allow use of your version of this file only
-     under the terms of the [____] License and not to allow others to use
-     your version of this file under the MPL, indicate your decision by
-     deleting  the provisions above and replace  them with the notice and
-     other provisions required by the [___] License.  If you do not delete
-     the provisions above, a recipient may use your version of this file
-     under either the MPL or the [___] License."
-
-     [NOTE: The text of this Exhibit A may differ slightly from the text of
-     the notices in the Source Code files of the Original Code. You should
-     use the text of this Exhibit A rather than the text found in the
-     Original Code Source Code for Your Modifications.]
-============================================================================
-
-
-
-The MD5 generator used for authentication in some modules is written by
-Aladdin Enterprises:
-
-============================================================================
-  Copyright (C) 1999 Aladdin Enterprises.  All rights reserved.
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-============================================================================
-
-
-
-The SGML-formatted documentation is written by Jelmer Vernooij
-<jelmer@nl.linux.org> under the GNU Free Documentation License:
-
-============================================================================
-		GNU Free Documentation License
-		   Version 1.1, March 2000
-
- Copyright (C) 2000  Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-0. PREAMBLE
-
-The purpose of this License is to make a manual, textbook, or other
-written document "free" in the sense of freedom: to assure everyone
-the effective freedom to copy and redistribute it, with or without
-modifying it, either commercially or noncommercially.  Secondarily,
-this License preserves for the author and publisher a way to get
-credit for their work, while not being considered responsible for
-modifications made by others.
-
-This License is a kind of "copyleft", which means that derivative
-works of the document must themselves be free in the same sense.  It
-complements the GNU General Public License, which is a copyleft
-license designed for free software.
-
-We have designed this License in order to use it for manuals for free
-software, because free software needs free documentation: a free
-program should come with manuals providing the same freedoms that the
-software does.  But this License is not limited to software manuals;
-it can be used for any textual work, regardless of subject matter or
-whether it is published as a printed book.  We recommend this License
-principally for works whose purpose is instruction or reference.
-
-
-1. APPLICABILITY AND DEFINITIONS
-
-This License applies to any manual or other work that contains a
-notice placed by the copyright holder saying it can be distributed
-under the terms of this License.  The "Document", below, refers to any
-such manual or work.  Any member of the public is a licensee, and is
-addressed as "you".
-
-A "Modified Version" of the Document means any work containing the
-Document or a portion of it, either copied verbatim, or with
-modifications and/or translated into another language.
-
-A "Secondary Section" is a named appendix or a front-matter section of
-the Document that deals exclusively with the relationship of the
-publishers or authors of the Document to the Document's overall subject
-(or to related matters) and contains nothing that could fall directly
-within that overall subject.  (For example, if the Document is in part a
-textbook of mathematics, a Secondary Section may not explain any
-mathematics.)  The relationship could be a matter of historical
-connection with the subject or with related matters, or of legal,
-commercial, philosophical, ethical or political position regarding
-them.
-
-The "Invariant Sections" are certain Secondary Sections whose titles
-are designated, as being those of Invariant Sections, in the notice
-that says that the Document is released under this License.
-
-The "Cover Texts" are certain short passages of text that are listed,
-as Front-Cover Texts or Back-Cover Texts, in the notice that says that
-the Document is released under this License.
-
-A "Transparent" copy of the Document means a machine-readable copy,
-represented in a format whose specification is available to the
-general public, whose contents can be viewed and edited directly and
-straightforwardly with generic text editors or (for images composed of
-pixels) generic paint programs or (for drawings) some widely available
-drawing editor, and that is suitable for input to text formatters or
-for automatic translation to a variety of formats suitable for input
-to text formatters.  A copy made in an otherwise Transparent file
-format whose markup has been designed to thwart or discourage
-subsequent modification by readers is not Transparent.  A copy that is
-not "Transparent" is called "Opaque".
-
-Examples of suitable formats for Transparent copies include plain
-ASCII without markup, Texinfo input format, LaTeX input format, SGML
-or XML using a publicly available DTD, and standard-conforming simple
-HTML designed for human modification.  Opaque formats include
-PostScript, PDF, proprietary formats that can be read and edited only
-by proprietary word processors, SGML or XML for which the DTD and/or
-processing tools are not generally available, and the
-machine-generated HTML produced by some word processors for output
-purposes only.
-
-The "Title Page" means, for a printed book, the title page itself,
-plus such following pages as are needed to hold, legibly, the material
-this License requires to appear in the title page.  For works in
-formats which do not have any title page as such, "Title Page" means
-the text near the most prominent appearance of the work's title,
-preceding the beginning of the body of the text.
-
-
-2. VERBATIM COPYING
-
-You may copy and distribute the Document in any medium, either
-commercially or noncommercially, provided that this License, the
-copyright notices, and the license notice saying this License applies
-to the Document are reproduced in all copies, and that you add no other
-conditions whatsoever to those of this License.  You may not use
-technical measures to obstruct or control the reading or further
-copying of the copies you make or distribute.  However, you may accept
-compensation in exchange for copies.  If you distribute a large enough
-number of copies you must also follow the conditions in section 3.
-
-You may also lend copies, under the same conditions stated above, and
-you may publicly display copies.
-
-
-3. COPYING IN QUANTITY
-
-If you publish printed copies of the Document numbering more than 100,
-and the Document's license notice requires Cover Texts, you must enclose
-the copies in covers that carry, clearly and legibly, all these Cover
-Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
-the back cover.  Both covers must also clearly and legibly identify
-you as the publisher of these copies.  The front cover must present
-the full title with all words of the title equally prominent and
-visible.  You may add other material on the covers in addition.
-Copying with changes limited to the covers, as long as they preserve
-the title of the Document and satisfy these conditions, can be treated
-as verbatim copying in other respects.
-
-If the required texts for either cover are too voluminous to fit
-legibly, you should put the first ones listed (as many as fit
-reasonably) on the actual cover, and continue the rest onto adjacent
-pages.
-
-If you publish or distribute Opaque copies of the Document numbering
-more than 100, you must either include a machine-readable Transparent
-copy along with each Opaque copy, or state in or with each Opaque copy
-a publicly-accessible computer-network location containing a complete
-Transparent copy of the Document, free of added material, which the
-general network-using public has access to download anonymously at no
-charge using public-standard network protocols.  If you use the latter
-option, you must take reasonably prudent steps, when you begin
-distribution of Opaque copies in quantity, to ensure that this
-Transparent copy will remain thus accessible at the stated location
-until at least one year after the last time you distribute an Opaque
-copy (directly or through your agents or retailers) of that edition to
-the public.
-
-It is requested, but not required, that you contact the authors of the
-Document well before redistributing any large number of copies, to give
-them a chance to provide you with an updated version of the Document.
-
-
-4. MODIFICATIONS
-
-You may copy and distribute a Modified Version of the Document under
-the conditions of sections 2 and 3 above, provided that you release
-the Modified Version under precisely this License, with the Modified
-Version filling the role of the Document, thus licensing distribution
-and modification of the Modified Version to whoever possesses a copy
-of it.  In addition, you must do these things in the Modified Version:
-
-A. Use in the Title Page (and on the covers, if any) a title distinct
-   from that of the Document, and from those of previous versions
-   (which should, if there were any, be listed in the History section
-   of the Document).  You may use the same title as a previous version
-   if the original publisher of that version gives permission.
-B. List on the Title Page, as authors, one or more persons or entities
-   responsible for authorship of the modifications in the Modified
-   Version, together with at least five of the principal authors of the
-   Document (all of its principal authors, if it has less than five).
-C. State on the Title page the name of the publisher of the
-   Modified Version, as the publisher.
-D. Preserve all the copyright notices of the Document.
-E. Add an appropriate copyright notice for your modifications
-   adjacent to the other copyright notices.
-F. Include, immediately after the copyright notices, a license notice
-   giving the public permission to use the Modified Version under the
-   terms of this License, in the form shown in the Addendum below.
-G. Preserve in that license notice the full lists of Invariant Sections
-   and required Cover Texts given in the Document's license notice.
-H. Include an unaltered copy of this License.
-I. Preserve the section entitled "History", and its title, and add to
-   it an item stating at least the title, year, new authors, and
-   publisher of the Modified Version as given on the Title Page.  If
-   there is no section entitled "History" in the Document, create one
-   stating the title, year, authors, and publisher of the Document as
-   given on its Title Page, then add an item describing the Modified
-   Version as stated in the previous sentence.
-J. Preserve the network location, if any, given in the Document for
-   public access to a Transparent copy of the Document, and likewise
-   the network locations given in the Document for previous versions
-   it was based on.  These may be placed in the "History" section.
-   You may omit a network location for a work that was published at
-   least four years before the Document itself, or if the original
-   publisher of the version it refers to gives permission.
-K. In any section entitled "Acknowledgements" or "Dedications",
-   preserve the section's title, and preserve in the section all the
-   substance and tone of each of the contributor acknowledgements
-   and/or dedications given therein.
-L. Preserve all the Invariant Sections of the Document,
-   unaltered in their text and in their titles.  Section numbers
-   or the equivalent are not considered part of the section titles.
-M. Delete any section entitled "Endorsements".  Such a section
-   may not be included in the Modified Version.
-N. Do not retitle any existing section as "Endorsements"
-   or to conflict in title with any Invariant Section.
-
-If the Modified Version includes new front-matter sections or
-appendices that qualify as Secondary Sections and contain no material
-copied from the Document, you may at your option designate some or all
-of these sections as invariant.  To do this, add their titles to the
-list of Invariant Sections in the Modified Version's license notice.
-These titles must be distinct from any other section titles.
-
-You may add a section entitled "Endorsements", provided it contains
-nothing but endorsements of your Modified Version by various
-parties--for example, statements of peer review or that the text has
-been approved by an organization as the authoritative definition of a
-standard.
-
-You may add a passage of up to five words as a Front-Cover Text, and a
-passage of up to 25 words as a Back-Cover Text, to the end of the list
-of Cover Texts in the Modified Version.  Only one passage of
-Front-Cover Text and one of Back-Cover Text may be added by (or
-through arrangements made by) any one entity.  If the Document already
-includes a cover text for the same cover, previously added by you or
-by arrangement made by the same entity you are acting on behalf of,
-you may not add another; but you may replace the old one, on explicit
-permission from the previous publisher that added the old one.
-
-The author(s) and publisher(s) of the Document do not by this License
-give permission to use their names for publicity for or to assert or
-imply endorsement of any Modified Version.
-
-
-5. COMBINING DOCUMENTS
-
-You may combine the Document with other documents released under this
-License, under the terms defined in section 4 above for modified
-versions, provided that you include in the combination all of the
-Invariant Sections of all of the original documents, unmodified, and
-list them all as Invariant Sections of your combined work in its
-license notice.
-
-The combined work need only contain one copy of this License, and
-multiple identical Invariant Sections may be replaced with a single
-copy.  If there are multiple Invariant Sections with the same name but
-different contents, make the title of each such section unique by
-adding at the end of it, in parentheses, the name of the original
-author or publisher of that section if known, or else a unique number.
-Make the same adjustment to the section titles in the list of
-Invariant Sections in the license notice of the combined work.
-
-In the combination, you must combine any sections entitled "History"
-in the various original documents, forming one section entitled
-"History"; likewise combine any sections entitled "Acknowledgements",
-and any sections entitled "Dedications".  You must delete all sections
-entitled "Endorsements."
-
-
-6. COLLECTIONS OF DOCUMENTS
-
-You may make a collection consisting of the Document and other documents
-released under this License, and replace the individual copies of this
-License in the various documents with a single copy that is included in
-the collection, provided that you follow the rules of this License for
-verbatim copying of each of the documents in all other respects.
-
-You may extract a single document from such a collection, and distribute
-it individually under this License, provided you insert a copy of this
-License into the extracted document, and follow this License in all
-other respects regarding verbatim copying of that document.
-
-
-7. AGGREGATION WITH INDEPENDENT WORKS
-
-A compilation of the Document or its derivatives with other separate
-and independent documents or works, in or on a volume of a storage or
-distribution medium, does not as a whole count as a Modified Version
-of the Document, provided no compilation copyright is claimed for the
-compilation.  Such a compilation is called an "aggregate", and this
-License does not apply to the other self-contained works thus compiled
-with the Document, on account of their being thus compiled, if they
-are not themselves derivative works of the Document.
-
-If the Cover Text requirement of section 3 is applicable to these
-copies of the Document, then if the Document is less than one quarter
-of the entire aggregate, the Document's Cover Texts may be placed on
-covers that surround only the Document within the aggregate.
-Otherwise they must appear on covers around the whole aggregate.
-
-
-8. TRANSLATION
-
-Translation is considered a kind of modification, so you may
-distribute translations of the Document under the terms of section 4.
-Replacing Invariant Sections with translations requires special
-permission from their copyright holders, but you may include
-translations of some or all Invariant Sections in addition to the
-original versions of these Invariant Sections.  You may include a
-translation of this License provided that you also include the
-original English version of this License.  In case of a disagreement
-between the translation and the original English version of this
-License, the original English version will prevail.
-
-
-9. TERMINATION
-
-You may not copy, modify, sublicense, or distribute the Document except
-as expressly provided for under this License.  Any other attempt to
-copy, modify, sublicense or distribute the Document is void, and will
-automatically terminate your rights under this License.  However,
-parties who have received copies, or rights, from you under this
-License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-
-10. FUTURE REVISIONS OF THIS LICENSE
-
-The Free Software Foundation may publish new, revised versions
-of the GNU Free Documentation License from time to time.  Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.  See
-http://www.gnu.org/copyleft/.
-
-Each version of the License is given a distinguishing version number.
-If the Document specifies that a particular numbered version of this
-License "or any later version" applies to it, you have the option of
-following the terms and conditions either of that specified version or
-of any later version that has been published (not as a draft) by the
-Free Software Foundation.  If the Document does not specify a version
-number of this License, you may choose any version ever published (not
-as a draft) by the Free Software Foundation.
-
-
-ADDENDUM: How to use this License for your documents
-
-To use this License in a document you have written, include a copy of
-the License in the document and put the following copyright and
-license notices just after the title page:
-
-      Copyright (c)  YEAR  YOUR NAME.
-      Permission is granted to copy, distribute and/or modify this document
-      under the terms of the GNU Free Documentation License, Version 1.1
-      or any later version published by the Free Software Foundation;
-      with the Invariant Sections being LIST THEIR TITLES, with the
-      Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
-      A copy of the license is included in the section entitled "GNU
-      Free Documentation License".
-
-If you have no Invariant Sections, write "with no Invariant Sections"
-instead of saying which ones are invariant.  If you have no
-Front-Cover Texts, write "no Front-Cover Texts" instead of
-"Front-Cover Texts being LIST"; likewise for Back-Cover Texts.
-
-If your document contains nontrivial examples of program code, we
-recommend releasing these examples in parallel under your choice of
-free software license, such as the GNU General Public License,
-to permit their use in free software.
-============================================================================
Index: bian/motd.txt
===================================================================
--- debian/motd.txt	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ 	(revision )
@@ -1,19 +1,0 @@
-Welcome to the BitlBee server at %h.
-
-This server is running BitlBee version %v-Debian.
-The newest version can be found on http://www.bitlbee.org/, or nicely
-packaged on your local Debian mirror.
-
-You are getting this message because the server administrator has not
-yet had the time (or need) to change it.
-
-For those who don't know it yet, this is not quite a regular Internet
-Relay Chat server. Please see the site mentioned above for more
-information.
-
-
-The developers of the Bee hope you have a buzzing time.
-
-* BitlBee development team: wilmer, ctrlsoft, Maurits
- 
-... Buzzing, haha, get it?
Index: bian/po/POTFILES.in
===================================================================
--- debian/po/POTFILES.in	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ 	(revision )
@@ -1,1 +1,0 @@
-[type: gettext/rfc822deb] bitlbee.templates.master
Index: bian/po/cs.po
===================================================================
--- debian/po/cs.po	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ 	(revision )
@@ -1,44 +1,0 @@
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: bitlbee\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-25 18:12+0200\n"
-"PO-Revision-Date: 2005-02-04 12:31+0100\n"
-"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
-"Language-Team: Czech <debian-l10n-czech@debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:4
-msgid "On what TCP port should BitlBee listen for connections?"
-msgstr "Na kterém TCP portu má BitlBee naslouchat pøíchozím spojením?"
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:4
-msgid ""
-"BitlBee normally listens on the regular IRC port, 6667. This might not be a "
-"very good idea when you're running a real IRC daemon as well. 6668 might be "
-"a good alternative. Leaving this value blank means that BitlBee will not be "
-"run automatically."
-msgstr ""
-"BitlBee normálnì naslouchá na bì¾ném IRC portu 6667. Pokud máte spu¹tìný i "
-"reálný IRC daemon, tak to nemusí být nejlep¹í nápad. Vhodná alternativa mù¾e "
-"být 6668. Ponecháte-li pole prázdné, znamená to, ¾e se BitlBee nebude "
-"spou¹tìt automaticky."
Index: bian/po/de.po
===================================================================
--- debian/po/de.po	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ 	(revision )
@@ -1,45 +1,0 @@
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
-#    Developers do not need to manually edit POT or PO files.
-# Erik Schanze <mail@erikschanze.de>, 2004.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: bitlbee_0.90a-2_de\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-06 20:16+0200\n"
-"PO-Revision-Date: 2004-10-03 14:33+0200\n"
-"Last-Translator: Erik Schanze <mail@erikschanze.de>\n"
-"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3.1\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:3
-msgid "On what TCP port should BitlBee listen for connections?"
-msgstr "An welchem TCP-Port soll BitlBee auf Verbindungen warten?"
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:3
-msgid ""
-"BitlBee normally listens on the regular IRC port, 6667. This might not be a "
-"very good idea when you're running a real IRC daemon as well. 6668 might be "
-"a good alternative. Leaving this value blank means that BitlBee will not be "
-"run automatically."
-msgstr ""
-"BitlBee lauscht normalerweise an dem üblichen IRC-Port 6667. Dies ist aber "
-"keine gute Idee, wenn Sie außerdem noch einen richtigen IRC-Dienst "
-"betreiben. Das Port 6668 ist eine gute Alternative. Wenn Sie keinen Wert "
-"eingeben, wird BitlBee nicht automatisch starten."
Index: bian/po/es.po
===================================================================
--- debian/po/es.po	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ 	(revision )
@@ -1,51 +1,0 @@
-# bitlbee po-debconf translation to Spanish
-# Copyright (C) 2005 Software in the Public Interest
-# This file is distributed under the same license as the bitlbee package.
-#
-# Changes:
-#  - Initial translation
-#         César Gómez Martín <cesar.gomez@gmail.com>
-#
-#
-#   Traductores, si no conoce el formato PO, merece la pena leer la
-#   documentación de gettext, especialmente las secciones dedicadas a este
-#   formato, por ejemplo ejecutando:
-#          info -n '(gettext)PO Files'
-#          info -n '(gettext)Header Entry'
-# Equipo de traducción al español, por favor, lean antes de traducir
-# los siguientes documentos:
-#
-#  - El proyecto de traducción de Debian al español
-#    http://www.debian.org/intl/spanish/
-#    especialmente las notas de traducción en
-#    http://www.debian.org/intl/spanish/notas
-#
-#  - La guía de traducción de po's de debconf:
-#    /usr/share/doc/po-debconf/README-trans
-#    o http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: bitlbee\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-25 18:12+0200\n"
-"PO-Revision-Date: 2005-08-24 19:37+0100\n"
-"Last-Translator: César Gómez Martín <cesar.gomez@gmail.com>\n"
-"Language-Team: Debian l10n spanish <debian-l10n-spanish@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Spanish\n"
-"X-Poedit-Country: SPAIN\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#. Type: string
-#: ../bitlbee.templates.master:4
-msgid "On what TCP port should BitlBee listen for connections?"
-msgstr "¿En qué puerto TCP quiere que BitlBee escuche conexiones?"
-
-#. Type: string
-#: ../bitlbee.templates.master:4
-msgid "BitlBee normally listens on the regular IRC port, 6667. This might not be a very good idea when you're running a real IRC daemon as well. 6668 might be a good alternative. Leaving this value blank means that BitlBee will not be run automatically."
-msgstr "BitlBee normalmente escucha en el puerto 6667, que se usa también para IRC. Por esta razón no es muy buena idea poner a BitlBee a escuchar en ese puerto si también se está ejecutando un demonio real de IRC, en este caso el puerto 6668 puede ser una buena alternativa. Si deja este valor en blanco BitlBee no se ejecutará automáticamente."
-
Index: bian/po/fr.po
===================================================================
--- debian/po/fr.po	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ 	(revision )
@@ -1,44 +1,0 @@
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: bitlbee (0.80-1)\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-25 18:12+0200\n"
-"PO-Revision-Date: 2003-08-07 08:45+0100\n"
-"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
-"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-15\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:4
-msgid "On what TCP port should BitlBee listen for connections?"
-msgstr "Sur quel port TCP BitlBee doit-il être à l'écoute ?"
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:4
-msgid ""
-"BitlBee normally listens on the regular IRC port, 6667. This might not be a "
-"very good idea when you're running a real IRC daemon as well. 6668 might be "
-"a good alternative. Leaving this value blank means that BitlBee will not be "
-"run automatically."
-msgstr ""
-"BitlBee est usuellement à l'écoute sur le port IRC standard : 6667. Cela "
-"n'est pas forcément un choix adapté si vous utilisez en même temps un vrai "
-"démon IRC. Dans ce cas, choisir 6668 est conseillé. Si vous ne souhaitez pas "
-"lancer BitlBee automatiquement, veuillez laissez ce champs vide."
Index: bian/po/ja.po
===================================================================
--- debian/po/ja.po	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ 	(revision )
@@ -1,45 +1,0 @@
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: bitlbee 0.90a-2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-25 18:12+0200\n"
-"PO-Revision-Date: 2004-09-11 13:30+0900\n"
-"Last-Translator: Hideki Yamane <henrich@samba.gr.jp>\n"
-"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=EUC-JP\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:4
-msgid "On what TCP port should BitlBee listen for connections?"
-msgstr "BitlBee ¤Ï¡¢ÀÜÂ³¤Î¤¿¤á¤Ë¤É¤Î TCP ¥Ý¡¼¥È¤ò listen ¤·¤Þ¤¹¤«?"
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:4
-msgid ""
-"BitlBee normally listens on the regular IRC port, 6667. This might not be a "
-"very good idea when you're running a real IRC daemon as well. 6668 might be "
-"a good alternative. Leaving this value blank means that BitlBee will not be "
-"run automatically."
-msgstr ""
-"BitlBee ¤ÏÄÌ¾ï¤Î¾ì¹ç¡¢É¸½à¤Î IRC ¥Ý¡¼¥ÈÈÖ¹æ¤Ç¤¢¤ë 6667 ¤ò listen ¤·¤Þ¤¹¡£Æ±ÍÍ"
-"¤Ë¤·¤Æ¼ÂºÝ¤Î IRC ¥Ç¡¼¥â¥ó¤òÆ°ºî¤µ¤»¤Æ¤¤¤ë¾ì¹ç¡¢¤³¤ì¤Ï¤¢¤Þ¤êÎÉ¤¤¹Í¤¨¤Ç¤ÏÌµ¤¤¤«"
-"¤â¤·¤ì¤Þ¤»¤ó¡£Âå¤ï¤ê¤Ë 6668 ¤ò»È¤¦¤Î¤¬ÎÉ¤¤¤«¤âÃÎ¤ì¤Þ¤»¤ó¡£¤³¤ì¤ò¶õ¤Î¤Þ¤Þ¤Ë¤·"
-"¤Æ¤ª¤±¤Ð¡¢BitlBee ¤Ï¼«Æ°Åª¤Ë¤Ïµ¯Æ°¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£"
Index: bian/po/nl.po
===================================================================
--- debian/po/nl.po	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ 	(revision )
@@ -1,44 +1,0 @@
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: bitlbee (0.90a-2)\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-25 18:12+0200\n"
-"PO-Revision-Date: 2004-09-06 20:16+0200\n"
-"Last-Translator: Wilmer van der Gaast <wilmer@gaast.net>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:4
-msgid "On what TCP port should BitlBee listen for connections?"
-msgstr "Op welke TCP poort moet BitlBee draaien?"
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:4
-msgid ""
-"BitlBee normally listens on the regular IRC port, 6667. This might not be a "
-"very good idea when you're running a real IRC daemon as well. 6668 might be "
-"a good alternative. Leaving this value blank means that BitlBee will not be "
-"run automatically."
-msgstr ""
-"Normaal 'luistert' BitlBee op de gebruikelijke IRC poort, 6667. Als je al "
-"een andere IRC daemon draait is dat onmogelijk. Kies dan bijvoorbeeld voor "
-"poort 6668. Als je niet wil dat BitlBee automatisch gestart wordt, vul hier "
-"dan niets in."
Index: bian/po/pt_BR.po
===================================================================
--- debian/po/pt_BR.po	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ 	(revision )
@@ -1,44 +1,0 @@
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: bitlbee\n"
-"Report-Msgid-Bugs-To: debian-l10n-portuguese@lists.debian.org\n"
-"POT-Creation-Date: 2004-09-25 18:12+0200\n"
-"PO-Revision-Date: 2005-02-26 16:14-0300\n"
-"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
-"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:4
-msgid "On what TCP port should BitlBee listen for connections?"
-msgstr "Em qual porta TCP o BitlBee deverá ouvir por conexões ?"
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:4
-msgid ""
-"BitlBee normally listens on the regular IRC port, 6667. This might not be a "
-"very good idea when you're running a real IRC daemon as well. 6668 might be "
-"a good alternative. Leaving this value blank means that BitlBee will not be "
-"run automatically."
-msgstr ""
-"O BitlBee normalmente ouve na porta de IRC padrão, 6667. Porém, esta pode "
-"não ser uma boa idéia quando você está rodando um daemon IRC real também. "
-"6689 pode ser uma boa alternativa. Deixar esse valor em branco significa "
-"que o BitlBee não será executado automaticamente."
Index: bian/po/sv.po
===================================================================
--- debian/po/sv.po	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ 	(revision )
@@ -1,44 +1,0 @@
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-# Developers do not need to manually edit POT or PO files.
-# , fuzzy
-# 
-# 
-msgid ""
-msgstr ""
-"Project-Id-Version: bitlbee 0.92-2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-25 18:12+0200\n"
-"PO-Revision-Date: 2005-10-03 23:18+0200\n"
-"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
-"Language-Team: Swedish <sv@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit"
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:4
-msgid "On what TCP port should BitlBee listen for connections?"
-msgstr "På vilken TCP-port ska BitlBee lyssna på efter anslutningar?"
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:4
-msgid ""
-"BitlBee normally listens on the regular IRC port, 6667. This might not be a "
-"very good idea when you're running a real IRC daemon as well. 6668 might be "
-"a good alternative. Leaving this value blank means that BitlBee will not be "
-"run automatically."
-msgstr ""
-"BitlBee lyssnar normalt på den standardporten för IRC, 6667. Detta kanske inte är "
-"en bra ide om du kör en riktig IRC-daemon på samma system. 6668 kan vara "
-"ett bra alternativ då. Lämnar du detta värde blankt betyder det att BitlBee inte "
-"kommer att startas automatiskt."
-
Index: bian/po/templates.pot
===================================================================
--- debian/po/templates.pot	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ 	(revision )
@@ -1,41 +1,0 @@
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-25 18:12+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:4
-msgid "On what TCP port should BitlBee listen for connections?"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:4
-msgid ""
-"BitlBee normally listens on the regular IRC port, 6667. This might not be a "
-"very good idea when you're running a real IRC daemon as well. 6668 might be "
-"a good alternative. Leaving this value blank means that BitlBee will not be "
-"run automatically."
-msgstr ""
Index: bian/po/vi.po
===================================================================
--- debian/po/vi.po	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ 	(revision )
@@ -1,32 +1,0 @@
-# Vietnamese translation for bitlbee.
-# Copyright © 2005 Free Software Foundation, Inc.
-# Clytie Siddall <clytie@riverland.net.au>, 2005.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: bitlbee 0.92-1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-25 18:12+0200\n"
-"PO-Revision-Date: 2005-06-12 18:34+0930\n"
-"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
-"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:4
-msgid "On what TCP port should BitlBee listen for connections?"
-msgstr "Trình BitlBee nên lắng nghe sự kết nối trên cổng TCP nào?"
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:4
-msgid ""
-"BitlBee normally listens on the regular IRC port, 6667. This might not be a "
-"very good idea when you're running a real IRC daemon as well. 6668 might be "
-"a good alternative. Leaving this value blank means that BitlBee will not be "
-"run automatically."
-msgstr "Trình BitlBee thường lắng nghe trên cổng IRC bình thường, 6667. Có lẽ nó không phải là một ý kiến tốt nếu bạn cũng có chạy một trình nền (dæmon) IRC thật. Như thế thì, cổng 6668 có thể là một điều thay thế tốt. Nếu bạn bỏ giá trị này rỗng, thì trình BitlBee sẽ không tự động chạy."
Index: bian/rules
===================================================================
--- debian/rules	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ 	(revision )
@@ -1,100 +1,0 @@
-#!/usr/bin/make -f
-
-DEBUG ?= 0
-
-ifeq (,$(wildcard /usr/bin/po2debconf))
-PO2DEBCONF := no
-MINDEBCONFVER := 0.5
-else
-PO2DEBCONF := yes
-MINDEBCONFVER := 1.2.0
-endif
-
-
-build-arch: build-arch-stamp
-build-arch-stamp:
-	if [ ! -d debian ]; then exit 1; fi
-	./configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee $(DEB_BUILD_OPTIONS)
-	$(MAKE)
-#	$(MAKE) -C doc/ all
-	touch build-arch-stamp
-
-clean:
-	if [ "`whoami`" != "root" -o ! -d debian ]; then exit 1; fi
-	rm -rf build-arch-stamp debian/bitlbee debian/*.substvars debian/files
-	-$(MAKE) distclean
-#	-$(MAKE) -C doc/ clean
-ifeq ($(PO2DEBCONF),yes)
-	# Hack for woody compatibility. This makes sure that the
-	# debian/templates file shipped in the source package doesn't
-	# specify encodings, which woody's debconf can't handle. If building
-	# on a system with po-debconf installed (conveniently debhelper (>=
-	# 4.1.16) depends on it), the binary-arch target will generate a
-	# better version for sarge.
-	echo 1 > debian/po/output
-	po2debconf debian/bitlbee.templates.master > debian/bitlbee.templates
-	rm -f debian/po/output
-endif
-				
-
-install-arch: build-arch
-	if [ "`whoami`" != "root" -o ! -d debian ]; then exit 1; fi
-	mkdir -p debian/bitlbee/DEBIAN/
-	$(MAKE) install install-etc DESTDIR=`pwd`/debian/bitlbee
-
-	mkdir -p debian/bitlbee/usr/share/doc/bitlbee/
-	cp doc/user-guide/user-guide.txt debian/bitlbee/usr/share/doc/bitlbee/
-	cp doc/user-guide/user-guide.html debian/bitlbee/usr/share/doc/bitlbee/
-
-binary-arch: build-arch install-arch
-	if [ "`whoami`" != "root" -o ! -d debian ]; then exit 1; fi
-
-	chmod 755 debian/bitlbee.p* debian/bitlbee.config
-
-	mkdir -p debian/bitlbee/usr/share/doc/bitlbee/examples/
-	-cp doc/RELEASE-SPEECH* debian/bitlbee/usr/share/doc/bitlbee/ && gzip -9 debian/bitlbee/usr/share/doc/bitlbee/RELEASE-SPEECH*
-	cp doc/CREDITS doc/AUTHORS doc/TODO doc/README doc/FAQ debian/README.Debian debian/bitlbee/usr/share/doc/bitlbee/
-	cp debian/changelog debian/bitlbee/usr/share/doc/bitlbee/changelog.Debian
-	cp debian/copyright debian/bitlbee/usr/share/doc/bitlbee/copyright
-	cp doc/CHANGES debian/bitlbee/usr/share/doc/bitlbee/changelog
-	cp utils/* debian/bitlbee/usr/share/doc/bitlbee/examples/
-	cp debian/motd.txt debian/bitlbee/etc/bitlbee/
-	cd debian/bitlbee/usr/share/; \
-		gzip -9 doc/bitlbee/changelog.Debian doc/bitlbee/changelog doc/bitlbee/user-guide.txt \
-		        doc/bitlbee/examples/* man/man8/bitlbee.8 man/man5/bitlbee.conf.5
-	
-	chown -R root.root debian/bitlbee/
-	find debian/bitlbee/usr/share/ -type d -exec chmod 755 {} \;
-	find debian/bitlbee/usr/share/ -type f -exec chmod 644 {} \;
-	
-	cp debian/bitlbee.preinst debian/bitlbee/DEBIAN/preinst
-	cp debian/bitlbee.postinst debian/bitlbee/DEBIAN/postinst
-	cp debian/bitlbee.postrm debian/bitlbee/DEBIAN/postrm
-	cp debian/bitlbee.config debian/bitlbee/DEBIAN/config
-ifeq ($(PO2DEBCONF),yes)
-	po2debconf -e utf8 debian/bitlbee.templates.master > debian/bitlbee.templates
-endif
-	cp debian/bitlbee.templates debian/bitlbee/DEBIAN/templates
-	cp debian/bitlbee.conffiles debian/bitlbee/DEBIAN/conffiles
-	
-	if [ "$(DEBUG)" = "0" ]; then strip -R .comment -R .note debian/bitlbee/usr/sbin/bitlbee; fi
-
-	cd debian/bitlbee; \
-		find usr -type f -exec md5sum {} \; > DEBIAN/md5sums
-	dpkg-shlibdeps -Tdebian/bitlbee.substvars -dDepends debian/bitlbee/usr/sbin/bitlbee
-ifdef BITLBEE_VERSION
-	dpkg-gencontrol -ldebian/changelog -isp -pbitlbee -Tdebian/bitlbee.substvars -Pdebian/bitlbee -v$(BITLBEE_VERSION)-0 -V'debconf-depends=debconf (>= $(MINDEBCONFVER)) | debconf-2.0'
-else
-	dpkg-gencontrol -ldebian/changelog -isp -pbitlbee -Tdebian/bitlbee.substvars -Pdebian/bitlbee -V'debconf-depends=debconf (>= $(MINDEBCONFVER)) | debconf-2.0'
-endif
-
-	dpkg --build debian/bitlbee ..
-
-debug-build:
-	BITLBEE_VERSION=\"`date +%Y%m%d`-`hostname`-debug\" debian/rules clean binary DEBUG=1
-
-binary: binary-arch
-build: build-arch
-install: install-arch
-
-.PHONY: build-arch build clean binary-arch binary install-arch install
Index: bug.c
===================================================================
--- debug.c	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ 	(revision )
@@ -1,60 +1,0 @@
-  /********************************************************************\
-  * BitlBee -- An IRC to other IM-networks gateway                     *
-  *                                                                    *
-  * Copyright 2002-2004 Wilmer van der Gaast and others                *
-  \********************************************************************/
-
-/* Random debug stuff                                                  */
-
-/*
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License with
-  the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  Suite 330, Boston, MA  02111-1307  USA
-*/
-
-#define BITLBEE_CORE
-#include "bitlbee.h"
-
-GHashTable *iocounter=NULL;
-FILE *activity_output;
-
-static void for_each_node(gpointer key, gpointer value, gpointer user_data);
-
-void count_io_event(GIOChannel *source, char *section) {
-	long int *newcounter;
-
-	if(iocounter==NULL) {
-		iocounter=g_hash_table_new(NULL, NULL);
-	}
-
-	if(g_hash_table_lookup(iocounter, section)==NULL) {
-		newcounter=g_new0(long int, 1);
-		g_hash_table_insert(iocounter, section, newcounter);
-	} else {
-		newcounter=g_hash_table_lookup(iocounter, section);
-		(*newcounter)++;	
-	}	 	
-}
-
-void write_io_activity(void) {
-	activity_output=fopen("ioactivity.log", "a");
-	fprintf(activity_output, "Amount of GIO events raised for each section of the code:\n");
-	g_hash_table_foreach(iocounter, &for_each_node, NULL);
-	fprintf(activity_output, "End of list\n");
-	fclose(activity_output);
-}
-
-static void for_each_node(gpointer key, gpointer value, gpointer user_data) {
-	fprintf(activity_output, "%s %ld\n", (char *)key, (*(long int *)value));
-}
Index: bug.h
===================================================================
--- debug.h	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ 	(revision )
@@ -1,33 +1,0 @@
-  /********************************************************************\
-  * BitlBee -- An IRC to other IM-networks gateway                     *
-  *                                                                    *
-  * Copyright 2002-2004 Wilmer van der Gaast and others                *
-  \********************************************************************/
-
-/* Random debug stuff                                                 */
-
-/*
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License with
-  the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  Suite 330, Boston, MA  02111-1307  USA
-*/
-
-#ifndef _DEBUG_H
-
-void count_io_event(GIOChannel *source, char *section);
-void write_io_activity(void);
-
-#define _DEBUG_H
-#endif
-
Index: doc/CHANGES
===================================================================
--- doc/CHANGES	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ doc/CHANGES	(revision b135438c4c6aeb5a7cd3403f0cf37e741d589cd3)
@@ -1,2 +1,8 @@
+Version 1.0:
+- Removed some crashy debugging code.
+- QUIT command now works before logging in. (Mainly an RFC-compliancy fix.)
+
+Finished ...
+
 Version 0.99:
 - Fixed memory initialization bug in OSCAR module that caused crashes on
Index: doc/Makefile
===================================================================
--- doc/Makefile	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ doc/Makefile	(revision b135438c4c6aeb5a7cd3403f0cf37e741d589cd3)
@@ -5,10 +5,10 @@
 	install -m 0644 bitlbee.8 $(DESTDIR)$(MANDIR)/man8/
 	install -m 0644 bitlbee.conf.5 $(DESTDIR)$(MANDIR)/man5/
-	make -C user-guide $@
+	$(MAKE) -C user-guide $@
 
 uninstall:
 	rm -f $(DESTDIR)$(MANDIR)/man8/bitlbee.8*
 	rm -f $(DESTDIR)$(MANDIR)/man5/bitlbee.conf.5*
-	make -C user-guide $@
+	$(MAKE) -C user-guide $@
 
 .PHONY: install uninstall
Index: doc/bitlbee.8
===================================================================
--- doc/bitlbee.8	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ doc/bitlbee.8	(revision b135438c4c6aeb5a7cd3403f0cf37e741d589cd3)
@@ -98,7 +98,6 @@
 the on-line help system.
 .SH BUGS
-Of course there are bugs. If you find some, please report them by e-mail
-to \fBwilmer@gaast.net\fP, or join \fB#bitlbee\fP on the OFTC network.
-(\fBirc.bitlbee.org\fP)
+Of course there are bugs. If you find some, please report them at
+\fBhttp://bugs.bitlbee.org/\fP.
 .SH LICENSE
 This program is free software; you can redistribute it and/or modify
Index: doc/user-guide/help.txt
===================================================================
--- doc/user-guide/help.txt	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ doc/user-guide/help.txt	(revision b135438c4c6aeb5a7cd3403f0cf37e741d589cd3)
@@ -10,7 +10,7 @@
 You can read more about them with help <subject>
 
-BitlBee is written by Wilmer van der Gaast together with Jelmer Vernooij, Maurits Dijkstra and others. Bug reports and other kinds of feedback can be sent by e-mail to wilmer@gaast.net. (There is no BitlBee mailing list)
-
-Or just join #BitlBee on OFTC (irc.oftc.net) (OFTC, *not* FreeNode! Some people accidentally joined #BitlBee on FreeNode already, which is just an empty channel) and flame us right in the face. :-)
+BitlBee is written by Wilmer van der Gaast together with Jelmer Vernooij, Maurits Dijkstra and others. Bugs can be reported at http://bugs.bitlbee.org/.
+
+For other things than bug reports, you can join #BitlBee on OFTC (irc.oftc.net) (OFTC, *not* FreeNode!) and flame us right in the face. :-)
 %
 ?index
Index: doc/user-guide/help.xml
===================================================================
--- doc/user-guide/help.xml	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ doc/user-guide/help.xml	(revision b135438c4c6aeb5a7cd3403f0cf37e741d589cd3)
@@ -24,9 +24,9 @@
 
 <para>
-BitlBee is written by Wilmer van der Gaast together with Jelmer Vernooij, Maurits Dijkstra and others. Bug reports and other kinds of feedback can be sent by e-mail to <emphasis>wilmer@gaast.net</emphasis>. (There is no BitlBee mailing list)
+BitlBee is written by Wilmer van der Gaast together with Jelmer Vernooij, Maurits Dijkstra and others. Bugs can be reported at <ulink link="http://bugs.bitlbee.org/">http://bugs.bitlbee.org/</ulink>.
 </para>
 
 <para>
-Or just join <emphasis>#BitlBee</emphasis> on OFTC (<emphasis>irc.oftc.net</emphasis>) (OFTC, *not* FreeNode! Some people accidentally joined #BitlBee on FreeNode already, which is just an empty channel) and flame us right in the face. :-)
+For other things than bug reports, you can join <emphasis>#BitlBee</emphasis> on OFTC (<emphasis>irc.oftc.net</emphasis>) (OFTC, *not* FreeNode!) and flame us right in the face. :-)
 </para>
 
Index: doc/user-guide/user-guide.html
===================================================================
--- doc/user-guide/user-guide.html	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ doc/user-guide/user-guide.html	(revision b135438c4c6aeb5a7cd3403f0cf37e741d589cd3)
@@ -13,10 +13,10 @@
          Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
          USA.
-       </p></div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="chapter"><a href="#Installation">1. Installation</a></span></dt><dd><dl><dt><span class="sect1"><a href="#id4683446">Downloading the package</a></span></dt><dt><span class="sect1"><a href="#id4683474">Compiling</a></span></dt><dt><span class="sect1"><a href="#id4683726">Configuration</a></span></dt></dl></dd><dt><span class="chapter"><a href="#Usage">2. Usage</a></span></dt><dd><dl><dt><span class="sect1"><a href="#id4683835">Connecting to the server</a></span></dt><dt><span class="sect1"><a href="#id4683848">The #bitlbee control channel</a></span></dt><dt><span class="sect1"><a href="#id4683867">Talking to people</a></span></dt></dl></dd><dt><span class="chapter"><a href="#Support">3. Support</a></span></dt><dd><dl><dt><span class="sect1"><a href="#id4683912">BitlBee is beta software</a></span></dt><dt><span class="sect1"><a href="#id4683926">Support channels</a></span></dt><dd><dl><dt><span class="sect2"><a href="#id4683931">The World Wide Web</a></span></dt><dt><span class="sect2"><a href="#id4683948">IRC</a></span></dt><dt><span class="sect2"><a href="#id4683960">Mailinglists</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#quickstart">4. Quickstart</a></span></dt><dd><dl><dt><span class="sect1"><a href="#quickstart2">Add and Connect To your IM Account(s)</a></span></dt><dt><span class="sect1"><a href="#quickstart3">Managing Contact Lists: Rename</a></span></dt><dt><span class="sect1"><a href="#quickstart4">Step Four: Managing Contact Lists: Add and Remove.</a></span></dt><dt><span class="sect1"><a href="#quickstart5">Chatting</a></span></dt><dt><span class="sect1"><a href="#quickstart6">Further Resources</a></span></dt></dl></dd><dt><span class="chapter"><a href="#commands">5. Bitlbee commands</a></span></dt><dd><dl><dt><span class="sect1"><a href="#cmd_account">account - IM-account list maintenance</a></span></dt><dd><dl><dt><span class="sect2"><a href="#cmd_account_add">account add</a></span></dt><dt><span class="sect2"><a href="#cmd_account_del">account del</a></span></dt><dt><span class="sect2"><a href="#cmd_account_on">account on</a></span></dt><dt><span class="sect2"><a href="#cmd_account_off">account off</a></span></dt><dt><span class="sect2"><a href="#cmd_account_list">account list</a></span></dt></dl></dd><dt><span class="sect1"><a href="#cmd_add">add - Add a buddy to your contact list</a></span></dt><dt><span class="sect1"><a href="#cmd_info">info - Request user information</a></span></dt><dt><span class="sect1"><a href="#cmd_remove">remove - Remove a buddy from your contact list</a></span></dt><dt><span class="sect1"><a href="#cmd_block">block - Block someone</a></span></dt><dt><span class="sect1"><a href="#cmd_allow">allow - Unblock someone</a></span></dt><dt><span class="sect1"><a href="#cmd_set">set - Miscellaneous settings</a></span></dt><dt><span class="sect1"><a href="#cmd_help">help - BitlBee help system</a></span></dt><dt><span class="sect1"><a href="#cmd_save">save - Save your account data</a></span></dt><dt><span class="sect1"><a href="#set_charset">charset</a></span></dt><dt><span class="sect1"><a href="#set_private">private</a></span></dt><dt><span class="sect1"><a href="#set_save_on_quit">save_on_quit</a></span></dt><dt><span class="sect1"><a href="#set_html">html</a></span></dt><dt><span class="sect1"><a href="#set_debug">debug</a></span></dt><dt><span class="sect1"><a href="#set_to_char">to_char</a></span></dt><dt><span class="sect1"><a href="#set_typing_notice">typing_notice</a></span></dt><dt><span class="sect1"><a href="#set_ops">ops</a></span></dt><dt><span class="sect1"><a href="#set_away_devoice">away_devoice</a></span></dt><dt><span class="sect1"><a href="#set_handle_unknown">handle_unknown</a></span></dt><dt><span class="sect1"><a href="#set_auto_connect">auto_connect</a></span></dt><dt><span class="sect1"><a href="#set_auto_reconnect">auto_reconnect</a></span></dt><dt><span class="sect1"><a href="#set_auto_reconnect_delay">auto_reconnect_delay</a></span></dt><dt><span class="sect1"><a href="#set_buddy_sendbuffer">buddy_sendbuffer</a></span></dt><dt><span class="sect1"><a href="#set_buddy_sendbuffer_delay">buddy_sendbuffer_delay</a></span></dt><dt><span class="sect1"><a href="#set_default_target">default_target</a></span></dt><dt><span class="sect1"><a href="#set_display_namechanges">display_namechanges</a></span></dt><dt><span class="sect1"><a href="#set_password">password</a></span></dt><dt><span class="sect1"><a href="#set_query_order">query_order</a></span></dt><dt><span class="sect1"><a href="#set_lcnicks">lcnicks</a></span></dt><dt><span class="sect1"><a href="#cmd_rename">rename - Rename (renick) a buddy</a></span></dt><dt><span class="sect1"><a href="#cmd_yes">yes - Accept a request</a></span></dt><dt><span class="sect1"><a href="#cmd_no">no - Deny a request</a></span></dt><dt><span class="sect1"><a href="#cmd_qlist">qlist - List all the unanswered questions root asked</a></span></dt><dt><span class="sect1"><a href="#cmd_register">register - Register yourself</a></span></dt><dt><span class="sect1"><a href="#cmd_identify">identify - Identify yourself with your password</a></span></dt><dt><span class="sect1"><a href="#cmd_drop">drop - Drop your account</a></span></dt><dt><span class="sect1"><a href="#cmd_blist">blist - List all the buddies in your contact list</a></span></dt><dt><span class="sect1"><a href="#cmd_nick">nick - Change friendly name, nick</a></span></dt><dt><span class="sect1"><a href="#cmd_import_buddies">import_buddies - Copy local buddy list to server (normally only needed when upgrading)</a></span></dt></dl></dd><dt><span class="chapter"><a href="#misc">6. Misc Stuff</a></span></dt><dd><dl><dt><span class="sect1"><a href="#smileys">Smileys</a></span></dt><dt><span class="sect1"><a href="#groupchats">Groupchats</a></span></dt><dt><span class="sect1"><a href="#groupchats2">Creating groupchats</a></span></dt><dt><span class="sect1"><a href="#groupchats3">Groupchat channel names</a></span></dt><dt><span class="sect1"><a href="#away">Away states</a></span></dt></dl></dd></dl></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="Installation"></a>Chapter 1. Installation</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#id4683446">Downloading the package</a></span></dt><dt><span class="sect1"><a href="#id4683474">Compiling</a></span></dt><dt><span class="sect1"><a href="#id4683726">Configuration</a></span></dt></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id4683446"></a>Downloading the package</h2></div></div></div><p>
+       </p></div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="chapter"><a href="#Installation">1. Installation</a></span></dt><dd><dl><dt><span class="sect1"><a href="#id2488359">Downloading the package</a></span></dt><dt><span class="sect1"><a href="#id2449756">Compiling</a></span></dt><dt><span class="sect1"><a href="#id2449897">Configuration</a></span></dt></dl></dd><dt><span class="chapter"><a href="#Usage">2. Usage</a></span></dt><dd><dl><dt><span class="sect1"><a href="#id2450201">Connecting to the server</a></span></dt><dt><span class="sect1"><a href="#id2450215">The #bitlbee control channel</a></span></dt><dt><span class="sect1"><a href="#id2450234">Talking to people</a></span></dt></dl></dd><dt><span class="chapter"><a href="#Support">3. Support</a></span></dt><dd><dl><dt><span class="sect1"><a href="#id2450279">BitlBee is beta software</a></span></dt><dt><span class="sect1"><a href="#id2450293">Support channels</a></span></dt><dd><dl><dt><span class="sect2"><a href="#id2450298">The World Wide Web</a></span></dt><dt><span class="sect2"><a href="#id2450315">IRC</a></span></dt><dt><span class="sect2"><a href="#id2450326">Mailinglists</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#quickstart">4. Quickstart</a></span></dt><dd><dl><dt><span class="sect1"><a href="#quickstart2">Add and Connect To your IM Account(s)</a></span></dt><dt><span class="sect1"><a href="#quickstart3">Managing Contact Lists: Rename</a></span></dt><dt><span class="sect1"><a href="#quickstart4">Step Four: Managing Contact Lists: Add and Remove.</a></span></dt><dt><span class="sect1"><a href="#quickstart5">Chatting</a></span></dt><dt><span class="sect1"><a href="#quickstart6">Further Resources</a></span></dt></dl></dd><dt><span class="chapter"><a href="#commands">5. Bitlbee commands</a></span></dt><dd><dl><dt><span class="sect1"><a href="#cmd_account">account - IM-account list maintenance</a></span></dt><dd><dl><dt><span class="sect2"><a href="#cmd_account_add">account add</a></span></dt><dt><span class="sect2"><a href="#cmd_account_del">account del</a></span></dt><dt><span class="sect2"><a href="#cmd_account_on">account on</a></span></dt><dt><span class="sect2"><a href="#cmd_account_off">account off</a></span></dt><dt><span class="sect2"><a href="#cmd_account_list">account list</a></span></dt></dl></dd><dt><span class="sect1"><a href="#cmd_add">add - Add a buddy to your contact list</a></span></dt><dt><span class="sect1"><a href="#cmd_info">info - Request user information</a></span></dt><dt><span class="sect1"><a href="#cmd_remove">remove - Remove a buddy from your contact list</a></span></dt><dt><span class="sect1"><a href="#cmd_block">block - Block someone</a></span></dt><dt><span class="sect1"><a href="#cmd_allow">allow - Unblock someone</a></span></dt><dt><span class="sect1"><a href="#cmd_set">set - Miscellaneous settings</a></span></dt><dt><span class="sect1"><a href="#cmd_help">help - BitlBee help system</a></span></dt><dt><span class="sect1"><a href="#cmd_save">save - Save your account data</a></span></dt><dt><span class="sect1"><a href="#set_charset">charset</a></span></dt><dt><span class="sect1"><a href="#set_private">private</a></span></dt><dt><span class="sect1"><a href="#set_save_on_quit">save_on_quit</a></span></dt><dt><span class="sect1"><a href="#set_html">html</a></span></dt><dt><span class="sect1"><a href="#set_debug">debug</a></span></dt><dt><span class="sect1"><a href="#set_to_char">to_char</a></span></dt><dt><span class="sect1"><a href="#set_typing_notice">typing_notice</a></span></dt><dt><span class="sect1"><a href="#set_ops">ops</a></span></dt><dt><span class="sect1"><a href="#set_away_devoice">away_devoice</a></span></dt><dt><span class="sect1"><a href="#set_handle_unknown">handle_unknown</a></span></dt><dt><span class="sect1"><a href="#set_auto_connect">auto_connect</a></span></dt><dt><span class="sect1"><a href="#set_auto_reconnect">auto_reconnect</a></span></dt><dt><span class="sect1"><a href="#set_auto_reconnect_delay">auto_reconnect_delay</a></span></dt><dt><span class="sect1"><a href="#set_buddy_sendbuffer">buddy_sendbuffer</a></span></dt><dt><span class="sect1"><a href="#set_buddy_sendbuffer_delay">buddy_sendbuffer_delay</a></span></dt><dt><span class="sect1"><a href="#set_default_target">default_target</a></span></dt><dt><span class="sect1"><a href="#set_display_namechanges">display_namechanges</a></span></dt><dt><span class="sect1"><a href="#set_password">password</a></span></dt><dt><span class="sect1"><a href="#set_query_order">query_order</a></span></dt><dt><span class="sect1"><a href="#set_lcnicks">lcnicks</a></span></dt><dt><span class="sect1"><a href="#cmd_rename">rename - Rename (renick) a buddy</a></span></dt><dt><span class="sect1"><a href="#cmd_yes">yes - Accept a request</a></span></dt><dt><span class="sect1"><a href="#cmd_no">no - Deny a request</a></span></dt><dt><span class="sect1"><a href="#cmd_qlist">qlist - List all the unanswered questions root asked</a></span></dt><dt><span class="sect1"><a href="#cmd_register">register - Register yourself</a></span></dt><dt><span class="sect1"><a href="#cmd_identify">identify - Identify yourself with your password</a></span></dt><dt><span class="sect1"><a href="#cmd_drop">drop - Drop your account</a></span></dt><dt><span class="sect1"><a href="#cmd_blist">blist - List all the buddies in your contact list</a></span></dt><dt><span class="sect1"><a href="#cmd_nick">nick - Change friendly name, nick</a></span></dt><dt><span class="sect1"><a href="#cmd_import_buddies">import_buddies - Copy local buddy list to server (normally only needed when upgrading)</a></span></dt></dl></dd><dt><span class="chapter"><a href="#misc">6. Misc Stuff</a></span></dt><dd><dl><dt><span class="sect1"><a href="#smileys">Smileys</a></span></dt><dt><span class="sect1"><a href="#groupchats">Groupchats</a></span></dt><dt><span class="sect1"><a href="#groupchats2">Creating groupchats</a></span></dt><dt><span class="sect1"><a href="#groupchats3">Groupchat channel names</a></span></dt><dt><span class="sect1"><a href="#away">Away states</a></span></dt></dl></dd></dl></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="Installation"></a>Chapter 1. Installation</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#id2488359">Downloading the package</a></span></dt><dt><span class="sect1"><a href="#id2449756">Compiling</a></span></dt><dt><span class="sect1"><a href="#id2449897">Configuration</a></span></dt></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2488359"></a>Downloading the package</h2></div></div></div><p>
 The latest BitlBee release is always available from <a href="http://www.bitlbee.org/" target="_top">http://www.bitlbee.org/</a>.
 Download the package with your favorite program and unpack it: <span><strong class="command">tar
 xvfz bitlbee-&lt;version&gt;.tar.gz</strong></span> where &lt;version&gt; is to be
 replaced by the version number of the BitlBee you downloaded (e.g. 0.91).
-</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id4683474"></a>Compiling</h2></div></div></div><p>
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2449756"></a>Compiling</h2></div></div></div><p>
 BitlBee's build system has to be configured before compiling. The
 <code class="filename">configure</code> script will do this for you. Just run
@@ -50,5 +50,5 @@
 <span><strong class="command">make</strong></span>. After that, run <span><strong class="command">make install</strong></span> as 
 root.
-</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id4683726"></a>Configuration</h2></div></div></div><p>
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2449897"></a>Configuration</h2></div></div></div><p>
 By default, BitlBee runs as the user nobody. You might want 
 to run it as a seperate user (some computers run named or apache as nobody). 
@@ -78,9 +78,9 @@
 Because things like passwords are saved in this directory, it's probably
 a good idea to make this directory owner-read-/writable only.
-</p></div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="Usage"></a>Chapter 2. Usage</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#id4683835">Connecting to the server</a></span></dt><dt><span class="sect1"><a href="#id4683848">The #bitlbee control channel</a></span></dt><dt><span class="sect1"><a href="#id4683867">Talking to people</a></span></dt></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id4683835"></a>Connecting to the server</h2></div></div></div><p>
+</p></div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="Usage"></a>Chapter 2. Usage</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#id2450201">Connecting to the server</a></span></dt><dt><span class="sect1"><a href="#id2450215">The #bitlbee control channel</a></span></dt><dt><span class="sect1"><a href="#id2450234">Talking to people</a></span></dt></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2450201"></a>Connecting to the server</h2></div></div></div><p>
 Since BitlBee acts just like any other irc daemon, you can connect to 
 it with your favorite irc client. Launch it and connect to localhost port 6667
 (or whatever host/port you are running bitlbee on).
-</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id4683848"></a>The #bitlbee control channel</h2></div></div></div><p>
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2450215"></a>The #bitlbee control channel</h2></div></div></div><p>
 Once you are connected to the BitlBee server, you are automatically joined
 to #bitlbee on that server. This channel acts like the 'buddy list' you have
@@ -89,5 +89,5 @@
 The user 'root' always hangs around in #bitlbee and acts as your interface 
 to bitlbee. All commands you give on #bitlbee are 'answered' by root.
-</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id4683867"></a>Talking to people</h2></div></div></div><p>
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2450234"></a>Talking to people</h2></div></div></div><p>
 You can talk to by starting a query with them. In most irc clients, 
 this can be done with either <span><strong class="command">/msg &lt;nick&gt; &lt;text&gt;</strong></span>
@@ -96,14 +96,14 @@
 To keep the number of open query windows limited, you can also talk to people
 in the control channel, like <span><strong class="command">&lt;nick&gt;: &lt;text&gt;</strong></span>.
-</p></div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="Support"></a>Chapter 3. Support</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#id4683912">BitlBee is beta software</a></span></dt><dt><span class="sect1"><a href="#id4683926">Support channels</a></span></dt><dd><dl><dt><span class="sect2"><a href="#id4683931">The World Wide Web</a></span></dt><dt><span class="sect2"><a href="#id4683948">IRC</a></span></dt><dt><span class="sect2"><a href="#id4683960">Mailinglists</a></span></dt></dl></dd></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id4683912"></a>BitlBee is beta software</h2></div></div></div><p>
+</p></div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="Support"></a>Chapter 3. Support</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#id2450279">BitlBee is beta software</a></span></dt><dt><span class="sect1"><a href="#id2450293">Support channels</a></span></dt><dd><dl><dt><span class="sect2"><a href="#id2450298">The World Wide Web</a></span></dt><dt><span class="sect2"><a href="#id2450315">IRC</a></span></dt><dt><span class="sect2"><a href="#id2450326">Mailinglists</a></span></dt></dl></dd></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2450279"></a>BitlBee is beta software</h2></div></div></div><p>
 Although BitlBee has quite some functionality it is still beta. That means it 
 can crash at any time, corrupt your data or whatever. Don't use it in 
 any production environment and don't rely on it.
-</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id4683926"></a>Support channels</h2></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id4683931"></a>The World Wide Web</h3></div></div></div><p><a href="http://www.bitlbee.org/" target="_top">http://www.bitlbee.org/</a> 
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2450293"></a>Support channels</h2></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2450298"></a>The World Wide Web</h3></div></div></div><p><a href="http://www.bitlbee.org/" target="_top">http://www.bitlbee.org/</a> 
 is the homepage of bitlbee and contains the most recent news on bitlbee and 
 the latest releases.
-</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id4683948"></a>IRC</h3></div></div></div><p>
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2450315"></a>IRC</h3></div></div></div><p>
 BitlBee is discussed on #bitlbee on the OFTC IRC network (server: irc.oftc.net).
-</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id4683960"></a>Mailinglists</h3></div></div></div><p>
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2450326"></a>Mailinglists</h3></div></div></div><p>
 BitlBee doesn't have any mailinglists.
 </p></div></div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="quickstart"></a>Chapter 4. Quickstart</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#quickstart2">Add and Connect To your IM Account(s)</a></span></dt><dt><span class="sect1"><a href="#quickstart3">Managing Contact Lists: Rename</a></span></dt><dt><span class="sect1"><a href="#quickstart4">Step Four: Managing Contact Lists: Add and Remove.</a></span></dt><dt><span class="sect1"><a href="#quickstart5">Chatting</a></span></dt><dt><span class="sect1"><a href="#quickstart6">Further Resources</a></span></dt></dl></div><p>
Index: doc/user-guide/user-guide.txt
===================================================================
--- doc/user-guide/user-guide.txt	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ doc/user-guide/user-guide.txt	(revision b135438c4c6aeb5a7cd3403f0cf37e741d589cd3)
@@ -108,5 +108,5 @@
     Away states
 
-Chapter 1. Installation
+Chapter 1. Installation
 
 Table of Contents
@@ -192,5 +192,5 @@
 idea to make this directory owner-read-/writable only.
 
-Chapter 2. Usage
+Chapter 2. Usage
 
 Table of Contents
@@ -223,5 +223,5 @@
 in the control channel, like <nick>: <text>.
 
-Chapter 3. Support
+Chapter 3. Support
 
 Table of Contents
@@ -256,5 +256,5 @@
 BitlBee doesn't have any mailinglists.
 
-Chapter 4. Quickstart
+Chapter 4. Quickstart
 
 Table of Contents
@@ -389,5 +389,5 @@
 suggestion. Good luck and enjoy the Bee!
 
-Chapter 5. Bitlbee commands
+Chapter 5. Bitlbee commands
 
 Table of Contents
@@ -443,5 +443,5 @@
 account - IM-account list maintenance
 
-Syntax: 
+Syntax: 
 
 account <action> [<arguments>]
@@ -452,5 +452,5 @@
 account add
 
-Syntax: 
+Syntax: 
 
 account add <protocol> <username> <password> [<server>]
@@ -463,5 +463,5 @@
 account add jabber
 
-Syntax: 
+Syntax: 
 
 account add jabber <handle> <password> [<servertag>]
@@ -482,5 +482,5 @@
 account add msn
 
-Syntax: 
+Syntax: 
 
 account add msn <handle> <password>
@@ -490,5 +490,5 @@
 account add oscar
 
-Syntax: 
+Syntax: 
 
 account add oscar <handle> <password> [<servername>]
@@ -505,5 +505,5 @@
 account add yahoo
 
-Syntax: 
+Syntax: 
 
 account add yahoo <handle> <password>
@@ -513,5 +513,5 @@
 account del
 
-Syntax: 
+Syntax: 
 
 account del <account id>
@@ -525,5 +525,5 @@
 account on
 
-Syntax: 
+Syntax: 
 
 account on [<account id>]
@@ -538,5 +538,5 @@
 account off
 
-Syntax: 
+Syntax: 
 
 account off [<account id>]
@@ -551,5 +551,5 @@
 account list
 
-Syntax: 
+Syntax: 
 
 account list
@@ -560,5 +560,5 @@
 add - Add a buddy to your contact list
 
-Syntax: 
+Syntax: 
 
 add <connection> <handle> [<nick>]
@@ -577,5 +577,5 @@
 info - Request user information
 
-Syntax: 
+Syntax: 
 
 info <connection> <handle>
@@ -592,5 +592,5 @@
 remove - Remove a buddy from your contact list
 
-Syntax: 
+Syntax: 
 
 remove <nick>
@@ -603,5 +603,5 @@
 block - Block someone
 
-Syntax: 
+Syntax: 
 
 block <nick>
@@ -614,5 +614,5 @@
 allow - Unblock someone
 
-Syntax: 
+Syntax: 
 
 allow <nick>
@@ -624,5 +624,5 @@
 set - Miscellaneous settings
 
-Syntax: 
+Syntax: 
 
 set [<variable> [<value>]]
@@ -638,5 +638,5 @@
 help - BitlBee help system
 
-Syntax: 
+Syntax: 
 
 help [subject]
@@ -647,5 +647,5 @@
 save - Save your account data
 
-Syntax: 
+Syntax: 
 
 save
@@ -848,5 +848,5 @@
 rename - Rename (renick) a buddy
 
-Syntax: 
+Syntax: 
 
 rename <oldnick> <newnick>
@@ -860,5 +860,5 @@
 yes - Accept a request
 
-Syntax: 
+Syntax: 
 
 yes [<number>]
@@ -873,5 +873,5 @@
 no - Deny a request
 
-Syntax: 
+Syntax: 
 
 no [<number>]
@@ -886,5 +886,5 @@
 qlist - List all the unanswered questions root asked
 
-Syntax: 
+Syntax: 
 
 qlist
@@ -894,5 +894,5 @@
 register - Register yourself
 
-Syntax: 
+Syntax: 
 
 register <password>
@@ -911,5 +911,5 @@
 identify - Identify yourself with your password
 
-Syntax: 
+Syntax: 
 
 identify <password>
@@ -925,5 +925,5 @@
 drop - Drop your account
 
-Syntax: 
+Syntax: 
 
 drop <password>
@@ -935,5 +935,5 @@
 blist - List all the buddies in your contact list
 
-Syntax: 
+Syntax: 
 
 blist [all|online|offline|away]
@@ -944,5 +944,5 @@
 nick - Change friendly name, nick
 
-Syntax: 
+Syntax: 
 
 nick <connection> [<new nick>]
@@ -960,5 +960,5 @@
 upgrading)
 
-Syntax: 
+Syntax: 
 
 import_buddies <connection> [clear]
@@ -982,5 +982,5 @@
 command again.
 
-Chapter 6. Misc Stuff
+Chapter 6. Misc Stuff
 
 Table of Contents
Index: help.c
===================================================================
--- help.c	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ help.c	(revision b135438c4c6aeb5a7cd3403f0cf37e741d589cd3)
@@ -2,5 +2,5 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2004 Wilmer van der Gaast and others                *
+  * Copyright 2002-2005 Wilmer van der Gaast and others                *
   \********************************************************************/
 
Index: ini.c
===================================================================
--- ini.c	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ ini.c	(revision b135438c4c6aeb5a7cd3403f0cf37e741d589cd3)
@@ -2,5 +2,5 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2004 Wilmer van der Gaast and others                *
+  * Copyright 2002-2005 Wilmer van der Gaast and others                *
   \********************************************************************/
 
Index: irc.c
===================================================================
--- irc.c	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ irc.c	(revision b135438c4c6aeb5a7cd3403f0cf37e741d589cd3)
@@ -162,5 +162,5 @@
 	if( irc->w_watch_source_id > 0 )
 		g_source_remove( irc->w_watch_source_id );
-	g_io_channel_close( irc->io_channel );
+	
 	g_io_channel_unref( irc->io_channel );
 	irc_connection_list = g_slist_remove( irc_connection_list, irc );
@@ -462,4 +462,10 @@
 		}
 		return( 1 );
+	}
+	else if( g_strcasecmp( cmd[0], "QUIT" ) == 0 )
+	{
+		irc_write( irc, "ERROR :%s%s", cmd[1]?"Quit: ":"", cmd[1]?cmd[1]:"Client Quit" );
+		g_io_channel_close( irc->io_channel );
+		return( 0 );
 	}
 	
@@ -637,10 +643,4 @@
 		}
 	}
-	else if( g_strcasecmp( cmd[0], "QUIT" ) == 0 )
-	{
-		irc_write( irc, "ERROR :%s%s", cmd[1]?"Quit: ":"", cmd[1]?cmd[1]:"Client Quit" );
-		g_io_channel_close( irc->io_channel );
-		return( 0 );
-	}
 	else if( g_strcasecmp( cmd[0], "WHO" ) == 0 )
 	{
Index: log.c
===================================================================
--- log.c	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ log.c	(revision b135438c4c6aeb5a7cd3403f0cf37e741d589cd3)
@@ -2,5 +2,5 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2004 Wilmer van der Gaast and others                *
+  * Copyright 2002-2005 Wilmer van der Gaast and others                *
   \********************************************************************/
 
Index: log.h
===================================================================
--- log.h	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ log.h	(revision b135438c4c6aeb5a7cd3403f0cf37e741d589cd3)
@@ -2,5 +2,5 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2004 Wilmer van der Gaast and others                *
+  * Copyright 2002-2005 Wilmer van der Gaast and others                *
   \********************************************************************/
 
Index: protocols/msn/sb.c
===================================================================
--- protocols/msn/sb.c	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ protocols/msn/sb.c	(revision b135438c4c6aeb5a7cd3403f0cf37e741d589cd3)
@@ -2,5 +2,5 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2004 Wilmer van der Gaast and others                *
+  * Copyright 2002-2005 Wilmer van der Gaast and others                *
   \********************************************************************/
 
Index: protocols/nogaim.c
===================================================================
--- protocols/nogaim.c	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ protocols/nogaim.c	(revision b135438c4c6aeb5a7cd3403f0cf37e741d589cd3)
@@ -468,5 +468,5 @@
 void do_error_dialog( struct gaim_connection *gc, char *msg, char *title )
 {
-	irc_usermsg( gc->irc, "%s(%s) - Error: %s", gc->username, title, msg );
+	irc_usermsg( gc->irc, "%s(%s) - Error: %s", gc->prpl->name, gc->username, msg );
 }
 
Index: protocols/oscar/aim_internal.h
===================================================================
--- protocols/oscar/aim_internal.h	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ protocols/oscar/aim_internal.h	(revision b135438c4c6aeb5a7cd3403f0cf37e741d589cd3)
@@ -107,5 +107,4 @@
 
 void aim_initsnachash(aim_session_t *sess);
-aim_snacid_t aim_newsnac(aim_session_t *, aim_snac_t *newsnac);
 aim_snacid_t aim_cachesnac(aim_session_t *sess, const guint16 family, const guint16 type, const guint16 flags, const void *data, const int datalen);
 aim_snac_t *aim_remsnac(aim_session_t *, aim_snacid_t id);
Index: protocols/oscar/snac.c
===================================================================
--- protocols/oscar/snac.c	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ protocols/oscar/snac.c	(revision b135438c4c6aeb5a7cd3403f0cf37e741d589cd3)
@@ -14,4 +14,6 @@
 
 #include <aim.h>
+
+static aim_snacid_t aim_newsnac(aim_session_t *sess, aim_snac_t *newsnac);
 
 /*
@@ -51,5 +53,5 @@
  * list/hash.
  */
-aim_snacid_t aim_newsnac(aim_session_t *sess, aim_snac_t *newsnac)
+static aim_snacid_t aim_newsnac(aim_session_t *sess, aim_snac_t *newsnac)
 {
 	aim_snac_t *snac;
Index: protocols/proxy.c
===================================================================
--- protocols/proxy.c	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ protocols/proxy.c	(revision b135438c4c6aeb5a7cd3403f0cf37e741d589cd3)
@@ -97,32 +97,4 @@
 }
 
-#ifdef PROXYPROFILER
-struct proxyprofiler
-{
-	GaimInputFunction function;
-	gpointer data;
-	
-	int count;
-	
-	struct proxyprofiler *next;
-} *pp = NULL;
-
-void proxyprofiler_dump()
-{
-	struct proxyprofiler *l;
-	char s[128];
-	FILE *fp;
-	
-	sprintf( s, "proxyprofiler.%d", (int) getpid() );
-	fp = fopen( s, "w" );
-	
-	fprintf( fp, "%-18s  %-18s  %10s\n", "Function", "Data", "Count" );
-	for( l = pp; l; l = l->next )
-		fprintf( fp, "0x%-16x  0x%-16x  %10d\n", (int) l->function, (int) l->data, l->count );
-	
-	fclose( fp );
-}
-#endif
-
 static gboolean gaim_io_invoke(GIOChannel *source, GIOCondition condition, gpointer data)
 {
@@ -130,30 +102,4 @@
 	GaimInputCondition gaim_cond = 0;
 
-#ifdef PROXYPROFILER
-	struct proxyprofiler *l;
-	
-	for( l = pp; l; l = l->next )
-	{
-		if( closure->function == l->function && closure->data == l->data )
-			break;
-	}
-	if( l )
-	{
-		l->count ++;
-	}
-	else
-	{
-		l = g_new0( struct proxyprofiler, 1 );
-		l->function = closure->function;
-		l->data = closure->data;
-		l->count = 1;
-		
-		l->next = pp;
-		pp = l;
-	}
-#endif
-	
-	count_io_event(source, "proxy");
-	
 	if (condition & GAIM_READ_COND)
 		gaim_cond |= GAIM_INPUT_READ;
Index: protocols/ssl_nss.c
===================================================================
--- protocols/ssl_nss.c	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ protocols/ssl_nss.c	(revision b135438c4c6aeb5a7cd3403f0cf37e741d589cd3)
@@ -2,10 +2,10 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2004 Wilmer van der Gaast and others                *
+  * Copyright 2002-2005 Wilmer van der Gaast and others                *
   \********************************************************************/
 
 /* SSL module - NSS version                                             */
 
-/* Copyright 2004 Jelmer Vernooij                                       */
+/* Copyright 2005 Jelmer Vernooij                                       */
 
 /*
Index: set.c
===================================================================
--- set.c	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ set.c	(revision b135438c4c6aeb5a7cd3403f0cf37e741d589cd3)
@@ -2,5 +2,5 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2004 Wilmer van der Gaast and others                *
+  * Copyright 2002-2005 Wilmer van der Gaast and others                *
   \********************************************************************/
 
Index: unix.c
===================================================================
--- unix.c	(revision f7f3ada3350c2a0a99ed307350a230583802cfe0)
+++ unix.c	(revision b135438c4c6aeb5a7cd3403f0cf37e741d589cd3)
@@ -36,5 +36,4 @@
 
 static void sighandler( int signal );
-gboolean bitlbee_dirty_workaround( gpointer data );
 
 int main( int argc, char *argv[] )
@@ -96,21 +95,8 @@
 		log_message( LOGLVL_WARNING, "Error opening helpfile %s.", HELP_FILE );
 	
-	/* Workaround against runaway problems. Bah, this is really dirty,
-	   but in the end not really different from the <=0.91 situation,
-	   which makes it an acceptable temporary "solution". */
-	// g_timeout_add( 0, bitlbee_dirty_workaround, NULL );
-	
 	g_main_run( global.loop );
 	
 	return( 0 );
 }
-
-gboolean bitlbee_dirty_workaround( gpointer data )
-{
-	usleep( 50000 );
-	return( TRUE );
-}
-
-void proxyprofiler_dump();
 
 static void sighandler( int signal )
@@ -142,13 +128,4 @@
 		}
 	}
-#ifdef PROXYPROFILER
-	else if( signal == SIGXCPU )
-	{
-		write_io_activity();
-		proxyprofiler_dump();
-		log_message( LOGLVL_ERROR, "Received SIGXCPU, dumping some debugging info." );
-		exit( 1 );
-	}
-#endif
 	else if( signal != SIGPIPE )
 	{
