Index: debian/NEWS
===================================================================
--- debian/NEWS	(revision a3ca3ddb8b3ba10b1a88854f1ab73341d15abc6b)
+++ 	(revision )
@@ -1,10 +1,0 @@
-bitlbee (3.5-1) unstable; urgency=medium
-
-  * /etc/default/bitlbee is now deprecated and no longer used. Any local
-    modifications to the following settings won't be automatically migrated:
-    BITLBEE_PORT, BITLBEE_OPTS, BITLBEE_DISABLED, BITLBEE_UPGRADE_DONT_RESTART
-  * The debian post-installation scripts no longer try to automatically assign
-    an alternate port number if 6667 is being used by another service. Please
-    set it explicitly in /etc/bitlbee/bitlbee.conf
-
- -- dequis <dx@dxzone.com.ar>  Sun, 08 Jan 2017 03:24:13 -0300
Index: debian/README.Debian
===================================================================
--- debian/README.Debian	(revision a3ca3ddb8b3ba10b1a88854f1ab73341d15abc6b)
+++ debian/README.Debian	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -1,3 +1,7 @@
-Fire up your favourite IRC client and connect to localhost:6667,
+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).
 
Index: debian/bitlbee-common.docs
===================================================================
--- debian/bitlbee-common.docs	(revision a3ca3ddb8b3ba10b1a88854f1ab73341d15abc6b)
+++ 	(revision )
@@ -1,4 +1,0 @@
-doc/AUTHORS
-doc/CREDITS
-doc/FAQ
-doc/README
Index: debian/bitlbee-common.examples
===================================================================
--- debian/bitlbee-common.examples	(revision a3ca3ddb8b3ba10b1a88854f1ab73341d15abc6b)
+++ 	(revision )
@@ -1,1 +1,0 @@
-utils/*
Index: debian/bitlbee-common.init
===================================================================
--- debian/bitlbee-common.init	(revision a3ca3ddb8b3ba10b1a88854f1ab73341d15abc6b)
+++ 	(revision )
@@ -1,79 +1,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          bitlbee
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description:       Start and stop BitlBee IRC to other chat networks gateway
-### END INIT INFO
-#
-#
-# Version:	@(#)skeleton  2.85-23  28-Jul-2004  miquels@cistron.nl
-#
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DESC="BitlBee IRC/IM gateway"
-NAME=bitlbee
-DAEMON=/usr/sbin/$NAME
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Gracefully exit if the package has been removed.
-[ -x $DAEMON ] || exit 0
-
-BITLBEE_OPTS=-F
-
-
-#
-#	Function that starts the daemon/service.
-#
-d_start() {
-	# Make sure BitlBee can actually write its PID...
-	touch $PIDFILE
-	chown bitlbee: $PIDFILE
-	
-	start-stop-daemon --start --quiet --pidfile $PIDFILE \
-		--exec $DAEMON -- -P $PIDFILE $BITLBEE_OPTS
-}
-
-#
-#	Function that stops the daemon/service.
-#
-d_stop() {
-	start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-		--name $NAME
-}
-
-
-case "$1" in
-  start)
-	echo -n "Starting $DESC: $NAME"
-	d_start
-	echo "."
-	;;
-  stop)
-	echo -n "Stopping $DESC: $NAME"
-	d_stop
-	echo "."
-	;;
-  #reload)
-	#
-	#	No reload target, but there's a REHASH command which we
-	#	might use later...
-	#
-  #;;
-  restart|force-reload)
-	echo -n "Restarting $DESC: $NAME"
-	d_stop
-	sleep 1
-	d_start
-	echo "."
-	;;
-  *)
-	echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
-	exit 1
-	;;
-esac
-
-exit 0
Index: debian/bitlbee-common.postinst
===================================================================
--- debian/bitlbee-common.postinst	(revision a3ca3ddb8b3ba10b1a88854f1ab73341d15abc6b)
+++ 	(revision )
@@ -1,54 +1,0 @@
-#!/bin/sh
-
-set -e
-
-CONFDIR=/var/lib/bitlbee/
-
-if [ -e /etc/default/bitlbee ]; then
-   cat <<EOF >/etc/default/bitlbee
-## /etc/default/bitlbee: Auto-generated/updated script.
-##
-## This file is deprecated and no longer used.
-## Please edit /etc/bitlbee/bitlbee.conf instead
-EOF
-
-fi
-
-## Restore the helpfile in case we weren't upgrading but just reconfiguring:
-if [ -e /usr/share/bitlbee/help.upgrading ]; then
-	if [ -e /usr/share/bitlbee/help.txt ]; then
-		rm -f /usr/share/bitlbee/help.upgrading
-	else
-		mv /usr/share/bitlbee/help.upgrading /usr/share/bitlbee/help.txt
-	fi
-fi
-
-if [ -n "$2" -a -x "/etc/init.d/bitlbee" ]; then
-	invoke-rc.d bitlbee restart
-fi
-
-## If we're upgrading, we'll probably skip this next part
-if [ -d $CONFDIR ] && chown -R bitlbee: $CONFDIR; then
-	echo 'BitlBee (probably) already installed, skipping user/configdir installation'
-else
-	adduser --system --group --disabled-login --disabled-password --home /var/lib/bitlbee/ bitlbee
-fi
-
-if [ -d /var/lib/bitlbee ]; then
-	chmod 700 /var/lib/bitlbee/
-fi
-
-## Can't do this in packaging phase: Don't know the UID yet. Access to
-## the file should be limited, now that it stores passwords. Added
-## --group later for a little more security, but have to see if I can
-## apply this change to existing installations on upgrades. Will think
-## about that later.
-if getent group bitlbee > /dev/null; then
-	chmod 640 /etc/bitlbee/bitlbee.conf
-	chown root:bitlbee /etc/bitlbee/bitlbee.conf
-else
-	chmod 600 /etc/bitlbee/bitlbee.conf
-	chown bitlbee /etc/bitlbee/bitlbee.conf
-fi
-
-#DEBHELPER#
Index: debian/bitlbee-common.postrm
===================================================================
--- debian/bitlbee-common.postrm	(revision a3ca3ddb8b3ba10b1a88854f1ab73341d15abc6b)
+++ 	(revision )
@@ -1,11 +1,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "purge" ]; then
-	rm -f /etc/default/bitlbee
-	deluser --system bitlbee > /dev/null || true
-	rm -rf /var/lib/bitlbee ## deluser doesn't seem to do this for homedirs in /var
-fi
-
-#DEBHELPER#
Index: debian/bitlbee-common.preinst
===================================================================
--- debian/bitlbee-common.preinst	(revision a3ca3ddb8b3ba10b1a88854f1ab73341d15abc6b)
+++ 	(revision )
@@ -1,20 +1,0 @@
-#!/bin/sh
-
-set -e
-
-NAME=bitlbee
-PIDFILE=/var/run/$NAME.pid
-
-# git revision 7949d5a introduced dh_systemd.
-DH_SYSTEMD_REV="3.4.2+20160612+master+41-g7949d5a-git"
-
-# if upgrading from something older (including 3.4.2), kill the old daemon.
-# do this just once, this time, to allow systemd to manage it.
-if [ "$1" = 'upgrade' ]; then
-	if dpkg --compare-versions $2 lt $DH_SYSTEMD_REV; then
-		# we may not have init scripts here
-		start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE --name $NAME
-	fi
-fi
-
-#DEBHELPER#
Index: debian/bitlbee-common.prerm
===================================================================
--- debian/bitlbee-common.prerm	(revision a3ca3ddb8b3ba10b1a88854f1ab73341d15abc6b)
+++ 	(revision )
@@ -1,15 +1,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "upgrade" ]; then
-	## To prevent the help function from breaking in currently running
-	## BitlBee processes. Have to do it like this because dpkg-reconfigure
-	## looks a lot like an upgrade and we don't want to lose help.txt...
-	if [ -e /usr/share/bitlbee/help.txt ]; then
-		rm -f /usr/share/bitlbee/help.upgrading
-		mv /usr/share/bitlbee/help.txt /usr/share/bitlbee/help.upgrading
-	fi
-fi
-
-#DEBHELPER#
Index: debian/bitlbee-dev.postinst
===================================================================
--- debian/bitlbee-dev.postinst	(revision a3ca3ddb8b3ba10b1a88854f1ab73341d15abc6b)
+++ 	(revision )
@@ -1,14 +1,0 @@
-#!/bin/sh
-set -e
-
-# Replace documentation directory with symlink
-docdir="/usr/share/doc/bitlbee-dev"
-if [ -d $docdir ] && [ ! -L $docdir ]; then
-    if rmdir $docdir 2>/dev/null; then
-        ln -sf bitlbee-common $docdir
-    fi
-fi
-
-#DEBHELPER#
-
-exit 0
Index: debian/bitlbee-libpurple.lintian-overrides
===================================================================
--- debian/bitlbee-libpurple.lintian-overrides	(revision a3ca3ddb8b3ba10b1a88854f1ab73341d15abc6b)
+++ 	(revision )
@@ -1,2 +1,0 @@
-# manpage is installed in bitlbee-common, which bitlbee depends on
-bitlbee-libpurple: binary-without-manpage usr/sbin/bitlbee
Index: debian/bitlbee.conffiles
===================================================================
--- debian/bitlbee.conffiles	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
+++ debian/bitlbee.conffiles	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -0,0 +1,2 @@
+/etc/bitlbee/motd.txt
+/etc/bitlbee/bitlbee.conf
Index: debian/bitlbee.config
===================================================================
--- debian/bitlbee.config	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
+++ debian/bitlbee.config	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -0,0 +1,19 @@
+#!/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: debian/bitlbee.lintian-overrides
===================================================================
--- debian/bitlbee.lintian-overrides	(revision a3ca3ddb8b3ba10b1a88854f1ab73341d15abc6b)
+++ 	(revision )
@@ -1,2 +1,0 @@
-# manpage is installed in bitlbee-common, which bitlbee depends on
-bitlbee: binary-without-manpage usr/sbin/bitlbee
Index: debian/bitlbee.postinst
===================================================================
--- debian/bitlbee.postinst	(revision a3ca3ddb8b3ba10b1a88854f1ab73341d15abc6b)
+++ debian/bitlbee.postinst	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -1,14 +1,22 @@
-#!/bin/sh
-set -e
+#!/bin/sh -e
 
-# Replace documentation directory with symlink
-docdir="/usr/share/doc/bitlbee"
-if [ -d $docdir ] && [ ! -L $docdir ]; then
-    if rmdir $docdir 2>/dev/null; then
-        ln -sf bitlbee-common $docdir
-    fi
+. /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
 
-#DEBHELPER#
+if [ -d $CONFDIR ] && chown bitlbee $CONFDIR; then
+	echo 'BitlBee (probably) already installed, skipping user/configdir installation'
+	exit 0;
+fi
 
-exit 0
+adduser --system --home /var/lib/bitlbee/ --disabled-login --disabled-password bitlbee
+chmod 700 /var/lib/bitlbee/
Index: debian/bitlbee.postrm
===================================================================
--- debian/bitlbee.postrm	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
+++ debian/bitlbee.postrm	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -0,0 +1,12 @@
+#!/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: debian/bitlbee.preinst
===================================================================
--- debian/bitlbee.preinst	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
+++ debian/bitlbee.preinst	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -0,0 +1,4 @@
+#!/bin/sh -e
+
+## To prevent the help function from breaking in  currently running BitlBee processes
+rm -f /usr/share/bitlbee/help.txt
Index: debian/bitlbee.prerm
===================================================================
--- debian/bitlbee.prerm	(revision a3ca3ddb8b3ba10b1a88854f1ab73341d15abc6b)
+++ 	(revision )
@@ -1,9 +1,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" != "upgrade" ]; then
-	invoke-rc.d bitlbee stop
-fi
-
-#DEBHELPER#
Index: debian/bitlbee.templates
===================================================================
--- debian/bitlbee.templates	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
+++ debian/bitlbee.templates	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -0,0 +1,57 @@
+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: debian/bitlbee.templates.master
===================================================================
--- debian/bitlbee.templates.master	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
+++ debian/bitlbee.templates.master	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -0,0 +1,8 @@
+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: debian/changelog
===================================================================
--- debian/changelog	(revision a3ca3ddb8b3ba10b1a88854f1ab73341d15abc6b)
+++ debian/changelog	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -1,571 +1,2 @@
-bitlbee (3.6-2) UNRELEASED; urgency=medium
-
-  [ Debian Janitor ]
-  * Depend on newer debhelper (>= 9.20160709) rather than dh-systemd.
-
-  [ dequis ]
-  * Some more d/copyright fixups (Closes: #883872)
-
-  [ Jelmer Vernooĳ ]
-  * Use secure URI in debian/watch.
-  * Use secure URI in Homepage field.
-  * Add missing colon in closes line.
-  * Remove obsolete fields Name from debian/upstream/metadata.
-  * Fix day-of-week for changelog entries 0.81a-1.
-  * Set debhelper version back to 9, for easier backport building.
-
-  [ Debian Janitor ]
-  * Upgrade to newer source format.
-
-  [ Jelmer Vernooĳ ]
-  * Set upstream metadata fields: Repository.
-  * Use canonical URL in Vcs-Git.
-  * Add missing debian/rules target build-indep.
-  * Use python3 since python2 is being removed. Closes: #942954
-  * Use system libjsonparser rather than bundled one.
-
- -- Debian Janitor <janitor@jelmer.uk>  Thu, 21 Mar 2019 00:10:27 +0000
-
-bitlbee (3.6-1.1) unstable; urgency=medium
-
-  * Non-maintainer upload.
-  * Apply patch to d/copyright provided by Jochen Sprickerhof
-    Closes: #883872
-
- -- Andreas Tille <tille@debian.org>  Thu, 18 Apr 2019 21:27:48 +0200
-
-bitlbee (3.6-1) unstable; urgency=medium
-
-  [ dequis ]
-  * Remove bitlbee-plugin-skype and skyped (obsolete)
-  * Enable only bitlbee.service, not bitlbee.socket too
-
-  [ dequis ]
-  * Fix lintian pkg-config-unavailable-for-cross-compilation
-
-  [ Jelmer Vernooĳ ]
-  * Add debian upstream metadata file.
-  * Trim trailing whitespace.
-
-  [ Debian Janitor ]
-  * Bump debhelper from old 9 to 10.
-  * Trim trailing whitespace.
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Sat, 02 Mar 2019 22:18:21 +0000
-
-bitlbee (3.5.1-1.2) unstable; urgency=medium
-
-  * Non-maintainer upload.
-  * Comment out bitlbee-plugin-skype and skyped in d/control (Closes: #921895).
-    These binary packages are not built by d/rules by default, and as such
-    they are not currently in the archive.  Commenting them out in order
-    to avoid my NMU hitting binNEW; this caused the -1.1 source-only
-    upload to fail.
-    Thank you to Mattia Rizzolo for suggesting this fix.
-
- -- Sean Whitton <spwhitton@spwhitton.name>  Sat, 09 Feb 2019 17:03:38 -0700
-
-bitlbee (3.5.1-1.1) unstable; urgency=medium
-
-  * Non-maintainer upload.
-  * Add existence check to chmod call in bitlbee-common.postinst
-    (Closes: #816200).
-
- -- Sean Whitton <spwhitton@spwhitton.name>  Fri, 25 Jan 2019 16:50:34 -0700
-
-bitlbee (3.5.1-1) unstable; urgency=medium
-
-  * Crash bug fix. (Closes: #853282)
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Thu, 09 Feb 2017 00:46:53 +0000
-
-bitlbee (3.5-2) unstable; urgency=medium
-
-  * TFW you find out the corrected fix diff posted on #821967 was still the
-    broken one and you end up doing your third upload in a weekend. :-(
-    Obviously build-* targets shouldn't call into binary-*, as that one
-    starts requiring root. This broke builds on buildd's.
-  * Now contains the same fix like 3.4.2-1.1, which as it turns out 3.5-1.1
-    did not. (Closes: #853017)
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Sat, 28 Jan 2017 21:06:27 +0000
-
-bitlbee (3.5-1.1) unstable; urgency=medium
-
-  [ dequis ]
-  * Merge back changes from 3.4.2-1.1 (Closes: #852897)
-
- -- dequis <dx@dxzone.com.ar>  Thu, 26 Jan 2017 21:39:24 -0300
-
-bitlbee (3.5-1) unstable; urgency=medium
-
-  [ Jochen Sprickerhof ]
-  * Drop dependency on net-tools
-
-  [ dequis ]
-  * Use dh_systemd
-  * Drop support for /etc/default/bitlbee
-  * Drop debconf and its translations (only used to ask for the port)
-  * Add preinst script for a smoother transition to systemd units
-  * Ignore the stdout of deluser, fixes postrm error exit code
-  * Remove some mentions of yahoo in control and copyright
-  * Remove outdated stuff from README.debian
-
-  [ Wilmer van der Gaast ]
-  * New upstream release.
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Tue, 24 Jan 2017 22:21:33 +0000
-
-bitlbee (3.4.2-1.1) unstable; urgency=medium
-
-  * Non-maintainer upload.
-  * Adding build-{arch,indep} targets. (Closes: #821967)
-  * Added python to build depends.
-
- -- Michael Lustfield <michael@lustfield.net>  Mon, 18 Jul 2016 01:02:17 -0700
-
-bitlbee (3.4.2-1) unstable; urgency=medium
-
-  [ Jelmer Vernooĳ ]
-  * Make the build reproducible by not encoding ARCH / CPU defines in
-    the binary.
-  * Fix Vcs-* control headers after migration to Git.
-  * Don't start synopsis with an article.
-  * Bump standards version to 3.9.8 (no changes).
-  * Use dh_prep rather than deprecated 'dh_clean -k'.
-
-  [ Wilmer van der Gaast ]
-  * New upstream release.
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Sun, 12 Jun 2016 22:31:18 +0100
-
-bitlbee (3.4.1-1) unstable; urgency=medium
-
-  * Fix copyright info (Closes: #764181)
-  * "New" upstream release. Apologies for the delay.
-  * Exclude .git not .bzr when building the source package.
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Mon, 03 Aug 2015 22:33:25 +0100
-
-bitlbee (3.2.2-1) unstable; urgency=medium
-
-  [ Jelmer Vernooij ]
-  * Bump standards version to 3.9.5 (no changes).
-  * Remove obsolete DM-Upload-Allowed header.
-  * Build with dpkg-flags, for hardening.
-  * Force re-building of user guide on Debian.
-  * Don't ignore failure of invoke-rc.d; fixes lintian warning.
-  * Use my Debian e-mail address in Uploaders.
-  * Support building against libgnutls28-dev. Closes: #753020
-
-  [ Wilmer van der Gaast ]
-  * Merged 3.2.2 with a few later Debian-specific fixes for a belated
-    3.2.2-1 upload. Apologies for the delay!
-  * Removed stale workaround on upgrades from bitlbee <3.0 (with no
-    bitlbee-common package).
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Sun, 05 Oct 2014 22:11:12 +0100
-
-bitlbee (3.2.1+otr4-1) unstable; urgency=low
-
-  * New upstream version, fixes Twitter API compatibility (now using HTTP/1.1).
-    (Closes: #731748)
-  * Define _GNU_SOURCE via cmdline instead of include file. (Closes: #703550)
-  * Restore OTR support. (Closes: #711071)
-    - This is not part of the 3.2.1 release but really should have been.
-    - Package still has a libotr2-dev dependency even though it doesn't work
-      with that anymore. It's a hack so I can at least still do pbuilder
-      builds on older distros. (Just with the otr pkg disabled.)
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Thu, 19 Dec 2013 01:11:52 +0100
-
-bitlbee (3.2-1.2) unstable; urgency=low
-
-  [ Cyril Brulebois ]
-  * Disable libotr support (hopefully temporarily) for the transition from
-    libotr2 to libotr5 (Closes: #711071):
-    - debian/control: Drop bitlbee-plugin-otr package.
-    - debian/rules: Adjust DH_OPTIONS handling, drop support for
-      bitlbee-plugin-otr, and pass --otr=0 to configure.
-
-  [ Antoine Beaupré ]
-  * Non-maintainer upload.
-
- -- Antoine Beaupré <anarcat@debian.org>  Tue, 24 Sep 2013 16:04:04 +0200
-
-bitlbee (3.2-1.1) unstable; urgency=low
-
-  * Non-maintainer upload.
-  * Switch the order of (lib)gnutls-dev Build-Depends to libgnutls-dev |
-    gnutls-dev. (Closes: #698236)
-
- -- Sebastian Ramacher <sramacher@debian.org>  Mon, 04 Mar 2013 23:52:07 +0100
-
-bitlbee (3.2-1) unstable; urgency=high
-
-  * New upstream release.
-  * Depend on gnutls-dev instead of libgnutls-dev. (Closes: #691766)
-  * Also, drop nss dependency. GnuTLS is supported officially, the rest is
-    use-at-your-own-risk (so compile it yourself).
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Mon, 14 Jan 2013 22:34:06 +0000
-
-bitlbee (3.0.6-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Sun, 28 Oct 2012 19:58:33 +0000
-
-bitlbee (3.0.5-1.2) unstable; urgency=low
-
-  * Non-maintainer upload.
-  * debian/bitlbee{,-dev}.postinst: Fix directory to symlink upgrade in
-    postinst. (Closes: #687865)
-
- -- David Prévot <taffit@debian.org>  Wed, 26 Sep 2012 23:20:41 -0400
-
-bitlbee (3.0.5-1.1) unstable; urgency=low
-
-  * Non-maintainer upload.
-  * Fix "fails to install, purge, and install again":
-    remove --remove-home option from deluser call in bitlbee-common.postrm.
-    The option needs perl-modules which is not guaranteed to be there, and the
-    directory gets removed manually anyway.
-    (Closes: #681146)
-
- -- gregor herrmann <gregoa@debian.org>  Thu, 26 Jul 2012 18:44:36 +0200
-
-bitlbee (3.0.5-1) unstable; urgency=low
-
-  * New upstream release.
-  * Full SSL certificate verification. apt-get install ca-certificates and
-    uncomment the CAfile line in bitlbee.conf to activate it.
-  * Removed some version override stuff from Debian build scripts. Instead,
-    my buildbot now uses dch to generate a changelog entry with the right
-    version number.
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Sat, 18 Feb 2012 12:25:47 +0100
-
-bitlbee (3.0.4+bzr855-1) unstable; urgency=low
-
-  * New upstream release.
-  * This is not a vanilla 3.0.4 tree but a Bazaar snapshot. The source
-    release was a few weeks ago by now. There should be no significant
-    differences.
-  * Added bitlbee-plugin-skype and skyped packages, now part of BitlBee
-    instead of a separate package. Not building these for Debian for now
-    though since python-skype was removed.
-  * ^B and some other things are stripped in outgoing XMPP stanzas.
-    (Closes: #507856)
-  * OTR module linking fix. Not with the fix from the Debian bug but with
-    one from bugs.bitlbee.org. I hope that covers it. (Closes: #646369)
-  * Closing a few old bugs that were filed against the Debian package
-    instead of/as well as upstream:
-    - Joining password-protected MUCs is working for a while already, set
-      the password using "chan set". (Closes: #615624)
-    - "Headline:" msgs (Closes: #605459)
-    - Yahoo! was fixed long ago and Etch is deprecated. (Closes: #476529)
-    - identi.ca support is documented. (Closes: #613789)
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Tue, 20 Dec 2011 12:46:42 +0100
-
-bitlbee (3.0.3-1.1) unstable; urgency=low
-
-  * Non-maintainer upload.
-  * Use the standard ${source:Version} and ${binary:Version} substvars instead
-    of the custom and broken ${bee:Version} (closes: #651612).
-
- -- Julien Cristau <jcristau@debian.org>  Thu, 15 Dec 2011 20:34:32 +0100
-
-bitlbee (3.0.3-1) unstable; urgency=low
-
-  * New upstream release. (Skipped 3.0.2, sorry!)
-  * Fixes Twitter issues.
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Tue, 14 Jun 2011 22:39:22 +0100
-
-bitlbee (3.0.1-1) unstable; urgency=low
-
-  * New upstream release.
-  * Includes changes from non-maintainer, see below. (Closes: #603681)
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Sat, 04 Dec 2010 11:50:53 +0000
-
-bitlbee (3.0-2) UNRELEASED; urgency=low
-
-  * debian/bitlbee-common.postinst: Replace 'type' with 'which' to avoid
-    bashism.
-  * debian/{*.prerm, *.postinst, *.postrm, *.config}: use set -e in the body
-    of maintainer scripts.
-  * debian/control:
-    + Corrected short description of bitlbee-plugin-otr
-    + Bumped Standards-Version to 3.9.1
-    + Added ${misc:Depends} for bitlbee & bitlbee-libpurple
-    + Moved dependency on adduser to bitlbee-common
-    + Bumped debhelper version to 6.0.7~ for dh_lintian
-  * debian/copyright: Refer to /usr/share/common-licenses/GPL-2
-  * Added lintian overrides for bitlbee & bitlbee-libpurple
-  * Explicitly set source format to 1.0
-  * debian/bitlbee-common.init:
-    + Add Short-Description header.
-    + Also stop at runlevels 0 and 6.
-
- -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.org>  Mon, 25 Oct 2010 16:56:24 +0200
-
-bitlbee (3.0-1) unstable; urgency=low
-
-  * A milestone upstream release. See the non-Debian changelog.
-  * Now using debhelper to improve maintainability.
-  * Added a bitlbee-libpurple package, and split off docs and stuff into
-    bitlbee-common.
-  * Added a bitlbee-plugin-otr package. (Closes: #541809)
-  * Can use IPv6 on the client side now. (Closes: #547300)
-  * Added Danish debconf translations done by Joe Dalton. (Closes: #592259)
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Wed, 18 Aug 2010 00:53:11 +0100
-
-bitlbee (1.2.8-1) unstable; urgency=low
-
-  * New upstream version.
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Sat, 10 Jul 2010 13:54:55 +0100
-
-bitlbee (1.2.7-1) unstable; urgency=high
-
-  * New upstream version.
-  * Fixes MSN Messenger login issues, so uploading at high priority.
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Sat, 15 May 2010 16:15:57 +0100
-
-bitlbee (1.2.6a-1) unstable; urgency=low
-
-  * New upstream version.
-  * Native support for Twitter.
-  * Fixed /WHOIS response format. (Closes: #576120)
-  * Problems with bitlbee-skype are solved by now. (Closes: #575572)
-
- -- Wilmer van der Gaast <wilmer@peer.gaast.net>  Tue, 20 Apr 2010 00:34:51 +0200
-
-bitlbee (1.2.5-1) unstable; urgency=low
-
-  * New upstream version.
-  * Fixed issues with server-side MSN nickname corruption. (Closes: #538756)
-  * Debconf translation fixes/additions. (Closes: #541754, #563504)
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Wed, 17 Mar 2010 14:59:27 +0000
-
-bitlbee (1.2.4-2) unstable; urgency=low
-
-  * Merging in some changes from bzr-head:
-  * Use libresolv.so where possible. (Closes: #551775)
-  * Some include file changes that make the bitlbee-dev package useful again.
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Thu, 19 Nov 2009 23:02:43 +0000
-
-bitlbee (1.2.4-1) unstable; urgency=low
-
-  * New upstream version.
-  * Fixed issues with Yahoo! (Closes: #536178)
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Sat, 17 Oct 2009 18:12:45 +0100
-
-bitlbee (1.2.3-2) unstable; urgency=low
-
-  * Fixed bitblee typo in prerm (introduced by NMU 1.2.1-1.1).
-    (Closes: #531287)
-  * Fixed bitlbee.deb dep in bitlbee-dev to deal with binary NMUs.
-    (Closes: #531219)
-  * Fixed free port detection code in debian/config which was a bit limited
-    and also buggy.
-  * Removing code that edits bitlbee.conf from postinst (and chown code in
-    the init script), it's not really necessary anymore; bitlbee may only
-    still run as root if the admin doesn't read conffile diffs.
-    (Closes: #514572)
-  * No longer overwriting port number info in /etc/default/bitlbee with
-    what's in debconf. (Closes: #514148)
-  * Added notes about the above two changes to bitlbee.conf.
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Sun, 07 Jun 2009 21:17:39 +0100
-
-bitlbee (1.2.3-1) unstable; urgency=critical
-
-  * New upstream version.
-  * Fixes another account hijacking issue. (Closes: #498159)
-  * Restored --pidfile argument to start-stop-daemon, otherwise the init
-    script fails to restart BitlBee when users are connected.
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Sun, 07 Sep 2008 18:53:04 +0100
-
-bitlbee (1.2.2-1) unstable; urgency=critical
-
-  * New upstream version.
-  * Fixes a security issue (account hijacking), hence the high priority.
-  * Using a patch to set the User setting in bitlbee.conf properly to keep
-    upstream and Debian properly separated in my bzr tree.
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Wed, 27 Aug 2008 23:59:50 +0100
-
-bitlbee (1.2.1-3) unstable; urgency=high
-
-  * chown /var/lib/bitlbee/*.xml to bitlbee:bitlbee to clean up after
-    1.2-5 and the bugfix in 1.2.1-2. (Closes: #495877)
-  * Moved BITLBEE_DISABLED check to only check when trying to *start*
-    the daemon. (Closes: #488611)
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Sat, 23 Aug 2008 18:53:54 +0100
-
-bitlbee (1.2.1-2) unstable; urgency=low
-
-  * Properly set the User= line to something sensible so BitlBee won't
-    run as root anymore. 1.2-5 was a bad upload. :-( (Closes: #494656)
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Tue, 12 Aug 2008 00:36:03 +0100
-
-bitlbee (1.2.1-1.1) unstable; urgency=low
-
-  * Non-Maintainer Upload
-  * Use invoke-rc.d as per policy. (Closes: #492637) [Thanks to Matt
-    Kraai]
-
- -- Don Armstrong <don@debian.org>  Wed, 06 Aug 2008 06:57:18 -0700
-
-bitlbee (1.2.1-1) unstable; urgency=low
-
-  * New upstream release.
-  * Add Homepage and Vcs-Bzr fields. (From Jelmer.)
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Thu, 26 Jun 2008 00:07:50 +0100
-
-bitlbee (1.2-5) unstable; urgency=low
-
-  * Add myself to uploaders.
-  * Bump standards version to 3.8.0.
-  * Fix FSF address.
-  * Avoid changing uid from init script. (Closes: #474589)
-
- -- Jelmer Vernooij <jelmer@samba.org>  Mon, 16 Jun 2008 00:53:20 +0200
-
-bitlbee (1.2-4) unstable; urgency=low
-
-  * Fixed init script to use the BITLBEE_OPTS variable, not an undefined
-    DAEMON_OPT. (Closes: #474583)
-  * Added dependency information to the init script. (Closes: #472567)
-  * Added bitlbee-dev package. Patch from RISKO Gergely <risko@debian.org>
-    with some small modifications. (Closes: #473480)
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Wed, 07 May 2008 22:40:40 -0700
-
-bitlbee (1.2-3) unstable; urgency=low
-
-  * Removed DEB_BUILD_OPTIONS again (forgot to apply that change to the 1.2
-    branch when I finished 1.0.4-2, things diverged too much anyway.)
-    Closes: #472540.
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Mon, 24 Mar 2008 21:10:14 +0000
-
-bitlbee (1.2-2) unstable; urgency=low
-
-  * Fixed some packaging issues reported by IRC and e-mail. (Closes: #472373)
-  * Fixed proxy support. (Closes: #472395)
-  * Added a BitlBee group so only root can edit the configs and BitlBee can
-    just *read* it.
-  * Manually deleting /var/lib/bitlbee/ when purging, deluser doesn't want to
-    do it.
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Mon, 24 Mar 2008 19:48:24 +0000
-
-bitlbee (1.2-1) unstable; urgency=low
-
-  * New upstream release. (Closes: #325017, #386914, #437515)
-  * With hopefully completely sane charset handling (Closes: #296145)
-  * Switched to the new forking daemon mode. Added /etc/default/bitlbee
-    file, an init script. People who want to stick with inetd can do so, see
-    the defaults file.
-    (Closes: #460741, #466171, #294585, #345038, #306452, #392682)
-  * Got rid of debconf Woody compatibility stuff.
-  * No more MPL code in BitlBee, thanks to the Jabber module rewrite!
-  * Added Italian translation, sorry for taking so long! (Closes: #448238)
-  * Added libevent dependency (more reliable event handling).
-  * Removed GLib 1.x dependency because BitlBee really requires GLib >=2.4.
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Tue, 18 Mar 2008 23:44:19 +0000
-
-bitlbee (1.0.4-2) unstable; urgency=low
-
-  * Removed $DEB_BUILD_OPTIONS because apparently buildds fill it with crap.
-    (Closes: #458717)
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Mon, 11 Feb 2008 19:15:33 +0000
-
-bitlbee (1.0.4-1) unstable; urgency=low
-
-  * New upstream release.
-  * Changed libnss-dev dependency. (Closes: #370442)
-  * Added build-indep rule to debian/rules. (Closes: #395673)
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Wed, 29 Aug 2007 20:24:28 +0100
-
-bitlbee (1.0.3-1.3) unstable; urgency=low
-
-  * Non-maintainer upload to fix a minor error.
-  * Remove extra debian/#rules#
-
- -- Christian Perrier <bubulle@debian.org>  Tue, 20 Feb 2007 07:49:18 +0100
-
-bitlbee (1.0.3-1.2) unstable; urgency=low
-
-  * Non-maintainer upload to fix pending l10n issues.
-  * Debconf translations:
-    - Portuguese. Closes: #386348
-
- -- Christian Perrier <bubulle@debian.org>  Sun, 18 Feb 2007 20:23:28 +0100
-
-bitlbee (1.0.3-1.1) unstable; urgency=low
-
-  * Non-maintainer upload.
-  * debian/control: Replace netkit-inetd dependency with a versioned
-    dependency on netbase.  netbase provides the appropriate inetd
-    dependency.  Closes: #382682.
-
- -- Roger Leigh <rleigh@debian.org>  Sun, 20 Aug 2006 17:07:02 +0100
-
-bitlbee (1.0.3-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Sat,  8 Jul 2006 11:32:57 +0200
-
-bitlbee (1.0.2-2) unstable; urgency=low
-
-  * Added a po-debconf build-dependency, which I forgot when removing the
-    Woody hack from 1.0.2-1. (Closes: #361503)
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Sat,  8 Apr 2006 22:09:19 +0200
-
-bitlbee (1.0.2-1) unstable; urgency=low
-
-  * New upstream release.
-  * Avoids calling update-inetd if it's unavailable. (Closes: #350463)
-  * Also using userdel instead of deluser now to avoid another bug. :-)
-  * Only creates an inetd.conf entry when installing for the first time.
-    (Closes: #349570) (This unfortunately breaks dpkg-reconfigure, but at
-    least there's a warning...)
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Sat,  8 Apr 2006 14:17:52 +0200
-
-bitlbee (1.0.1-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Tue, 17 Jan 2006 17:26:20 +0100
-
-bitlbee (1.0-1) unstable; urgency=low
-
-  * New upstream release
-  * bitlbee has a useless Build-Depends: on debconf-2.0 (Closes:
-    #341783)
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Mon,  5 Dec 2005 17:59:07 +0100
-
 bitlbee (0.99-1) unstable; urgency=low
 
@@ -720,5 +151,5 @@
   * New upstream release.
 
- -- Wilmer van der Gaast <lintux@debian.org>  Thu, 16 Oct 2003 16:21:31 +0200
+ -- Wilmer van der Gaast <lintux@debian.org>  Wed, 16 Oct 2003 16:21:31 +0200
 
 bitlbee (0.81-1) unstable; urgency=low
@@ -799,2 +230,6 @@
 
  -- Wilmer van der Gaast <lintux@debian.org>  Wed, 10 Jul 2002 11:02:28 +0200
+
+Local variables:
+mode: debian-changelog
+End:
Index: debian/compat
===================================================================
--- debian/compat	(revision a3ca3ddb8b3ba10b1a88854f1ab73341d15abc6b)
+++ 	(revision )
@@ -1,1 +1,0 @@
-9
Index: debian/control
===================================================================
--- debian/control	(revision a3ca3ddb8b3ba10b1a88854f1ab73341d15abc6b)
+++ debian/control	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -3,68 +3,11 @@
 Priority: optional
 Maintainer: Wilmer van der Gaast <wilmer@gaast.net>
-Uploaders: Jelmer Vernooĳ <jelmer@debian.org>
-Standards-Version: 3.9.8
-Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls28-dev | libgnutls-dev | gnutls-dev, po-debconf, libpurple-dev, libotr5-dev, debhelper (>= 9), python3, libjsonparser-dev
-Homepage: https://www.bitlbee.org/
-Vcs-Git: https://github.com/bitlbee/bitlbee.git
-Vcs-Browser: https://github.com/bitlbee/bitlbee
+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: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${binary:Version})
-Conflicts: bitlbee-libpurple
-Replaces: bitlbee-libpurple
-Description: IRC to other chat networks gateway (default version)
+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 (which includes Google
- Talk), and Twitter.
-
-Package: bitlbee-libpurple
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${binary:Version})
-Conflicts: bitlbee
-Replaces: bitlbee
-Description: IRC to other chat networks gateway (using libpurple)
- This program can be used as an IRC server which forwards everything you
- say to people on other chat networks: Jabber (which includes Google
- Talk), and Twitter.
- .
- This package contains a version of BitlBee that uses the libpurple instant
- messaging library instead of built-in code, which adds support for more IM
- protocols (all protocols supported by Pidgin/Finch) and features (like file
- transfers), at the price of being less lightweight.
- .
- If you don't need the extra features, it's better to use the built-in code.
-
-Package: bitlbee-common
-Architecture: any
-Depends: ${misc:Depends}, adduser
-Replaces: bitlbee
-Description: IRC to other chat networks gateway (common files/docs)
- This program can be used as an IRC server which forwards everything you
- say to people on other chat networks: Jabber (which includes Google
- Talk), and Twitter.
- .
- This package contains common files (mostly documentation) for bitlbee and
- bitlbee-libpurple.
-
-Package: bitlbee-dev
-Architecture: any
-Depends: ${misc:Depends}, bitlbee (= ${binary:Version}) | bitlbee-libpurple (= ${binary:Version}), bitlbee-common (= ${binary:Version})
-Description: IRC to other chat networks gateway (dev files)
- This program can be used as an IRC server which forwards everything you
- say to people on other chat networks: Jabber (which includes Google
- Talk), and Twitter.
- .
- This package holds development stuff for compiling plug-ins.
-
-Package: bitlbee-plugin-otr
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${binary:Version}) | bitlbee-libpurple (= ${binary:Version}), bitlbee-common (= ${binary:Version})
-Description: IRC to other chat networks gateway (OTR plugin)
- This program can be used as an IRC server which forwards everything you
- say to people on other chat networks: Jabber (which includes Google
- Talk), and Twitter.
- .
- This package contains a plugin that adds support for Off-The-Record
- encryption of instant messages.
+ say to people on other chat networks: Jabber, ICQ, AIM, MSN and Yahoo.
Index: debian/copyright
===================================================================
--- debian/copyright	(revision a3ca3ddb8b3ba10b1a88854f1ab73341d15abc6b)
+++ debian/copyright	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -1,196 +1,895 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-
-Files: *
-Copyright: 
-           2002-2006, Jelmer Vernooij <jelmer@samba.org>
-           2001-2013, Wilmer 'Lintux' van der Gaast <wilmer@gaast.net>
-License: GPL-2+
-
-Files: lib/misc.c
-       lib/proxy.?
-       protocols/nogaim.h
-Copyright: 
-           1998-1999, Mark Spencer <markster@marko.net>
-           2002-2006, Jelmer Vernooij <jelmer@samba.org>
-           2001-2013, Wilmer 'Lintux' van der Gaast <wilmer@gaast.net>
-License: GPL-2+
-
-Files: otr.?
-Copyright: 2008-2013, Sven Moritz Hallberg <pesco@khjk.org>
-License: GPL-2+
-
-Files: dcc.?
-       lib/ftutil.?
-       protocols/jabber/si.c
-       protocols/jabber/s5bytestream.c
-Copyright: 2007-2008, Uli Meis <a.sporto+bee@gmail.com>
-License: GPL-2+
-
-Files: dcc.h
-       protocols/ft.h
-Copyright: 
-           2006, Marijn Kruisselbrink
-           2007-2008, Uli Meis <a.sporto+bee@gmail.com>
-License: GPL-2+
-
-Files: protocols/jabber/hipchat.c
-Copyright: 2015, Xamarin Inc
-License: GPL-2+
-
-Files: lib/canohost.c
-Copyright: 1995, Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
-License: OpenSSH
-
-Files: configure
-Copyright: 
-           2007-2013, Miklos Vajna <vmiklos@vmiklos.hu>
-           2002, Sjoerd 'lucumo' Hemminga <sjoerd@hemminga-online.nl>
-           2001-2013, Wilmer 'Lintux' van der Gaast <wilmer@gaast.net>
-License: GPL-2+
-
-Files: protocols/twitter/*
-Copyright: 2009-2010, Geert Mulders <g.c.w.m.mulders@gmail.com>
-           2002-2013, Wilmer 'Lintux' van der Gaast <wilmer@gaast.net>
-License: LGPL-2.1
-
-Files: lib/json.?
-Copyright: 2012-2014, James McLaughlin
-License: BSD-2-clause
-
-Files: lib/ns_parse.c
-Copyright: 1996-1999, Internet Software Consortium
-           2004, Internet Systems Consortium, Inc. ("ISC")
-License: ISC
-
-Files: debian/*
-Copyright: 2002-2019, Wilmer van der Gaast <wilmer@gaast.net>
-License: GPL-2+
-
-License: BSD-2-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- .
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-
-License: GPL-2+
- 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 along with
- this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
- St, Fifth Floor, Boston, MA 02110-1301 USA
- .
- On Debian systems, the complete text of the GNU General Public License version 2
- can be found in /usr/share/common-licenses/GPL-2.
-
-License: ISC
- Permission to use, copy, modify, and/or distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
- .
- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-License: LGPL-2.1
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License version 2.1 as published by the Free Software Foundation.
- .
- This library 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
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- .
- On Debian systems, the complete text of the GNU Lesser General Public
- License can be found in /usr/share/common-licenses/LGPL-2.1 file.
-
-License: OpenSSH
- Tatu Ylonen's original licence is as follows (excluding some terms about
- third-party code which are no longer relevant; see the LICENCE file for
- details):
- .
-   As far as I am concerned, the code I have written for this software
-   can be used freely for any purpose.  Any derived versions of this
-   software must be clearly marked as such, and if the derived work is
-   incompatible with the protocol description in the RFC file, it must be
-   called by a name other than "ssh" or "Secure Shell".
- .
-   Note that any information and cryptographic algorithms used in this
-   software are publicly available on the Internet and at any major
-   bookstore, scientific library, and patent office worldwide.  More
-   information can be found e.g. at "http://www.cs.hut.fi/crypto".
- .
-   The legal status of this program is some combination of all these
-   permissions and restrictions.  Use only at your own responsibility.
-   You will be responsible for any legal consequences yourself; I am not
-   making any claims whether possessing or using this is legal or not in
-   your country, and I am not taking any responsibility on your behalf.
- .
- Most remaining components of the software are provided under a standard
- 2-term BSD licence:
- .
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-   2. Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
- .
-   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-   IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-   INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-   NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-   THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- .
- Some code is licensed under an ISC-style license, to the following
- copyright holders:
- .
-  Permission to use, copy, modify, and distribute this software for any
-  purpose with or without fee is hereby granted, provided that the above
-  copyright notice and this permission notice appear in all copies.
-  .
-  THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL
-  WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-  OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE
-  FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-  OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+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: debian/lintian-brush.conf
===================================================================
--- debian/lintian-brush.conf	(revision a3ca3ddb8b3ba10b1a88854f1ab73341d15abc6b)
+++ 	(revision )
@@ -1,2 +1,0 @@
-# Be at least compatible with trusty, for backports.
-compat-release = trusty
Index: debian/motd.txt
===================================================================
--- debian/motd.txt	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
+++ debian/motd.txt	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -0,0 +1,19 @@
+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: debian/patches/bitlbee.conf.diff
===================================================================
--- debian/patches/bitlbee.conf.diff	(revision a3ca3ddb8b3ba10b1a88854f1ab73341d15abc6b)
+++ 	(revision )
@@ -1,22 +1,0 @@
---- bitlbee.conf	2009-06-01 00:20:24.000000000 +0100
-+++ bitlbee.conf	2009-06-07 21:16:19.000000000 +0100
-@@ -23,13 +23,18 @@
- ## If BitlBee is started by root as a daemon, it can drop root privileges,
- ## and change to the specified user.
- ##
--# User = bitlbee
-+## DEBIAN NOTE: Without this, BitlBee will run as root!
-+##
-+User = bitlbee
- 
- ## DaemonPort/DaemonInterface:
- ##
- ## For daemon mode, you can specify on what interface and port the daemon
- ## should be listening for connections.
- ##
-+## DEBIAN NOTE: The init script passes the -p flag to use the port number
-+## set using debconf, this overrides the DaemonPort setting here.
-+##
- # DaemonInterface = 0.0.0.0
- # DaemonPort = 6667
- 
Index: debian/po/POTFILES.in
===================================================================
--- debian/po/POTFILES.in	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
+++ debian/po/POTFILES.in	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -0,0 +1,1 @@
+[type: gettext/rfc822deb] bitlbee.templates.master
Index: debian/po/cs.po
===================================================================
--- debian/po/cs.po	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
+++ debian/po/cs.po	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -0,0 +1,44 @@
+#
+#    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: debian/po/de.po
===================================================================
--- debian/po/de.po	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
+++ debian/po/de.po	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -0,0 +1,45 @@
+#
+#    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: debian/po/es.po
===================================================================
--- debian/po/es.po	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
+++ debian/po/es.po	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -0,0 +1,51 @@
+# 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: debian/po/fr.po
===================================================================
--- debian/po/fr.po	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
+++ debian/po/fr.po	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -0,0 +1,44 @@
+#
+#    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: debian/po/ja.po
===================================================================
--- debian/po/ja.po	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
+++ debian/po/ja.po	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -0,0 +1,45 @@
+#
+#    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: debian/po/nl.po
===================================================================
--- debian/po/nl.po	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
+++ debian/po/nl.po	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -0,0 +1,44 @@
+#
+#    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: debian/po/pt_BR.po
===================================================================
--- debian/po/pt_BR.po	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
+++ debian/po/pt_BR.po	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -0,0 +1,44 @@
+#
+#    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: debian/po/sv.po
===================================================================
--- debian/po/sv.po	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
+++ debian/po/sv.po	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -0,0 +1,44 @@
+# 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: debian/po/templates.pot
===================================================================
--- debian/po/templates.pot	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
+++ debian/po/templates.pot	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -0,0 +1,41 @@
+#
+#    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: debian/po/vi.po
===================================================================
--- debian/po/vi.po	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
+++ debian/po/vi.po	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -0,0 +1,32 @@
+# 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: debian/rules
===================================================================
--- debian/rules	(revision a3ca3ddb8b3ba10b1a88854f1ab73341d15abc6b)
+++ debian/rules	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -1,128 +1,100 @@
 #!/usr/bin/make -f
-#
-# Finally switching to debhelper.
-#
-# Not using debhelper was an exercise suggested to me by my AM (Gergely
-# Nagy). It was educating at the time but I finally decided that the
-# exercise is over now.
-#
 
-# Include the bitlbee-libpurple variant and OTR plugin by default.
-BITLBEE_LIBPURPLE ?= 1
-BITLBEE_OTR ?= plugin
-BITLBEE_CONFIGURE_FLAGS ?=
 DEBUG ?= 0
 
-ifndef BITLBEE_VERSION
-# Want to use the full package version number instead of just the release.
-BITLBEE_CONFIGURE_VERSION ?= BITLBEE_VERSION="$(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')"
+ifeq (,$(wildcard /usr/bin/po2debconf))
+PO2DEBCONF := no
+MINDEBCONFVER := 0.5
+else
+PO2DEBCONF := yes
+MINDEBCONFVER := 1.2.0
 endif
 
-ifneq ($(BITLBEE_LIBPURPLE),1)
-DH_OPTIONS += -Nbitlbee-libpurple
+
+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
 
-ifneq ($(BITLBEE_OTR),plugin)
-DH_OPTIONS += -Nbitlbee-plugin-otr
-endif
+	dpkg --build debian/bitlbee ..
 
-CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
-CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
-
-CONFIGURE_OVERRIDES:=CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
-
-HAS_DH_SYSTEMD:=$(shell dpkg-query -W -f='$${Status}' dh-systemd 2>/dev/null | grep -c "ok installed")
-
-build-arch: build
-
-build: build-stamp
-build-stamp:
-	dh_testdir
-
-	mkdir -p debian/build-native
-	ROOT=$$PWD; cd debian/build-native; $(BITLBEE_CONFIGURE_VERSION) $(CONFIGURE_OVERRIDES) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --events=libevent --otr=$(BITLBEE_OTR) --systemdsystemunitdir=/lib/systemd/system --pcdir=/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig $(BITLBEE_CONFIGURE_FLAGS)
-	$(MAKE) -C debian/build-native
-
-ifeq ($(BITLBEE_LIBPURPLE),1)
-	mkdir -p debian/build-libpurple
-	ROOT=$$PWD; cd debian/build-libpurple; $(BITLBEE_CONFIGURE_VERSION) $(CONFIGURE_OVERRIDES) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --systemdsystemunitdir=/lib/systemd/system --pcdir=/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig --purple=1 $(BITLBEE_CONFIGURE_FLAGS)
-	$(MAKE) -C debian/build-libpurple
-endif
-
-	$(MAKE) -C doc
-	$(MAKE) -C doc/user-guide
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-
-	rm -rf build-arch-stamp debian/build-* debian/bitlbee-libpurple.prerm
-	$(MAKE) distclean
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	$(MAKE) -C debian/build-native install-bin DESTDIR=`pwd`/debian/bitlbee
-	$(MAKE) -C debian/build-native install-etc install-doc DESTDIR=`pwd`/debian/bitlbee-common
-	$(MAKE) -C debian/build-native install-dev DESTDIR=`pwd`/debian/bitlbee-dev
-	$(MAKE) -C debian/build-native install-plugin-otr DESTDIR=`pwd`/debian/bitlbee-plugin-otr
-
-ifeq ($(HAS_DH_SYSTEMD),1)
-	$(MAKE) -C debian/build-native install-systemd DESTDIR=`pwd`/debian/bitlbee-common
-endif
-
-ifeq ($(BITLBEE_LIBPURPLE),1)
-	$(MAKE) -C debian/build-libpurple install-bin DESTDIR=`pwd`/debian/bitlbee-libpurple
-	ln -sf debian/bitlbee.prerm debian/bitlbee-libpurple.prerm
-endif
-
-	patch debian/bitlbee-common/etc/bitlbee/bitlbee.conf debian/patches/bitlbee.conf.diff
-	chmod 640 debian/bitlbee-common/etc/bitlbee/bitlbee.conf
-
-binary-common:
-	dh_testdir
-	dh_testroot
-
-	dh_installexamples
-	dh_installdocs --link-doc=bitlbee-common
-	dh_installchangelogs doc/CHANGES
-	dh_installdebconf
-ifeq ($(HAS_DH_SYSTEMD),1)
-	dh_systemd_enable -p bitlbee-common --no-enable bitlbee.socket
-	dh_systemd_enable -p bitlbee-common bitlbee.service
-	dh_installinit -p bitlbee-common --init-script=bitlbee
-	dh_systemd_start -p bitlbee-common
-else
-	dh_installinit -p bitlbee-common --init-script=bitlbee
-endif
-	dh_installman
-	dh_lintian
-	dh_strip
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-arch: build install
-	DH_OPTIONS=-a $(MAKE) -f debian/rules binary-common
-
-binary-%: build install
-	DH_OPTIONS=-p$* $(MAKE) -f debian/rules binary-common
+debug-build:
+	BITLBEE_VERSION=\"`date +%Y%m%d`-`hostname`-debug\" debian/rules clean binary DEBUG=1
 
 binary: binary-arch
-.PHONY: build clean binary-arch binary-common binary install build-indep
+build: build-arch
+install: install-arch
 
-build-indep:
+.PHONY: build-arch build clean binary-arch binary install-arch install
Index: debian/source/format
===================================================================
--- debian/source/format	(revision a3ca3ddb8b3ba10b1a88854f1ab73341d15abc6b)
+++ 	(revision )
@@ -1,1 +1,0 @@
-3.0 (quilt)
Index: debian/source/options
===================================================================
--- debian/source/options	(revision a3ca3ddb8b3ba10b1a88854f1ab73341d15abc6b)
+++ 	(revision )
@@ -1,1 +1,0 @@
---diff-ignore='(^|/)\.git'
Index: debian/upstream/metadata
===================================================================
--- debian/upstream/metadata	(revision a3ca3ddb8b3ba10b1a88854f1ab73341d15abc6b)
+++ 	(revision )
@@ -1,8 +1,0 @@
-Repository: https://github.com/bitlbee/bitlbee.git
-Repository-Browse: https://github.com/bitlbee/bitlbee
-Homepage: https://www.bitlbee.org/
-Bug-Database: https://bugs.bitlbee.org/
-Bug-Submit: https://bugs.bitlbee.org/newticket
-Documentation: https://wiki.bitlbee.org/
-FAQ: https://wiki.bitlbee.org/FAQ
-Donation: https://www.bitlbee.org/main.php/paypal.html
Index: debian/watch
===================================================================
--- debian/watch	(revision a3ca3ddb8b3ba10b1a88854f1ab73341d15abc6b)
+++ 	(revision )
@@ -1,2 +1,0 @@
-version=2
-https://get.bitlbee.org/src/bitlbee-(.*).tar.gz
