bitlbee (3.5.1-1) unstable; urgency=medium

  * Crash bug fix. (Closes: #853282)

[dgit import package bitlbee 3.5.1-1]

26 files changed, 1332 insertions, 0 deletions

diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 0000000..b8552fe
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,10 @@
+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
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..573b974
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,8 @@
+Fire up your favourite IRC client and connect to localhost:6667,
+and read the documentation (type help for a list of commands).
+
+Have fun!
+
+The /usr/share/doc/bitlbee/examples/ directory contains some programs and
+scripts you might like or need. They're not really examples but it's quite
+normal behaviour to put small contrib stuff like that in there.
diff --git a/debian/bitlbee-common.docs b/debian/bitlbee-common.docs
new file mode 100644
index 0000000..b84e62c
--- /dev/null
+++ b/debian/bitlbee-common.docs
@@ -0,0 +1,4 @@
+doc/AUTHORS
+doc/CREDITS
+doc/FAQ
+doc/README
diff --git a/debian/bitlbee-common.examples b/debian/bitlbee-common.examples
new file mode 100644
index 0000000..81562b9
--- /dev/null
+++ b/debian/bitlbee-common.examples
@@ -0,0 +1 @@
+utils/*
diff --git a/debian/bitlbee-common.init b/debian/bitlbee-common.init
new file mode 100644
index 0000000..8fbec11
--- /dev/null
+++ b/debian/bitlbee-common.init
@@ -0,0 +1,79 @@
+#! /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
diff --git a/debian/bitlbee-common.postinst b/debian/bitlbee-common.postinst
new file mode 100644
index 0000000..93ef501
--- /dev/null
+++ b/debian/bitlbee-common.postinst
@@ -0,0 +1,52 @@
+#!/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
+
+chmod 700 /var/lib/bitlbee/
+
+## 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#
diff --git a/debian/bitlbee-common.postrm b/debian/bitlbee-common.postrm
new file mode 100644
index 0000000..1001f79
--- /dev/null
+++ b/debian/bitlbee-common.postrm
@@ -0,0 +1,11 @@
+#!/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#
diff --git a/debian/bitlbee-common.preinst b/debian/bitlbee-common.preinst
new file mode 100644
index 0000000..ad4b5a7
--- /dev/null
+++ b/debian/bitlbee-common.preinst
@@ -0,0 +1,20 @@
+#!/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#
diff --git a/debian/bitlbee-common.prerm b/debian/bitlbee-common.prerm
new file mode 100644
index 0000000..ba46e98
--- /dev/null
+++ b/debian/bitlbee-common.prerm
@@ -0,0 +1,15 @@
+#!/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#
diff --git a/debian/bitlbee-dev.postinst b/debian/bitlbee-dev.postinst
new file mode 100644
index 0000000..e5e3e7f
--- /dev/null
+++ b/debian/bitlbee-dev.postinst
@@ -0,0 +1,14 @@
+#!/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
diff --git a/debian/bitlbee-libpurple.lintian-overrides b/debian/bitlbee-libpurple.lintian-overrides
new file mode 100644
index 0000000..171dc61
--- /dev/null
+++ b/debian/bitlbee-libpurple.lintian-overrides
@@ -0,0 +1,2 @@
+# manpage is installed in bitlbee-common, which bitlbee depends on
+bitlbee-libpurple: binary-without-manpage usr/sbin/bitlbee
diff --git a/debian/bitlbee-plugin-skype.docs b/debian/bitlbee-plugin-skype.docs
new file mode 100644
index 0000000..3f99862
--- /dev/null
+++ b/debian/bitlbee-plugin-skype.docs
@@ -0,0 +1,2 @@
+protocols/skype/NEWS
+protocols/skype/README
diff --git a/debian/bitlbee.lintian-overrides b/debian/bitlbee.lintian-overrides
new file mode 100644
index 0000000..d2e25f8
--- /dev/null
+++ b/debian/bitlbee.lintian-overrides
@@ -0,0 +1,2 @@
+# manpage is installed in bitlbee-common, which bitlbee depends on
+bitlbee: binary-without-manpage usr/sbin/bitlbee
diff --git a/debian/bitlbee.postinst b/debian/bitlbee.postinst
new file mode 100644
index 0000000..18209bd
--- /dev/null
+++ b/debian/bitlbee.postinst
@@ -0,0 +1,14 @@
+#!/bin/sh
+set -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
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/bitlbee.prerm b/debian/bitlbee.prerm
new file mode 100644
index 0000000..2c9f6ab
--- /dev/null
+++ b/debian/bitlbee.prerm
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" != "upgrade" ]; then
+	invoke-rc.d bitlbee stop
+fi
+
+#DEBHELPER#
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..4d80d82
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,726 @@
+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 Vernooij ]
+  * 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
+
+  * Should build on Debian GNU/kFreeBSD now. (Closes: #336965)
+  * New upstream version.
+
+ -- Wilmer van der Gaast <wilmer@gaast.net>  Thu,  3 Nov 2005 21:06:53 +0100
+
+bitlbee (0.93a-1) unstable; urgency=low
+
+  * Added Swedish and Spanish translations. (Closes: #333881, #331302)
+  * Changed debconf dependency. (Closes: #331762)
+  * Changed libgnutls dependency. (Closes: #335751)
+  * Fixed one crash-on-disconnect bug in the OSCAR module.
+
+ -- Wilmer van der Gaast <wilmer@gaast.net>  Tue,  1 Nov 2005 18:25:56 +0100
+
+bitlbee (0.92-2) unstable; urgency=low
+
+  * Added the patch that allows to connect to alternate Jabber servers.
+    Necessary for connecting to Google Talk. (Closes: #324832)
+  * Also possibly fixes some more problems with losing data when disk is
+    full.
+  * Added Vietnamese and Brazilian DebConf translations. Sorry for being
+    so late. (Closes: #297058, #313158)
+
+ -- Wilmer van der Gaast <lintux@debian.org>  Thu,  8 Sep 2005 19:55:56 +0200
+
+bitlbee (0.92-1) unstable; urgency=low
+
+  * New upstream release.
+  * Implemented support for the IRC WATCH command and got rid of the
+    IRC_MAX_ARGS limit. (Closes: #283504)
+  * Added Czech translation. (Closes: #293615)
+
+ -- Wilmer van der Gaast <lintux@debian.org>  Thu, 24 Feb 2005 17:11:32 +0100
+
+bitlbee (0.91-3) unstable; urgency=low
+
+  * Fixed a small bug in postrm which caused problems when removing/upgrading.
+
+ -- Wilmer van der Gaast <lintux@debian.org>  Sun, 10 Oct 2004 08:59:52 +0200
+
+bitlbee (0.91-2) unstable; urgency=low
+
+  * Removed the part that messes with tcpd configuration files because it
+    causes troubles for some people and because it's no problem for users
+    to edit those files by hand. (Closes: #275418)
+    When upgrading from previous versions, the bitlbee line won't be removed
+    from your tcpd conffiles. (This is only done when purging a BitlBee
+    install) You don't have to worry about BitlBee suddenly opening for the
+    whole world because of the removal of this feature.
+  * Updated German translation. (Closes: #274655)
+  * Removed the unreliable check for an existing BitlBee installation (a
+    /etc/passwd grep) and replaced it with something more reliable.
+
+ -- Wilmer van der Gaast <lintux@debian.org>  Sat,  9 Oct 2004 19:06:33 +0200
+
+bitlbee (0.91-1) unstable; urgency=low
+
+  * info-command works for Jabber connections now. (Closes: #232712)
+  * Saner code for duplicate nickname prevention. (Closes: #234285)
+  * Support for Jabber connections over SSL. (Closes: #252458)
+  * If the user chooses for noinetd.conf installation, this setting is now
+    remembered during reinstalls. (Closes: #260533)
+  * An up-to-date Japanse DebConf template. (Closes: #271091)
+
+ -- Wilmer van der Gaast <lintux@debian.org>  Sat, 25 Sep 2004 18:18:17 +0200
+
+bitlbee (0.90a-2) unstable; urgency=low
+
+  * Using libgnutls11 now. (Closes: #264740)
+  * postinst no longer appends newlines to hosts.* because grep already
+    makes sure the last line is terminated with a newline. (Closes: #253278)
+  * Added Japanese DebConf templates. (Closes: #259801)
+  * Installing BitlBee in inetd.conf is now optional. (Closes: #260533)
+
+ -- Wilmer van der Gaast <lintux@debian.org>  Mon,  6 Sep 2004 20:04:22 +0200
+
+bitlbee (0.90a-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Wilmer van der Gaast <lintux@debian.org>  Mon, 28 Jun 2004 20:30:26 +0200
+
+bitlbee (0.90-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added German DebConf translation. (Closes: #250787)
+
+ -- Wilmer van der Gaast <lintux@debian.org>  Sat, 29 May 2004 11:51:56 +0200
+
+bitlbee (0.85a-1) unstable; urgency=low
+
+  * New upstream release. This one should fix build problems on arm.
+
+ -- Wilmer van der Gaast <lintux@debian.org>  Thu, 25 Mar 2004 00:12:33 +0100
+
+bitlbee (0.85-1) unstable; urgency=low
+
+  * New upstream release.
+  * This version has a command line switch to specify alternate configuration
+    files/settings directories. (Closes: #207060)
+
+ -- Wilmer van der Gaast <lintux@debian.org>  Sat, 13 Mar 2004 22:19:35 +0100
+
+bitlbee (0.84-2) unstable; urgency=low
+
+  * Converted debconf templates to po2debconf format, without breaking
+    building on older (non-po2debconf) systems. Thanks to Martin Quinson.
+    (Closes: #205816)
+  * Added French debconf templates. Thanks to Christian Perrier.
+    (Closes: #206593)
+
+ -- Wilmer van der Gaast <lintux@debian.org>  Wed,  3 Mar 2004 21:19:12 +0100
+
+bitlbee (0.84-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Wilmer van der Gaast <lintux@debian.org>  Fri, 13 Feb 2004 20:13:53 +0100
+
+bitlbee (0.83-2) unstable; urgency=low
+
+  * Removed libsoup dependency, BitlBee now uses libgnutls directly.
+    (Closes: #208475, #230895)
+  * Now including preprocessed documentation files to save some time on
+    slow buildd's (and fix build problems on archs without a working
+    sgmltools package).
+
+ -- Wilmer van der Gaast <lintux@debian.org>  Fri,  6 Feb 2004 01:26:27 +0100
+
+bitlbee (0.83-1) unstable; urgency=low
+
+  * Added bitlbee.conf to conffiles. Should've done that before, sorry.
+  * Sorry, still with MSN support disabled, because Debian's default
+    libsoup package won't work with BitlBee-MSN.
+
+ -- Wilmer van der Gaast <lintux@debian.org>  Wed, 31 Dec 2003 00:56:57 +0100
+
+bitlbee (0.82-1) unstable; urgency=low
+
+  * New upstream release.
+  * Disabled MSN support in the Debian version for now, because it needs
+    a patched version of libsoup. If you want MSN support, you'll have to
+    create one yourself and install a patched version of libsoup.
+
+ -- Wilmer van der Gaast <lintux@debian.org>  Fri, 31 Oct 2003 21:51:01 +0100
+
+bitlbee (0.81a-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Wilmer van der Gaast <lintux@debian.org>  Wed, 16 Oct 2003 16:21:31 +0200
+
+bitlbee (0.81-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fixes Yahoo! problems. (Closes: #213876)
+
+ -- Wilmer van der Gaast <lintux@debian.org>  Wed, 15 Oct 2003 16:00:00 +0200
+
+bitlbee (0.80-1) unstable; urgency=low
+
+  * New upstream release.
+  * preinst now unlinks the old helpfile while upgrading, see README.Debian
+    for details.
+  * 'Upgraded' to standards 3.5.9.
+  * "jabber: Non-ascii away messages not supported" patch included.
+    (Closes: #195852)
+
+ -- Wilmer van der Gaast <lintux@debian.org>  Tue, 24 Jun 2003 20:00:00 +0200
+
+bitlbee (0.74a-1) unstable; urgency=low
+
+  * This one actually does contain the bugfix 0.74 should've had.
+
+ -- Wilmer van der Gaast <lintux@debian.org>  Wed, 11 Jun 2003 13:44:01 +0200
+
+bitlbee (0.74-1) unstable; urgency=high
+
+  * Security release, fixing a little not-too-dangerous security bug.
+
+ -- Wilmer van der Gaast <lintux@debian.org>  Tue, 10 Jun 2003 22:50:19 +0200
+
+bitlbee (0.73-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Wilmer van der Gaast <lintux@debian.org>  Sun, 13 Apr 2003 01:20:49 +0200
+
+bitlbee (0.72-2) unstable; urgency=low
+
+  * Now uses '127.0.0.1' as default for hosts.allow instead of 'localhost'.
+    (Closes: #174219)
+  * Fixed some other portability issues. (Closes: #177394)
+  * Added w3m builddep, needed for .txt documentation generation.
+  * Removed jadetex builddep because it seems not to be necessary after all.
+
+ -- Wilmer van der Gaast <lintux@debian.org>  Tue, 21 Jan 2003 01:35:46 +0100
+
+bitlbee (0.72-1) unstable; urgency=low
+
+  * BitlBee doesn't have tcpd in it anymore; external tcpd is used now.
+  * Added an examples/ directory.
+  * Fixed arm/ppc/s390 portability issue on char signedness. (Closes: #161026)
+
+ -- Wilmer van der Gaast <lintux@debian.org>  Thu, 19 Dec 2002 00:24:29 +0100
+
+bitlbee (0.71-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Wilmer van der Gaast <lintux@debian.org>  Mon, 16 Sep 2002 01:02:09 +0200
+
+bitlbee (0.7-2) unstable; urgency=low
+
+  * Second try at a good upload.
+
+ -- Wilmer van der Gaast <lintux@debian.org>  Thu, 15 Aug 2002 20:14:54 +0200
+
+bitlbee (0.7-1) unstable; urgency=low
+
+  * First public release. (Closes: #153190)
+
+ -- Wilmer van der Gaast <lintux@debian.org>  Sat, 10 Aug 2002 04:47:07 +0200
+
+bitlbee (0.6-1) unstable; urgency=low
+
+  * Initial Release. (Testing only, not for release.)
+
+ -- Wilmer van der Gaast <lintux@debian.org>  Wed, 10 Jul 2002 11:02:28 +0200
+
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..1e8b314
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+6
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..89a7efb
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,93 @@
+Source: bitlbee
+Section: net
+Priority: optional
+Maintainer: Wilmer van der Gaast <wilmer@gaast.net>
+Uploaders: Jelmer Vernooij <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 (>= 6.0.7~), dh-systemd (>= 1.5) | debhelper (<< 9.20131227), python
+Homepage: http://www.bitlbee.org/
+Vcs-Git: https://github.com/bitlbee/bitlbee
+Vcs-Browser: https://github.com/bitlbee/bitlbee
+
+Package: bitlbee
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${source:Version})
+Conflicts: bitlbee-libpurple
+Replaces: bitlbee-libpurple
+Description: IRC to other chat networks gateway (default version)
+ 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), ICQ, AIM, MSN and Twitter.
+
+Package: bitlbee-libpurple
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${source: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), ICQ, AIM, MSN 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: all
+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), ICQ, AIM, MSN and Twitter.
+ .
+ This package contains common files (mostly documentation) for bitlbee and
+ bitlbee-libpurple.
+
+Package: bitlbee-dev
+Architecture: all
+Depends: ${misc:Depends}, bitlbee (>= ${source:Version}) | bitlbee-libpurple (>= ${source:Version}), bitlbee (<< ${source:Version}.1~) | bitlbee-libpurple (<< ${source:Version}.1~), bitlbee-common (= ${source: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), ICQ, AIM, MSN 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 (= ${source: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), ICQ, AIM, MSN and Twitter.
+ .
+ This package contains a plugin that adds support for Off-The-Record
+ encryption of instant messages.
+
+Package: bitlbee-plugin-skype
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${binary:Version}) | bitlbee-libpurple (= ${binary:Version}), bitlbee-common (= ${source:Version})
+Recommends: skyped
+Description: IRC to other chat networks gateway (Skype 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), ICQ, AIM, MSN and Twitter.
+ .
+ This package contains a plugin that adds support for the Skype IM network.
+ You need to download and install the Skype client for this to work.
+
+Package: skyped
+Architecture: all
+Depends: ${misc:Depends}, ${shlibs:Depends}, python (>= 2.5), python-gnutls, python-skype (>=0.9.28.7)
+Recommends: skype
+Description: Daemon to control Skype remotely
+ Daemon to control the GUI Skype client. Currently required to control Skype
+ from the BitlBee IRC2IM gateway. Skyped and Skype can run on a different
+ host than the BitlBee server, the communication is encrypted.
+ .
+ You need to download and install the Skype client for this to work.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..c5ca4e1
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,73 @@
+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, Geert Mulders, Miklos Vajna and others.
+
+Mainly Copyright 2002-2014 Wilmer van der Gaast.
+
+
+Bits of third party code, also (L)GPLed:
+* Some parts (though there is very little left at this point) are borrowed
+  from Gaim (version 0.58), now known as Pidgin <http://www.pidgin.im/>.
+
+Other license (but GPL-compatible):
+* lib/json.[ch] is from <https://github.com/udp/json-parser> and licensed
+  under the modified BSD license.
+
+
+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-2;
+  if not, write to the Free Software Foundation, Inc., 51 Franklin St, 
+  Fifth Floor, Boston, MA 02110-1301, USA.
+============================================================================
+
+
+Portions (mostly protocols/twitter and protocols/oscar) are licenced under
+the LGPL:
+
+============================================================================
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation, version
+  2.1.
+
+  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 St, Fifth Floor, Boston, MA  02110-1301  USA
+============================================================================
+
+
+The SGML-formatted documentation is written by Jelmer Vernooij
+<jelmer@samba.org> under the GNU Free Documentation License:
+
+============================================================================
+Copyright (c)  2002-2012 Jelmer Vernooij, Wilmer van der Gaast.
+
+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 no
+Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+Texts.  A copy of the license is included in the section entitled `GNU
+Free Documentation License''.
+============================================================================
diff --git a/debian/patches/bitlbee.conf.diff b/debian/patches/bitlbee.conf.diff
new file mode 100644
index 0000000..339ccd4
--- /dev/null
+++ b/debian/patches/bitlbee.conf.diff
@@ -0,0 +1,22 @@
+--- 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
+ 
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..4699d1c
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,150 @@
+#!/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.
+# Don't build skype by default since it depends on deleted/non-free
+# packages. Need to at least get python-skype back into Debian.
+BITLBEE_LIBPURPLE ?= 1
+BITLBEE_OTR ?= plugin
+BITLBEE_SKYPE ?= 0
+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}')"
+endif
+
+ifneq ($(BITLBEE_LIBPURPLE),1)
+DH_OPTIONS += -Nbitlbee-libpurple
+endif
+
+ifneq ($(BITLBEE_OTR),plugin)
+DH_OPTIONS += -Nbitlbee-plugin-otr
+endif
+
+ifneq ($(BITLBEE_SKYPE),plugin)
+DH_OPTIONS += -Nbitlbee-plugin-skype -Nskyped
+endif
+
+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")
+
+# No difference at the build stage so just call main build target.
+# (Well indep could be docs-only but we prebuild them plus it's really
+# not that much work.)
+build-arch build-indep: 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) --skype=$(BITLBEE_SKYPE) $(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 --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
+	$(MAKE) -C debian/build-native install-plugin-skype DESTDIR=`pwd`/debian/skyped
+
+ifeq ($(HAS_DH_SYSTEMD),1)
+	$(MAKE) -C debian/build-native install-systemd DESTDIR=`pwd`/debian/bitlbee-common
+endif
+
+ifneq ($(BITLBEE_SKYPE),0)
+	mkdir -p debian/bitlbee-plugin-skype/usr
+	mv debian/skyped/usr/lib debian/bitlbee-plugin-skype/usr
+
+	mkdir -p debian/skyped/usr/share/man/man1
+	mv debian/bitlbee-common/usr/share/man/man1/skyped* debian/skyped/usr/share/man/man1
+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_installchangelogs doc/CHANGES
+	dh_installexamples
+	dh_installdocs #--link-doc=bitlbee-common
+	# TODO: Restore --link-doc up here and remove the hack below once
+	# Hardy and Lenny are deprecated.
+	for p in bitlbee bitlbee-libpurple bitlbee-dev bitlbee-plugin-otr; do rm -r debian/$$p/usr/share/doc/$$p && ln -s bitlbee-common debian/$$p/usr/share/doc/$$p || true; done
+	dh_installdebconf
+ifeq ($(HAS_DH_SYSTEMD),1)
+	dh_systemd_enable
+	dh_installinit --init-script=bitlbee
+	dh_systemd_start
+else
+	dh_installinit --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-indep: build install
+	DH_OPTIONS=-i $(MAKE) -f debian/rules binary-common
+
+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
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary-common binary install
diff --git a/debian/skyped.README.Debian b/debian/skyped.README.Debian
new file mode 100644
index 0000000..502e614
--- /dev/null
+++ b/debian/skyped.README.Debian
@@ -0,0 +1,18 @@
+bitlbee-skype for Debian
+------------------------
+
+The upstream package installs global configuration files in /etc. Since 
+configuration cannot be used by multiple users, however, the default for 
+Debian packages is in ~/.skyped/. Please copy the configuration files 
+from ./examples to ~/.skyped/. 
+
+You will also need to change the configuration values in skyped.conf 
+and skyped.cnf to suit your needs and create the keys. More information
+in the respective files as well as the README.gz.
+
+Without these measures, skyped will NOT work. 
+
+You need to download the official skype client for this to be of any
+use. Go to http://www.skype.com/.
+
+ -- David Spreen <netzwurm@debian.org>, Thu,  2 Apr 2009 15:01:25 -0700
diff --git a/debian/skyped.docs b/debian/skyped.docs
new file mode 100644
index 0000000..3f99862
--- /dev/null
+++ b/debian/skyped.docs
@@ -0,0 +1,2 @@
+protocols/skype/NEWS
+protocols/skype/README
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..d3827e7
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1.0
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..3d7e42c
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1 @@
+--diff-ignore='(^|/)\.git'
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..66ab450
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=2
+http://get.bitlbee.org/src/bitlbee-(.*).tar.gz