aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitlbee.h4
-rw-r--r--debian/NEWS10
-rw-r--r--debian/README.Debian30
-rw-r--r--debian/bitlbee-common.config21
-rw-r--r--debian/bitlbee-common.init11
-rw-r--r--debian/bitlbee-common.postinst52
-rw-r--r--debian/bitlbee-common.postrm2
-rw-r--r--debian/bitlbee-common.preinst20
-rw-r--r--debian/bitlbee-common.templates8
-rw-r--r--debian/changelog16
-rw-r--r--debian/control12
-rw-r--r--debian/copyright1
-rw-r--r--debian/po/POTFILES.in1
-rw-r--r--debian/po/cs.po44
-rw-r--r--debian/po/da.po36
-rw-r--r--debian/po/de.po45
-rw-r--r--debian/po/es.po61
-rw-r--r--debian/po/fr.po44
-rw-r--r--debian/po/it.po36
-rw-r--r--debian/po/ja.po45
-rw-r--r--debian/po/nl.po44
-rw-r--r--debian/po/pt.po35
-rw-r--r--debian/po/pt_BR.po44
-rw-r--r--debian/po/ru.po47
-rw-r--r--debian/po/sv.po43
-rw-r--r--debian/po/templates.pot41
-rw-r--r--debian/po/vi.po32
-rw-r--r--doc/CHANGES58
-rw-r--r--doc/user-guide/misc.xml16
-rw-r--r--init/bitlbee.service.in1
-rw-r--r--init/bitlbee@.service.in1
31 files changed, 137 insertions, 724 deletions
diff --git a/bitlbee.h b/bitlbee.h
index cad06f1e..4ecf5f5d 100644
--- a/bitlbee.h
+++ b/bitlbee.h
@@ -36,11 +36,11 @@ extern "C" {
#define PACKAGE "BitlBee"
#ifndef BITLBEE_VERSION
-#define BITLBEE_VERSION "3.4.2"
+#define BITLBEE_VERSION "3.5"
#endif
#define VERSION BITLBEE_VERSION
#define BITLBEE_VER(a, b, c) (((a) << 16) + ((b) << 8) + (c))
-#define BITLBEE_VERSION_CODE BITLBEE_VER(3, 4, 2)
+#define BITLBEE_VERSION_CODE BITLBEE_VER(3, 5, 0)
#define BITLBEE_ABI_VERSION_CODE 1
#define MAX_STRING 511
diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 00000000..e7087d23
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,10 @@
+bitlbee (3.5-1) UNRELEASED; 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
index b5a514c0..573b9744 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,32 +1,4 @@
- *** NEWS (Version 1.2 and later) ***
-
-Starting from version 1.2, BitlBee has a forking daemon mode. The Debian
-package now uses this mode by default, instead of inetd mode. If you don't
-want to use this, you can disable the init scripts (best way to do this is
-by editing /etc/default/bitlbee) and restore the inetd.conf entry. This
-should be necessary only once, it won't be touched during upgrades.
-
-Another important change in BitlBee 1.2 is the file format used for your
-personal settings. Everything's now saved in a single .xml (per account,
-of course) file instead of $nick.accounts and $nick.nicks. One advantage
-of this new format is that the passwords are actually encrypted instead of
-just vaguely obfuscated. BitlBee can still read the old files, and will
-save things in the new format when you save/disconnect. After that, you
-can safely remove the old-style files (this is recommended).
-
-I tried making this transition (the new file format but especially, in this
-case, the inetd->forkdaemon mode change) as smooth as possible, but I'm
-aware that many BitlBee users will have their own hacks already to run the
-program. I hope the package won't break any of this for anyone. 1.2-2
-should fix at least some of the issues.
-
----------------------------------------------------------------------------
-
-Debconf should have asked you on what port you want BitlBee to run. If it
-did not, the port number should be 6667 or 6668. (6668 if you already got
-something running at 6667)
-
-Fire up your favourite IRC client and connect to localhost:6667 (or 6668),
+Fire up your favourite IRC client and connect to localhost:6667,
and read the documentation (type help for a list of commands).
Have fun!
diff --git a/debian/bitlbee-common.config b/debian/bitlbee-common.config
deleted file mode 100644
index 927f646f..00000000
--- a/debian/bitlbee-common.config
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-[ -f /etc/default/bitlbee ] && . /etc/default/bitlbee
-
-db_title BitlBee
-
-if [ -n "$BITLBEE_PORT" ]; then
- db_set bitlbee/serveport "$BITLBEE_PORT"
-else
- db_get bitlbee/serveport
- if [ "$RET" = "stillhavetoask" ]; then
- db_set bitlbee/serveport 6667;
- fi
-fi
-
-if db_input medium bitlbee/serveport; then
- db_go;
-fi
diff --git a/debian/bitlbee-common.init b/debian/bitlbee-common.init
index fd10b0af..8fbec11a 100644
--- a/debian/bitlbee-common.init
+++ b/debian/bitlbee-common.init
@@ -22,15 +22,8 @@ SCRIPTNAME=/etc/init.d/$NAME
# Gracefully exit if the package has been removed.
[ -x $DAEMON ] || exit 0
-# Default value
-BITLBEE_PORT=6667
BITLBEE_OPTS=-F
-# Read config file if it is present.
-if [ -r /etc/default/$NAME ]; then
- . /etc/default/$NAME
-fi
-
#
# Function that starts the daemon/service.
@@ -41,7 +34,7 @@ d_start() {
chown bitlbee: $PIDFILE
start-stop-daemon --start --quiet --pidfile $PIDFILE \
- --exec $DAEMON -- -p $BITLBEE_PORT -P $PIDFILE $BITLBEE_OPTS
+ --exec $DAEMON -- -P $PIDFILE $BITLBEE_OPTS
}
#
@@ -55,8 +48,6 @@ d_stop() {
case "$1" in
start)
- [ "$BITLBEE_DISABLED" = "1" ] && exit 0
-
echo -n "Starting $DESC: $NAME"
d_start
echo "."
diff --git a/debian/bitlbee-common.postinst b/debian/bitlbee-common.postinst
index 477bdee4..93ef5010 100644
--- a/debian/bitlbee-common.postinst
+++ b/debian/bitlbee-common.postinst
@@ -2,57 +2,17 @@
set -e
-. /usr/share/debconf/confmodule
-
-db_get bitlbee/serveport
-PORT="$RET"
-
CONFDIR=/var/lib/bitlbee/
-## Load default option. Don't want to put this in debconf (yet?)
-BITLBEE_OPTS=-F
-BITLBEE_DISABLED=0
-BITLBEE_UPGRADE_DONT_RESTART=0
-[ -r /etc/default/bitlbee ] && . /etc/default/bitlbee
-
-if [ "$BITLBEE_DISABLED" = "0" ] && which update-inetd > /dev/null 2> /dev/null &&
- ( expr "$2" : '0\..*' > /dev/null || expr "$2" : '1\.0\..*' > /dev/null ); then
- ## Make sure the inetd entry is gone (can still be there from a
- ## previous version.
- update-inetd --remove '.*/usr/sbin/bitlbee'
- if grep -q /usr/sbin/bitlbee /etc/inetd.conf 2> /dev/null; then
- # Thanks for breaking update-inetd! (bugs.debian.org/311111)
- # I hope that it works at least with xinetd, because this
- # emergency hack doesn't:
- perl -pi -e 's:^[^#].*/usr/sbin/bitlbee$:## Now using daemon mode\: # $&:' /etc/inetd.conf
- killall -HUP inetd || true
- fi
-fi
-
-cat<<EOF>/etc/default/bitlbee
+if [ -e /etc/default/bitlbee ]; then
+ cat <<EOF >/etc/default/bitlbee
## /etc/default/bitlbee: Auto-generated/updated script.
##
-## If running in (fork)daemon mode, listen on this TCP port.
-BITLBEE_PORT="$PORT"
-
-## Use single-process or forking daemon mode? Can't be changed from debconf,
-## but maintainer scripts will save your changes here.
-BITLBEE_OPTS="$BITLBEE_OPTS"
-
-## In case you want to stick with inetd mode (or if you just want to disable
-## the init scripts for some other reason), you can disable the init script
-## here. (Just set it to 1)
-BITLBEE_DISABLED=$BITLBEE_DISABLED
-
-## As a server operator, you can use the RESTART command to restart only the
-## master process while keeping all the child processes and their IPC
-## connections. By enabling this, the maintainer scripts won't restart
-## BitlBee during upgrades so you can restart the master process by hand.
-BITLBEE_UPGRADE_DONT_RESTART=$BITLBEE_UPGRADE_DONT_RESTART
+## This file is deprecated and no longer used.
+## Please edit /etc/bitlbee/bitlbee.conf instead
EOF
-## Bye-bye DebConf, we don't need you anymore.
-db_stop
+fi
## Restore the helpfile in case we weren't upgrading but just reconfiguring:
if [ -e /usr/share/bitlbee/help.upgrading ]; then
@@ -63,7 +23,7 @@ if [ -e /usr/share/bitlbee/help.upgrading ]; then
fi
fi
-if [ "$BITLBEE_UPGRADE_DONT_RESTART" != "1" -a -n "$2" -a -x "/etc/init.d/bitlbee" ]; then
+if [ -n "$2" -a -x "/etc/init.d/bitlbee" ]; then
invoke-rc.d bitlbee restart
fi
diff --git a/debian/bitlbee-common.postrm b/debian/bitlbee-common.postrm
index 79e621a1..1001f792 100644
--- a/debian/bitlbee-common.postrm
+++ b/debian/bitlbee-common.postrm
@@ -4,7 +4,7 @@ set -e
if [ "$1" = "purge" ]; then
rm -f /etc/default/bitlbee
- deluser --system bitlbee || true
+ deluser --system bitlbee > /dev/null || true
rm -rf /var/lib/bitlbee ## deluser doesn't seem to do this for homedirs in /var
fi
diff --git a/debian/bitlbee-common.preinst b/debian/bitlbee-common.preinst
new file mode 100644
index 00000000..ad4b5a79
--- /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.templates b/debian/bitlbee-common.templates
deleted file mode 100644
index 0cd04426..00000000
--- a/debian/bitlbee-common.templates
+++ /dev/null
@@ -1,8 +0,0 @@
-Template: bitlbee/serveport
-Type: string
-Default: stillhavetoask
-_Description: On what TCP port should BitlBee listen for connections?
- BitlBee normally listens on the regular IRC port, 6667. This might not be
- a very good idea when you're running a real IRC daemon as well. 6668 might
- be a good alternative. Leaving this value blank means that BitlBee will not
- be run automatically.
diff --git a/debian/changelog b/debian/changelog
index e40fefdc..d373358f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+bitlbee (3.5-1) UNRELEASED; 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
+
+ -- dequis <dx@dxzone.com.ar> Mon, 02 Jan 2017 14:25:05 -0300
+
bitlbee (3.4.2-1) unstable; urgency=medium
[ Jelmer Vernooij ]
diff --git a/debian/control b/debian/control
index 9dac2ef8..ff6eee43 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ 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
- and Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
+ and Facebook Chat), ICQ, AIM, MSN and Twitter/Identica/Status.net.
Package: bitlbee-libpurple
Architecture: any
@@ -27,7 +27,7 @@ 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 Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
+ and Facebook Chat), ICQ, AIM, MSN and Twitter/Identica/Status.net.
.
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
@@ -43,7 +43,7 @@ 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 Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
+ and Facebook Chat), ICQ, AIM, MSN and Twitter/Identica/Status.net.
.
This package contains common files (mostly documentation) for bitlbee and
bitlbee-libpurple.
@@ -54,7 +54,7 @@ Depends: ${misc:Depends}, bitlbee (>= ${source:Version}) | bitlbee-libpurple (>=
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 Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
+ and Facebook Chat), ICQ, AIM, MSN and Twitter/Identica/Status.net.
.
This package holds development stuff for compiling plug-ins.
@@ -64,7 +64,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${binary:Version}) | bit
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 Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
+ and Facebook Chat), ICQ, AIM, MSN and Twitter/Identica/Status.net.
.
This package contains a plugin that adds support for Off-The-Record
encryption of instant messages.
@@ -76,7 +76,7 @@ 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
- and Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
+ and Facebook Chat), ICQ, AIM, MSN and Twitter/Identica/Status.net.
.
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.
diff --git a/debian/copyright b/debian/copyright
index c053d9d8..c5ca4e16 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,7 +10,6 @@ Mainly Copyright 2002-2014 Wilmer van der Gaast.
Bits of third party code, also (L)GPLed:
-* protocols/yahoo/ is libyahoo2 <http://libyahoo2.sf.net/>.
* 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/>.
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
deleted file mode 100644
index 8d2b570f..00000000
--- a/debian/po/POTFILES.in
+++ /dev/null
@@ -1 +0,0 @@
-[type: gettext/rfc822deb] bitlbee-common.templates
diff --git a/debian/po/cs.po b/debian/po/cs.po
deleted file mode 100644
index 558c8602..00000000
--- a/debian/po/cs.po
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-#
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-# Developers do not need to manually edit POT or PO files.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: bitlbee\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-25 18:12+0200\n"
-"PO-Revision-Date: 2005-02-04 12:31+0100\n"
-"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
-"Language-Team: Czech <debian-l10n-czech@debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:4
-msgid "On what TCP port should BitlBee listen for connections?"
-msgstr "Na kterm TCP portu m BitlBee naslouchat pchozm spojenm?"
-
-#. 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 normln naslouch na bnm IRC portu 6667. Pokud mte sputn i "
-"reln IRC daemon, tak to nemus bt nejlep npad. Vhodn alternativa me "
-"bt 6668. Ponechte-li pole przdn, znamen to, e se BitlBee nebude "
-"spoutt automaticky."
diff --git a/debian/po/da.po b/debian/po/da.po
deleted file mode 100644
index d727ea8c..00000000
--- a/debian/po/da.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Danish translation bitlbee.
-# Copyright (C) 2010 bitlbee & nedenstående oversættere.
-# This file is distributed under the same license as the bitlbee package.
-# Joe Hansen (joedalton2@yahoo.dk), 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: bitlbee\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-11 10:28+0200\n"
-"PO-Revision-Date: 2010-08-08 17:30+01:00\n"
-"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
-"Language-Team: Danish <debian-l10n-danish@lists.debian.org> \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: string
-#. Description
-#: ../templates:1001
-msgid "On what TCP port should BitlBee listen for connections?"
-msgstr "På hvilken TCP-port skal BitlBee lytte efter forbindelser?"
-
-#. Type: string
-#. Description
-#: ../templates:1001
-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 lytter normalt på den regulære IRC-port, 6667. Dette er måske ikke "
-"nogen god ide, når du også kører en reel IRC-dæmon. 6668 er måske et godt "
-"alternativ. Hvis du efterlader denne værdi blank, betyder det, at BitlBee ikke "
-"vil køre automatisk."
diff --git a/debian/po/de.po b/debian/po/de.po
deleted file mode 100644
index 2264bf27..00000000
--- a/debian/po/de.po
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans#
-# Developers do not need to manually edit POT or PO files.
-# Erik Schanze <mail@erikschanze.de>, 2004.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: bitlbee_0.90a-2_de\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-25 18:12+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:4
-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: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 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."
diff --git a/debian/po/es.po b/debian/po/es.po
deleted file mode 100644
index 44c525b9..00000000
--- a/debian/po/es.po
+++ /dev/null
@@ -1,61 +0,0 @@
-# bitlbee po-debconf translation to Spanish
-# Copyright (C) 2005 Software in the Public Interest
-# This file is distributed under the same license as the bitlbee package.
-#
-# Changes:
-# - Initial translation
-# César Gómez Martín <cesar.gomez@gmail.com>
-#
-#
-# Traductores, si no conoce el formato PO, merece la pena leer la
-# documentación de gettext, especialmente las secciones dedicadas a este
-# formato, por ejemplo ejecutando:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-# Equipo de traducción al español, por favor, lean antes de traducir
-# los siguientes documentos:
-#
-# - El proyecto de traducción de Debian al español
-# http://www.debian.org/intl/spanish/
-# especialmente las notas de traducción en
-# http://www.debian.org/intl/spanish/notas
-#
-# - La guía de traducción de po's de debconf:
-# /usr/share/doc/po-debconf/README-trans
-# o http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: bitlbee\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-25 18:12+0200\n"
-"PO-Revision-Date: 2005-08-24 19:37+0100\n"
-"Last-Translator: César Gómez Martín <cesar.gomez@gmail.com>\n"
-"Language-Team: Debian l10n spanish <debian-l10n-spanish@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Spanish\n"
-"X-Poedit-Country: SPAIN\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#. Type: string
-#. Description
-#: ../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
-#. 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 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."
diff --git a/debian/po/fr.po b/debian/po/fr.po
deleted file mode 100644
index 562a0229..00000000
--- a/debian/po/fr.po
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-#
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-# Developers do not need to manually edit POT or PO files.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: bitlbee (0.80-1)\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-25 18:12+0200\n"
-"PO-Revision-Date: 2003-08-07 08:45+0100\n"
-"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
-"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-15\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:4
-msgid "On what TCP port should BitlBee listen for connections?"
-msgstr "Sur quel port TCP BitlBee doit-il tre l'coute?"
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:4
-msgid ""
-"BitlBee normally listens on the regular IRC port, 6667. This might not be a "
-"very good idea when you're running a real IRC daemon as well. 6668 might be "
-"a good alternative. Leaving this value blank means that BitlBee will not be "
-"run automatically."
-msgstr ""
-"BitlBee est usuellement l'coute sur le port IRC standard: 6667. Cela "
-"n'est pas forcment un choix adapt si vous utilisez en mme temps un vrai "
-"dmon IRC. Dans ce cas, choisir 6668 est conseill. Si vous ne souhaitez pas "
-"lancer BitlBee automatiquement, veuillez laissez ce champs vide."
diff --git a/debian/po/it.po b/debian/po/it.po
deleted file mode 100644
index e149e61a..00000000
--- a/debian/po/it.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Italian translation of the bitlbee debconf template
-# This file is distributed under the same license as the bitlbee package
-# Copyright (C) 2007 Free Software Foundation, Inc.
-# Luca Monducci <luca.mo@tiscali.it>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: bitlbee\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-30 04:31+0200\n"
-"PO-Revision-Date: 2007-10-27 11:52+0200\n"
-"Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
-"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:1001
-msgid "On what TCP port should BitlBee listen for connections?"
-msgstr "Su quale porta TCP si deve mettere in ascolto BitlBee?"
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:1001
-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 ""
-"Normalmente BitlBee si mette in ascolto sulla consueta porta IRC, la 6667. "
-"Questa potrebbe non essere una buona idea se è in esecuzione anche un reale "
-"demone IRC. La porta 6668 potrebbe essere una valida alternativa. Lasciando "
-"vuoto questo valore BitlBee non viene avviato automaticamente."
diff --git a/debian/po/ja.po b/debian/po/ja.po
deleted file mode 100644
index c94bbbe4..00000000
--- a/debian/po/ja.po
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-#
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-# Developers do not need to manually edit POT or PO files.
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: bitlbee 0.90a-2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-25 18:12+0200\n"
-"PO-Revision-Date: 2004-09-11 13:30+0900\n"
-"Last-Translator: Hideki Yamane <henrich@samba.gr.jp>\n"
-"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=EUC-JP\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:4
-msgid "On what TCP port should BitlBee listen for connections?"
-msgstr "BitlBee ϡ³Τˤɤ TCP ݡȤ listen ޤ?"
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:4
-msgid ""
-"BitlBee normally listens on the regular IRC port, 6667. This might not be a "
-"very good idea when you're running a real IRC daemon as well. 6668 might be "
-"a good alternative. Leaving this value blank means that BitlBee will not be "
-"run automatically."
-msgstr ""
-"BitlBee ̾ξ硢ɸ IRC ݡֹǤ 6667 listen ޤƱ"
-"ˤƼºݤ IRC ǡưƤ硢ϤޤɤͤǤ̵"
-"⤷ޤ 6668 ȤΤɤΤޤ󡣤Τޤޤˤ"
-"ƤСBitlBee ϼưŪˤϵưʤʤޤ"
diff --git a/debian/po/nl.po b/debian/po/nl.po
deleted file mode 100644
index f9a97d76..00000000
--- a/debian/po/nl.po
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-#
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-# Developers do not need to manually edit POT or PO files.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: bitlbee (0.90a-2)\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-25 18:12+0200\n"
-"PO-Revision-Date: 2004-09-06 20:16+0200\n"
-"Last-Translator: Wilmer van der Gaast <wilmer@gaast.net>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:4
-msgid "On what TCP port should BitlBee listen for connections?"
-msgstr "Op welke TCP poort moet BitlBee draaien?"
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:4
-msgid ""
-"BitlBee normally listens on the regular IRC port, 6667. This might not be a "
-"very good idea when you're running a real IRC daemon as well. 6668 might be "
-"a good alternative. Leaving this value blank means that BitlBee will not be "
-"run automatically."
-msgstr ""
-"Normaal 'luistert' BitlBee op de gebruikelijke IRC poort, 6667. Als je al "
-"een andere IRC daemon draait is dat onmogelijk. Kies dan bijvoorbeeld voor "
-"poort 6668. Als je niet wil dat BitlBee automatisch gestart wordt, vul hier "
-"dan niets in."
diff --git a/debian/po/pt.po b/debian/po/pt.po
deleted file mode 100644
index 7eb3380d..00000000
--- a/debian/po/pt.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# Portuguese translation of bitlbee's debconf messages. # This file is distributed under the same license as the bitlbee package.
-# 2006, Marco Ferra <mferra@debianpt.org>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: bitlbee 1.0.3-1.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-13 18:53+0100\n"
-"PO-Revision-Date: 2007-01-26 22:34+0000\n"
-"Last-Translator: Marco Ferra <mferra@debianpt.org>\n"
-"Language-Team: Portuguese <traduz@debianpt.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:1001
-msgid "On what TCP port should BitlBee listen for connections?"
-msgstr "Em que porta TCP deverá o BitlBee escutar por conexões?"
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:1001
-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 escuta na porta do IRC 6667. Isto poderá não ser "
-"uma ideia excelente quando está a correr um 'daemon' de IRC ao mesmo tempo. "
-"Nesse caso a porta 6668 poderá ser uma boa alternativa. Deixar este campo "
-"vazio significa que o BitlBee não irá correr automaticamente."
-
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
deleted file mode 100644
index 35193fee..00000000
--- a/debian/po/pt_BR.po
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-#
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-# Developers do not need to manually edit POT or PO files.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: bitlbee\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-25 18:12+0200\n"
-"PO-Revision-Date: 2005-02-26 16:14-0300\n"
-"Last-Translator: Andr Lus 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 conexes ?"
-
-#. 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 padro, 6667. Porm, esta pode "
-"no ser uma boa idia quando voc est rodando um daemon IRC real tambm. "
-"6689 pode ser uma boa alternativa. Deixar esse valor em branco significa que "
-"o BitlBee no ser executado automaticamente."
diff --git a/debian/po/ru.po b/debian/po/ru.po
deleted file mode 100644
index 4e448133..00000000
--- a/debian/po/ru.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# translation of ru.po to Russian
-#
-# 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.
-#
-# Yuri Kozlov <yuray@komyakino.ru>, 2009.
-msgid ""
-msgstr ""
-"Project-Id-Version: bitlbee 1.2.3-2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-25 18:12+0200\n"
-"PO-Revision-Date: 2009-08-05 20:43+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <debian-l10n-russian@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.11.4\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:4
-msgid "On what TCP port should BitlBee listen for connections?"
-msgstr "Номер порта TCP, на котором BitlBee должен ожидать подключений:"
-
-#. 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. Это может быть "
-"не лучшим решением, если у вас также запущена служба IRC. Хорошей "
-"альтернативой является номер 6668. Если оставить поле пустым, то "
-"BitlBee не будет запускаться автоматически."
-
diff --git a/debian/po/sv.po b/debian/po/sv.po
deleted file mode 100644
index 06a9a8ee..00000000
--- a/debian/po/sv.po
+++ /dev/null
@@ -1,43 +0,0 @@
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-# Developers do not need to manually edit POT or PO files.
-# , fuzzy
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: bitlbee 0.92-2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-25 18:12+0200\n"
-"PO-Revision-Date: 2005-10-03 23:18+0200\n"
-"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
-"Language-Team: Swedish <sv@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. 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 fr IRC, 6667. Detta kanske "
-"inte r en bra ide om du kr en riktig IRC-daemon p samma system. 6668 kan "
-"vara ett bra alternativ d. Lmnar du detta vrde blankt betyder det att "
-"BitlBee inte kommer att startas automatiskt."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
deleted file mode 100644
index 1a3ab2b8..00000000
--- a/debian/po/templates.pot
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-#
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-# Developers do not need to manually edit POT or PO files.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-25 18:12+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:4
-msgid "On what TCP port should BitlBee listen for connections?"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:4
-msgid ""
-"BitlBee normally listens on the regular IRC port, 6667. This might not be a "
-"very good idea when you're running a real IRC daemon as well. 6668 might be "
-"a good alternative. Leaving this value blank means that BitlBee will not be "
-"run automatically."
-msgstr ""
diff --git a/debian/po/vi.po b/debian/po/vi.po
deleted file mode 100644
index 2bcb5908..00000000
--- a/debian/po/vi.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Vietnamese translation for bitlbee.
-# Copyright © 2005 Free Software Foundation, Inc.
-# Clytie Siddall <clytie@riverland.net.au>, 2005.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: bitlbee 0.92-1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-25 18:12+0200\n"
-"PO-Revision-Date: 2005-06-12 18:34+0930\n"
-"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
-"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:4
-msgid "On what TCP port should BitlBee listen for connections?"
-msgstr "Trình BitlBee nên lắng nghe sự kết nối trên cổng TCP nào?"
-
-#. Type: string
-#. Description
-#: ../bitlbee.templates.master:4
-msgid ""
-"BitlBee normally listens on the regular IRC port, 6667. This might not be a "
-"very good idea when you're running a real IRC daemon as well. 6668 might be "
-"a good alternative. Leaving this value blank means that BitlBee will not be "
-"run automatically."
-msgstr "Trình BitlBee thường lắng nghe trên cổng IRC bình thường, 6667. Có lẽ nó không phải là một ý kiến tốt nếu bạn cũng có chạy một trình nền (dæmon) IRC thật. Như thế thì, cổng 6668 có thể là một điều thay thế tốt. Nếu bạn bỏ giá trị này rỗng, thì trình BitlBee sẽ không tự động chạy."
diff --git a/doc/CHANGES b/doc/CHANGES
index 8e861701..6f8095f4 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -3,6 +3,64 @@ found in the git commit logs, for example you can try:
https://github.com/bitlbee/bitlbee/commits/master
+Version 3.5:
+
+- ui:
+ * "chat list": shows a list of existing server-side chatrooms. With some
+ protocols, this is often the only way to add new channels.
+ See 'help chat list' for details. (jgeboski)
+ * "plugins": lists the installed plugins and their versions (jgeboski)
+ * Add 'nick_lowercase' and 'nick_underscores' settings.
+ * "handle_unknown" can be set per-account, not just globally
+
+- jabber:
+ * Add "always_use_nicks" channel setting, for non-anonymous MUCs (trac #415)
+ See 'help set always_use_nicks' for possible side effects.
+ * Properly handle rejected file transfers
+ * Don't send parts in a chat if someone is still connected from other devices
+ * hipchat: support personal oauth tokens (manually generated ones)
+
+- twitter:
+ * Hide muted tweets / no-retweets, add mute/unmute commands (Flexo)
+ * Show full version of extended tweets (with slightly more than 140 chars)
+
+- purple:
+ * Support setting chat room topics (EionRobb)
+ * Support for extra groupchat settings. Shows an error if any required
+ ones are missing. Look for purple_ prefixed settings in "chan #... set"
+ * SIPE: persistent chats can be joined now, thanks to the "chat list" command
+ and the above ("purple_uri" channel setting)
+ * Fix a file transfer crash bug (Mainly affected telegram)
+ * Honor protocol flag to not require a password (used in hangouts, telegram)
+ * Set the contacts' nicks to the %full_name for a few whitelisted protocols
+ (hangouts, funyahoo, icq, line)
+ * LINE: added a hack to save its auth token, to avoid re-auth every time
+ * Show self-messages in groupchat backlogs (before join)
+
+- yahoo:
+ * Removed because they killed their old protocol on a two month notice.
+ Use EionRobb's funyahoo purple plugin, or better yet, don't use yahoo.
+
+- Stuff for enterprise deployments (all done by Sevas)
+ * Locked down accounts, useful when pregenerating user config files. An
+ account that is marked with the locked="true" attribute can't be removed
+ and its username/password can't be changed.
+ * Locked down settings. Same as above, but for individual account settings.
+ * AllowAccountAdd setting in bitlbee.conf, to disable adding new accounts.
+ * PAM and LDAP authentication backends (not compiled by default)
+
+- For packagers:
+ * Enabled debug symbols in non-debug builds, disabled stripping by default.
+ This is closer to the default behavior of autotools, and --debug=1 is mostly
+ to set the DEBUG macro and disable optimization.
+
+- For plugin devs:
+ * Plugins should now include an "init_plugin_info" function which will be used
+ for ABI version checking in the future. It's optional for now, but will be
+ enforced later. See the commit log of d28fe1c for details. (jgeboski)
+
+Finished ... 200XX
+
Version 3.4.2:
- irc:
* Self-messages (messages sent by yourself from other IM clients), given
diff --git a/doc/user-guide/misc.xml b/doc/user-guide/misc.xml
index a95c5442..457d5d35 100644
--- a/doc/user-guide/misc.xml
+++ b/doc/user-guide/misc.xml
@@ -498,4 +498,20 @@ See the full changelog for details!
</sect1>
+<sect1 id="whatsnew030500">
+<title>New stuff in BitlBee 3.5</title>
+
+<simplelist>
+ <member>New commands: <emphasis>chat list</emphasis> and <emphasis>plugins</emphasis>. New settings: <emphasis>nick_lowercase</emphasis>, <emphasis>nick_underscores</emphasis></member>
+ <member><emphasis>twitter:</emphasis> Hide muted tweets / no-retweets, add mute/unmute commands. Show full version of extended tweets.</member>
+ <member><emphasis>jabber:</emphasis> <emphasis>always_use_nicks</emphasis> channel setting. Don't send parts in a chat if someone is still connected from other devices. Personal oauth token login for hipchat.</member>
+ <member><emphasis>purple:</emphasis> Setting /topic. Fixes for SIPE and LINE. Don't ask for password if not needed (hangouts, telegram). Set nicks to %full_name for a few protocols (hangouts, funyahoo, icq, line)</member>
+</simplelist>
+
+<para>
+See the full changelog for details!
+</para>
+
+</sect1>
+
</chapter>
diff --git a/init/bitlbee.service.in b/init/bitlbee.service.in
index c89d52fd..0ea7aed6 100644
--- a/init/bitlbee.service.in
+++ b/init/bitlbee.service.in
@@ -1,6 +1,5 @@
[Unit]
Description=BitlBee IRC/IM gateway
-After=syslog.target
[Service]
ExecStart=@sbindir@bitlbee -F -n
diff --git a/init/bitlbee@.service.in b/init/bitlbee@.service.in
index 20698182..107c11ba 100644
--- a/init/bitlbee@.service.in
+++ b/init/bitlbee@.service.in
@@ -1,6 +1,5 @@
[Unit]
Description=BitlBee Per-Connection Server
-After=syslog.target
[Service]
ExecStart=@sbindir@bitlbee -I