diff -pruN 0.8.1-0.2/autom4te.cache/output.0 0.8.4-0ubuntu1/autom4te.cache/output.0
--- 0.8.1-0.2/autom4te.cache/output.0	2010-03-17 18:12:49.000000000 +0000
+++ 0.8.4-0ubuntu1/autom4te.cache/output.0	2010-12-08 03:22:24.000000000 +0000
@@ -1,12 +1,14 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.64 for Skype plugin for BitlBee 1.0.
+@%:@ Generated by GNU Autoconf 2.65 for Skype plugin for BitlBee 1.0.
 @%:@
 @%:@ Report bugs to <vmiklos@vmiklos.hu>.
 @%:@ 
+@%:@ 
 @%:@ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-@%:@ 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-@%:@ Foundation, Inc.
+@%:@ 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+@%:@ Inc.
+@%:@ 
 @%:@ 
 @%:@ This configure script is free software; the Free Software Foundation
 @%:@ gives unlimited permission to copy, distribute and modify it.
@@ -257,7 +259,7 @@ as_unset=as_fn_unset
 
 @%:@ as_fn_set_status STATUS
 @%:@ -----------------------
-@%:@ Set $? to STATUS, without forking.
+@%:@ Set @S|@? to STATUS, without forking.
 as_fn_set_status ()
 {
   return $1
@@ -275,7 +277,7 @@ as_fn_exit ()
 
 @%:@ as_fn_mkdir_p
 @%:@ -------------
-@%:@ Create "$as_dir" as a directory, including parents if necessary.
+@%:@ Create "@S|@as_dir" as a directory, including parents if necessary.
 as_fn_mkdir_p ()
 {
 
@@ -341,8 +343,8 @@ fi # as_fn_append
 @%:@ as_fn_arith ARG...
 @%:@ ------------------
 @%:@ Perform arithmetic evaluation on the ARGs, and store the result in the
-@%:@ global $as_val. Take advantage of shells that can avoid forks. The arguments
-@%:@ must be portable across $(()) and expr.
+@%:@ global @S|@as_val. Take advantage of shells that can avoid forks. The arguments
+@%:@ must be portable across @S|@(()) and expr.
 if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
   eval 'as_fn_arith ()
   {
@@ -360,7 +362,7 @@ fi # as_fn_arith
 @%:@ ---------------------------------
 @%:@ Output "`basename @S|@0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 @%:@ provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-@%:@ script with status $?, using 1 if that was 0.
+@%:@ script with status @S|@?, using 1 if that was 0.
 as_fn_error ()
 {
   as_status=$?; test $as_status -eq 0 && as_status=1
@@ -526,7 +528,8 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
 
 # Name of the host.
 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
@@ -556,6 +559,7 @@ PACKAGE_URL=''
 ac_subst_vars='LTLIBOBJS
 LIB@&t@OBJS
 SKYPE4PY
+ASCIIDOC
 BITLBEE
 SHARED_EXT
 SHARED_FLAGS
@@ -611,6 +615,7 @@ ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_debug
+enable_asciidoc
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1183,9 +1188,9 @@ Configuration:
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
+                          @<:@@S|@ac_default_prefix@:>@
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
+                          @<:@PREFIX@:>@
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1231,6 +1236,7 @@ Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-debug          Enable debug support (default: disabled)
+  --disable-asciidoc      Disable asciidoc support (default: test)
 
 Some influential environment variables:
   CC          C compiler command
@@ -1238,7 +1244,7 @@ Some influential environment variables:
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
   LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
 
 Use these variables to override the choices made by `configure' or to help
@@ -1308,7 +1314,7 @@ test -n "$ac_init_help" && exit $ac_stat
 if $ac_init_version; then
   cat <<\_ACEOF
 Skype plugin for BitlBee configure 1.0
-generated by GNU Autoconf 2.64
+generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
@@ -1323,7 +1329,7 @@ fi
 
 @%:@ ac_fn_c_try_compile LINENO
 @%:@ --------------------------
-@%:@ Try to compile conftest.$ac_ext, and return whether this succeeded.
+@%:@ Try to compile conftest.@S|@ac_ext, and return whether this succeeded.
 ac_fn_c_try_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
@@ -1355,7 +1361,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_retval=1
 fi
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
+  as_fn_set_status $ac_retval
 
 } @%:@ ac_fn_c_try_compile
 cat >config.log <<_ACEOF
@@ -1363,7 +1369,7 @@ This file contains any messages produced
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by Skype plugin for BitlBee $as_me 1.0, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
 
@@ -1616,7 +1622,7 @@ fi
 for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
   test "x$ac_site_file" = xNONE && continue
-  if test -r "$ac_site_file"; then
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
@@ -1625,9 +1631,9 @@ $as_echo "$as_me: loading site script $a
 done
 
 if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
@@ -2031,32 +2037,30 @@ $as_echo "$ac_try_echo"; } >&5
 ... rest of stderr output deleted ...
          10q' conftest.err >conftest.er1
     cat conftest.er1 >&5
-    rm -f conftest.er1 conftest.err
   fi
+  rm -f conftest.er1 conftest.err
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-@%:@include <stdio.h>
+
 int
 main ()
 {
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
 
   ;
   return 0;
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
@@ -2118,10 +2122,10 @@ test "$ac_cv_exeext" = no && ac_cv_exeex
 else
   ac_file=''
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
 if test -z "$ac_file"; then :
-  $as_echo "$as_me: failed program was:" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
@@ -2129,51 +2133,18 @@ $as_echo "$as_me: error: in \`$ac_pwd':"
 { as_fn_set_status 77
 as_fn_error "C compiler cannot create executables
 See \`config.log' for more details." "$LINENO" 5; }; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 $as_echo_n "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
@@ -2206,13 +2177,72 @@ $as_echo "$as_me: error: in \`$ac_pwd':"
 as_fn_error "cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." "$LINENO" 5; }
 fi
-rm -f conftest$ac_cv_exeext
+rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
 $as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+@%:@include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then :
@@ -2610,7 +2640,7 @@ $as_echo "no" >&6; }
 fi
 
 case "`$CC -dumpmachine`" in
-	*linux*|*freebsd*)
+	*linux*|*freebsd*|*netbsd*)
 		SHARED_FLAGS="-fPIC -shared"
 		SHARED_EXT="so"
 		;;
@@ -2654,9 +2684,54 @@ $as_echo "yes" >&6; }
 fi
 
 
+@%:@ Check whether --enable-asciidoc was given.
+if test "${enable_asciidoc+set}" = set; then :
+  enableval=$enable_asciidoc; 
+fi
+
+if test "$enable_asciidoc" != "no"; then
+	# Extract the first word of "asciidoc", so it can be a program name with args.
+set dummy asciidoc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ASCIIDOC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ASCIIDOC"; then
+  ac_cv_prog_ASCIIDOC="$ASCIIDOC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ASCIIDOC="yes"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ASCIIDOC=$ac_cv_prog_ASCIIDOC
+if test -n "$ASCIIDOC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ASCIIDOC" >&5
+$as_echo "$ASCIIDOC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python module Skype4Py" >&5
 $as_echo_n "checking for Python module Skype4Py... " >&6; }
-python -c "import Skype4Py" 2>&5
+python2.7 -c "import Skype4Py" 2>&5
 if test "$?" != "0"; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -2958,7 +3033,7 @@ export LANGUAGE
 @%:@ ---------------------------------
 @%:@ Output "`basename @S|@0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 @%:@ provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-@%:@ script with status $?, using 1 if that was 0.
+@%:@ script with status @S|@?, using 1 if that was 0.
 as_fn_error ()
 {
   as_status=$?; test $as_status -eq 0 && as_status=1
@@ -2973,7 +3048,7 @@ as_fn_error ()
 
 @%:@ as_fn_set_status STATUS
 @%:@ -----------------------
-@%:@ Set $? to STATUS, without forking.
+@%:@ Set @S|@? to STATUS, without forking.
 as_fn_set_status ()
 {
   return $1
@@ -3018,8 +3093,8 @@ fi # as_fn_append
 @%:@ as_fn_arith ARG...
 @%:@ ------------------
 @%:@ Perform arithmetic evaluation on the ARGs, and store the result in the
-@%:@ global $as_val. Take advantage of shells that can avoid forks. The arguments
-@%:@ must be portable across $(()) and expr.
+@%:@ global @S|@as_val. Take advantage of shells that can avoid forks. The arguments
+@%:@ must be portable across @S|@(()) and expr.
 if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
   eval 'as_fn_arith ()
   {
@@ -3121,7 +3196,7 @@ rmdir conf$$.dir 2>/dev/null
 
 @%:@ as_fn_mkdir_p
 @%:@ -------------
-@%:@ Create "$as_dir" as a directory, including parents if necessary.
+@%:@ Create "@S|@as_dir" as a directory, including parents if necessary.
 as_fn_mkdir_p ()
 {
 
@@ -3216,7 +3291,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
 # values after options handling.
 ac_log="
 This file was extended by Skype plugin for BitlBee $as_me 1.0, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -3251,6 +3326,7 @@ Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
   -q, --quiet, --silent
                    do not print progress messages
   -d, --debug      don't remove temporary files
@@ -3265,10 +3341,11 @@ Report bugs to <vmiklos@vmiklos.hu>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 Skype plugin for BitlBee config.status 1.0
-configured by $0, generated by GNU Autoconf 2.64,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.65,
+  with options \\"\$ac_cs_config\\"
 
 Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
@@ -3304,6 +3381,8 @@ do
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
     $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
@@ -3471,7 +3550,7 @@ s/'"$ac_delim"'$//
 t delim
 :nl
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more1
 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
 p
@@ -3485,7 +3564,7 @@ s/.\{148\}//
 t nl
 :delim
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more2
 s/["\\]/\\&/g; s/^/"/; s/$/"/
 p
@@ -4099,7 +4178,7 @@ export LANGUAGE
 @%:@ ---------------------------------
 @%:@ Output "`basename @S|@0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 @%:@ provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-@%:@ script with status $?, using 1 if that was 0.
+@%:@ script with status @S|@?, using 1 if that was 0.
 as_fn_error ()
 {
   as_status=$?; test $as_status -eq 0 && as_status=1
@@ -4114,7 +4193,7 @@ as_fn_error ()
 
 @%:@ as_fn_set_status STATUS
 @%:@ -----------------------
-@%:@ Set $? to STATUS, without forking.
+@%:@ Set @S|@? to STATUS, without forking.
 as_fn_set_status ()
 {
   return $1
@@ -4159,8 +4238,8 @@ fi # as_fn_append
 @%:@ as_fn_arith ARG...
 @%:@ ------------------
 @%:@ Perform arithmetic evaluation on the ARGs, and store the result in the
-@%:@ global $as_val. Take advantage of shells that can avoid forks. The arguments
-@%:@ must be portable across $(()) and expr.
+@%:@ global @S|@as_val. Take advantage of shells that can avoid forks. The arguments
+@%:@ must be portable across @S|@(()) and expr.
 if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
   eval 'as_fn_arith ()
   {
@@ -4262,7 +4341,7 @@ rmdir conf$$.dir 2>/dev/null
 
 @%:@ as_fn_mkdir_p
 @%:@ -------------
-@%:@ Create "$as_dir" as a directory, including parents if necessary.
+@%:@ Create "@S|@as_dir" as a directory, including parents if necessary.
 as_fn_mkdir_p ()
 {
 
@@ -4357,7 +4436,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
 # values after options handling.
 ac_log="
 This file was extended by Skype plugin for BitlBee $as_me 1.0, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -4392,6 +4471,7 @@ Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
   -q, --quiet, --silent
                    do not print progress messages
   -d, --debug      don't remove temporary files
@@ -4406,10 +4486,11 @@ Report bugs to <vmiklos@vmiklos.hu>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 Skype plugin for BitlBee config.status 1.0
-configured by $0, generated by GNU Autoconf 2.64,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.65,
+  with options \\"\$ac_cs_config\\"
 
 Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
@@ -4445,6 +4526,8 @@ do
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
     $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
@@ -4613,7 +4696,7 @@ s/'"$ac_delim"'$//
 t delim
 :nl
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more1
 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
 p
@@ -4627,7 +4710,7 @@ s/.\{148\}//
 t nl
 :delim
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more2
 s/["\\]/\\&/g; s/^/"/; s/$/"/
 p
diff -pruN 0.8.1-0.2/autom4te.cache/traces.0 0.8.4-0ubuntu1/autom4te.cache/traces.0
--- 0.8.1-0.2/autom4te.cache/traces.0	2010-03-17 18:12:49.000000000 +0000
+++ 0.8.4-0ubuntu1/autom4te.cache/traces.0	2010-12-08 03:22:24.000000000 +0000
@@ -201,47 +201,50 @@ m4trace:configure.ac:28: -1- m4_pattern_
 m4trace:configure.ac:55: -1- AC_SUBST([BITLBEE])
 m4trace:configure.ac:55: -1- AC_SUBST_TRACE([BITLBEE])
 m4trace:configure.ac:55: -1- m4_pattern_allow([^BITLBEE$])
-m4trace:configure.ac:67: -1- AC_SUBST([SKYPE4PY])
-m4trace:configure.ac:67: -1- AC_SUBST_TRACE([SKYPE4PY])
-m4trace:configure.ac:67: -1- m4_pattern_allow([^SKYPE4PY$])
-m4trace:configure.ac:70: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
-You should run autoupdate.], [../../lib/autoconf/oldnames.m4:55: AC_ERROR is expanded from...
-configure.ac:70: the top level])
-m4trace:configure.ac:73: -1- AC_CONFIG_FILES([config.mak])
-m4trace:configure.ac:73: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
+m4trace:configure.ac:60: -1- AC_SUBST([ASCIIDOC])
+m4trace:configure.ac:60: -1- AC_SUBST_TRACE([ASCIIDOC])
+m4trace:configure.ac:60: -1- m4_pattern_allow([^ASCIIDOC$])
+m4trace:configure.ac:73: -1- AC_SUBST([SKYPE4PY])
+m4trace:configure.ac:73: -1- AC_SUBST_TRACE([SKYPE4PY])
+m4trace:configure.ac:73: -1- m4_pattern_allow([^SKYPE4PY$])
+m4trace:configure.ac:76: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
+You should run autoupdate.], [../../lib/autoconf/oldnames.m4:34: AC_ERROR is expanded from...
+configure.ac:76: the top level])
+m4trace:configure.ac:79: -1- AC_CONFIG_FILES([config.mak])
+m4trace:configure.ac:79: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
 You should run autoupdate.], [])
-m4trace:configure.ac:73: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
-m4trace:configure.ac:73: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
-m4trace:configure.ac:73: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:73: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-m4trace:configure.ac:73: -1- AC_SUBST_TRACE([LTLIBOBJS])
-m4trace:configure.ac:73: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.ac:73: -1- AC_SUBST_TRACE([top_builddir])
-m4trace:configure.ac:73: -1- AC_SUBST_TRACE([top_build_prefix])
-m4trace:configure.ac:73: -1- AC_SUBST_TRACE([srcdir])
-m4trace:configure.ac:73: -1- AC_SUBST_TRACE([abs_srcdir])
-m4trace:configure.ac:73: -1- AC_SUBST_TRACE([top_srcdir])
-m4trace:configure.ac:73: -1- AC_SUBST_TRACE([abs_top_srcdir])
-m4trace:configure.ac:73: -1- AC_SUBST_TRACE([builddir])
-m4trace:configure.ac:73: -1- AC_SUBST_TRACE([abs_builddir])
-m4trace:configure.ac:73: -1- AC_SUBST_TRACE([abs_top_builddir])
-m4trace:configure.ac:73: -1- AC_SUBST_TRACE([INSTALL])
-m4trace:configure.ac:74: -1- AC_CONFIG_FILES([skyped.conf.dist])
-m4trace:configure.ac:74: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
+m4trace:configure.ac:79: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
+m4trace:configure.ac:79: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+m4trace:configure.ac:79: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:79: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+m4trace:configure.ac:79: -1- AC_SUBST_TRACE([LTLIBOBJS])
+m4trace:configure.ac:79: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.ac:79: -1- AC_SUBST_TRACE([top_builddir])
+m4trace:configure.ac:79: -1- AC_SUBST_TRACE([top_build_prefix])
+m4trace:configure.ac:79: -1- AC_SUBST_TRACE([srcdir])
+m4trace:configure.ac:79: -1- AC_SUBST_TRACE([abs_srcdir])
+m4trace:configure.ac:79: -1- AC_SUBST_TRACE([top_srcdir])
+m4trace:configure.ac:79: -1- AC_SUBST_TRACE([abs_top_srcdir])
+m4trace:configure.ac:79: -1- AC_SUBST_TRACE([builddir])
+m4trace:configure.ac:79: -1- AC_SUBST_TRACE([abs_builddir])
+m4trace:configure.ac:79: -1- AC_SUBST_TRACE([abs_top_builddir])
+m4trace:configure.ac:79: -1- AC_SUBST_TRACE([INSTALL])
+m4trace:configure.ac:80: -1- AC_CONFIG_FILES([skyped.conf.dist])
+m4trace:configure.ac:80: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
 You should run autoupdate.], [])
-m4trace:configure.ac:74: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
-m4trace:configure.ac:74: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
-m4trace:configure.ac:74: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:74: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-m4trace:configure.ac:74: -1- AC_SUBST_TRACE([LTLIBOBJS])
-m4trace:configure.ac:74: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.ac:74: -1- AC_SUBST_TRACE([top_builddir])
-m4trace:configure.ac:74: -1- AC_SUBST_TRACE([top_build_prefix])
-m4trace:configure.ac:74: -1- AC_SUBST_TRACE([srcdir])
-m4trace:configure.ac:74: -1- AC_SUBST_TRACE([abs_srcdir])
-m4trace:configure.ac:74: -1- AC_SUBST_TRACE([top_srcdir])
-m4trace:configure.ac:74: -1- AC_SUBST_TRACE([abs_top_srcdir])
-m4trace:configure.ac:74: -1- AC_SUBST_TRACE([builddir])
-m4trace:configure.ac:74: -1- AC_SUBST_TRACE([abs_builddir])
-m4trace:configure.ac:74: -1- AC_SUBST_TRACE([abs_top_builddir])
-m4trace:configure.ac:74: -1- AC_SUBST_TRACE([INSTALL])
+m4trace:configure.ac:80: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
+m4trace:configure.ac:80: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+m4trace:configure.ac:80: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:80: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+m4trace:configure.ac:80: -1- AC_SUBST_TRACE([LTLIBOBJS])
+m4trace:configure.ac:80: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.ac:80: -1- AC_SUBST_TRACE([top_builddir])
+m4trace:configure.ac:80: -1- AC_SUBST_TRACE([top_build_prefix])
+m4trace:configure.ac:80: -1- AC_SUBST_TRACE([srcdir])
+m4trace:configure.ac:80: -1- AC_SUBST_TRACE([abs_srcdir])
+m4trace:configure.ac:80: -1- AC_SUBST_TRACE([top_srcdir])
+m4trace:configure.ac:80: -1- AC_SUBST_TRACE([abs_top_srcdir])
+m4trace:configure.ac:80: -1- AC_SUBST_TRACE([builddir])
+m4trace:configure.ac:80: -1- AC_SUBST_TRACE([abs_builddir])
+m4trace:configure.ac:80: -1- AC_SUBST_TRACE([abs_top_builddir])
+m4trace:configure.ac:80: -1- AC_SUBST_TRACE([INSTALL])
diff -pruN 0.8.1-0.2/Changelog 0.8.4-0ubuntu1/Changelog
--- 0.8.1-0.2/Changelog	2010-03-17 18:12:48.000000000 +0000
+++ 0.8.4-0ubuntu1/Changelog	2010-12-08 03:22:24.000000000 +0000
@@ -1,3 +1,302 @@
+commit 62d0e459762bd9a3a4ab26258ed2b32c755a5fe3 (tags/0.8.4)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Wed Dec 8 04:13:13 2010 +0100
+
+    updates for 0.8.4
+
+commit 9ef788a43e1b6a4fa0c7884810fee28dc37088e9 (tags/0.8.4~1)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Wed Dec 8 04:21:34 2010 +0100
+
+    silence -Wunused-parameter warnings
+
+commit 801291d852c9b118e0b1ea47123031e0d821d358 (tags/0.8.4~2)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Wed Dec 8 04:05:27 2010 +0100
+
+    t: cleanup
+
+commit c22afc9ca7b6b1856ae6df88cbcb41724be8c6f2 (tags/0.8.4~4)
+Author: Carlo Wood <carlo@alinoe.com>
+Date:   Tue Dec 7 04:17:15 2010 +0100
+
+    Do not crash when failing to connect to skyped
+    
+    Hi,
+    
+    when the skype plugin fails to connect to skyped,
+    it crashes.  Not crashing is nicer, because that
+    results in an neat error message that connecting
+    to the server failed (and subsequent retries).
+    
+    The attached patch fixes this crash.
+
+commit 2eaa7e4e44cfacb650c6f26f917cbc5c76c218e3 (tags/0.8.4~3^2)
+Author: Philippe Crama <pcfeb0009@gmx.com>
+Date:   Sun Dec 5 21:44:19 2010 +0100
+
+    Minor modifications to make it compile/run under NetBSD/pkgsrc
+
+commit 9d8b0b030445d040ce7dc697fef66b97b04cf0ae (tags/0.8.4~5)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Mon Nov 29 23:40:54 2010 +0100
+
+    configure: use python2.7
+
+commit d9ba476a131dc1a584547461e3368a94cf77d5f6 (tags/0.8.4~6)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Wed Nov 17 12:29:33 2010 +0100
+
+    update README for bitlbee-3.0
+
+commit 1a034f59ea76ed1fca25c9e7c474e220cda7e6dd (tags/0.8.4~7)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Mon Oct 25 01:14:27 2010 +0200
+
+    skyped: change it to python2.7 just in case python would be python3k already
+
+commit 51840ca281090d32c5032ae56cd42641d425c832 (tags/0.8.4~8)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Wed Aug 18 14:52:15 2010 +0200
+
+    typo
+
+commit 089803f1ab5f6fdf25a66475373b443e1940f6d3 (tags/0.8.4~9)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Wed Aug 18 14:47:04 2010 +0200
+
+    add tip on how to avoid generating ssl certs
+    
+    can be useful for openssl-1.0 users where i don't know what cmdline to
+    suggest atm
+
+commit b51b2adb87c5b62a6cd8cc4622b36fd9994b5f54 (tags/0.8.4~10)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Tue Aug 10 02:05:30 2010 +0200
+
+    merge skyped default config patch from Debian
+
+commit 52d73045c799757be4bef02cca5471e3d1a1c347 (tags/0.8.4~11)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Tue Aug 10 02:03:52 2010 +0200
+
+    merge autogen cleanup patch from Debian
+
+commit 9f6077dbdbd6647c96d3e887c0c278b22c58d7b4 (tags/0.8.4~12)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Tue Aug 3 15:42:15 2010 +0200
+
+    t/livetest-bitlbee: redirect bitlbee's stderr to a logfile, not useful to see that as long as it works
+
+commit 6769d3558c9487b34c30882efa10718f723e77f2 (tags/0.8.3)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Tue Aug 3 14:39:52 2010 +0200
+
+    build for <1.3
+
+commit 17dd11f101a8b6520c795c9d9bbe41e90309f55b (tags/0.8.3~1)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Tue Aug 3 14:31:18 2010 +0200
+
+    updates for 0.8.3
+
+commit 548665b58a7630a63ad2324b0db068adb2ba6199 (tags/0.8.3~2)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Tue Aug 3 14:30:04 2010 +0200
+
+    checkpatch fix
+
+commit 6a83d180038e8d4b574edce52f1565cb66dffc91 (tags/0.8.3~3)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Tue Aug 3 13:57:48 2010 +0200
+
+    fix up testcases for ui-fix
+
+commit 942abafb3e25dcc77ded29249c1b1650ebd38c25 (tags/0.8.3~4)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Tue Aug 3 13:57:08 2010 +0200
+
+    tests: don't generate new certs all the time if not needed
+    
+    this is a hack, looks like openssl-1.0 generates something which is not
+    compatible with python-gnutls, let's reuse what we have for now
+
+commit 2de4694294b6b4f03d8a3b047bd3b45c987e3522 (tags/0.8.3~5)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Tue Aug 3 13:13:55 2010 +0200
+
+    remove #if BITLBEE_VERSION_CODE >= BITLBEE_VER(1, 2, 6)
+    
+    that's always true as such macro did not exist before
+
+commit 8c1dc50db5d11d824137442e2d40bcd43a94c1c6 (tags/0.8.3~6)
+Author: Wilmer van der Gaast <wilmer@gaast.net>
+Date:   Tue Aug 3 13:12:59 2010 +0200
+
+    BitlBee 1.3.0 compatibility patch
+
+commit b95843b4b24ecc2ef9a7ec232398cfc39e450f4c (tags/0.8.3~7)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Mon Aug 2 23:54:24 2010 +0200
+
+    update skype api link
+
+commit 1c37b895c431752c340c70fb794a80747a5dff70 (tags/0.8.3~8)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Fri Jun 25 20:39:23 2010 +0200
+
+    Typo fix: --debug was --daemon
+    
+    From: Arthaey Angosii <arthaey@gmail.com>
+
+commit 6680e5d846bd1ee04d101f9063b3c51261fc7b9f (tags/0.8.3~9)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Sat May 29 15:38:55 2010 +0200
+
+    doc: 1.2.6 has this BITLBEE_VERSION_CODE macro
+    
+    so hopefully we can stay compatible with it for a long time
+
+commit 2b48fb5a040f9c79980b88035333274f49a3ea19 (tags/0.8.3~10)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Sat May 29 15:36:12 2010 +0200
+
+    update bitlbee version
+
+commit c88723878834d3e00244ec771de05fdde8a49909 (tags/0.8.3~11)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Tue Apr 20 00:40:58 2010 +0200
+
+    cosmetics
+
+commit 8d21824d47bbbf4d6af1d31806e680e4e956f9ee (tags/0.8.3~12)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Tue Apr 20 00:27:19 2010 +0200
+
+    doc update, stop recommending 0.5.1
+
+commit b2a64ebe18fa560165cd79f984d5710681f2974d (tags/0.8.3~13)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Tue Apr 20 00:25:33 2010 +0200
+
+    update for 1.2.6
+    
+    also a bit of cleanup. you can still build for 1.2.5 using
+    
+    '-DBITLBEE_VER(a,b,c)'='(((a) << 16) + ((b) << 8) + (c))'
+    
+    if you really want, though.
+
+commit 075acd900533d78ae3f3001f8572e4ec116218ac (tags/0.8.3~14)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Sun Apr 18 04:43:47 2010 +0200
+
+    copyright
+
+commit 32fcf1473ed14a55393c89035f990420f16ef0b6 (tags/0.8.2)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Wed Apr 14 02:20:14 2010 +0200
+
+    fix for 1.2.5
+
+commit 4917d48ba9fcac3d80fbe68b065d2c81971fafd5 (tags/0.8.2~1)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Wed Apr 14 02:16:04 2010 +0200
+
+    updates for 0.8.2
+
+commit 7d8622bb9c7a9279d99fb2ff51fe58c3260d4ac1 (tags/0.8.2~2)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Wed Apr 14 01:58:36 2010 +0200
+
+    include mood text in whois output as well
+
+commit e522066e363c7d91d09f88fb60d5fabdef2d93ea (tags/0.8.2~3)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Wed Apr 14 01:26:02 2010 +0200
+
+    add new setting to show mood texts
+
+commit 6880d1fe7288faf51917e4e4df6b88574d0e38e6 (tags/0.8.2~4)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Wed Apr 14 00:55:42 2010 +0200
+
+    use imcb_chat_name_hint() if it's available
+
+commit 538025c1e85d9790ec322bde7fa8e8c28d438788 (tags/0.8.2~5)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Mon Apr 12 17:09:49 2010 +0200
+
+    skyped: use os.path.expanduser for file paths in config
+    
+    Requested-by: ilf <ilf@gmx.net>
+
+commit bf28b98b0a0173bce220bd57127229b5519cb9dd (tags/0.8.2~6)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Mon Apr 12 17:27:35 2010 +0200
+
+    use fake user/pass
+    
+    the only problem that can happen this case is that we can talk to
+    ourselves, but that's not a big problem.
+
+commit 03b6a42161caa02bb1f2735eb1e915db7848964b (tags/0.8.2~7)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Mon Apr 12 17:27:14 2010 +0200
+
+    tests: use the echo123 test account instead of an external one
+    
+    now that we have a config option allowing to do so, make use of it, it's
+    more reliable
+
+commit 9268ef6f560dda076778031b4bf1f42872429a2b (tags/0.8.2~8)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Wed Apr 7 19:26:39 2010 +0200
+
+    Revert "checkpatch fixes"
+    
+    This reverts commit a65ec8c459813c84ed9ca57872b0df9add83a049 (tags/0.8.2~14).
+    
+    17:35 < macmaN> vmiklos: im getting all my groupchat messages as private querys now
+    17:35 < macmaN> the other direction works
+    18:48 < macmaN> vmiklos: i've verified it, i went back before that commit and group chats work again
+
+commit cda5ffbad11650d9ed794e56b693fef45fe45224 (tags/0.8.2~9)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Wed Apr 7 12:53:24 2010 +0200
+
+    clean: remove the manpage as well
+
+commit 57968277eee307ed7ded98ab7696ba481b9266b4 (tags/0.8.2~10)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Tue Apr 6 17:37:34 2010 +0200
+
+    install the manpage
+
+commit a52f5cde75b7bfb22d0b43ad0a399bf9dbdc1f1c (tags/0.8.2~11)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Tue Apr 6 00:55:07 2010 +0200
+
+    add test_join setting
+
+commit a3308353cdf40302f524b8167aa084a8ef91a2c2 (tags/0.8.2~12)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Mon Apr 5 23:44:58 2010 +0200
+
+    Debian: s/experimental/unstable/g
+
+commit 74107a1f6032df00d341e49831d4821e37f86d0e (tags/0.8.2~13)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Mon Apr 5 23:25:07 2010 +0200
+
+    make building documentation optional
+
+commit a65ec8c459813c84ed9ca57872b0df9add83a049 (tags/0.8.2~14)
+Author: Miklos Vajna <vmiklos@frugalware.org>
+Date:   Fri Mar 19 17:44:46 2010 +0100
+
+    checkpatch fixes
+
 commit f666b9a26f6132400ccaacd8c2f7c6e66a27331b (tags/0.8.1)
 Author: Miklos Vajna <vmiklos@frugalware.org>
 Date:   Wed Mar 17 19:12:30 2010 +0100
diff -pruN 0.8.1-0.2/config.mak.in 0.8.4-0ubuntu1/config.mak.in
--- 0.8.1-0.2/config.mak.in	2010-03-17 18:12:30.000000000 +0000
+++ 0.8.4-0ubuntu1/config.mak.in	2010-12-08 03:22:05.000000000 +0000
@@ -4,6 +4,7 @@ SHARED_FLAGS = @SHARED_FLAGS@
 SHARED_EXT = @SHARED_EXT@
 SKYPE4PY = @SKYPE4PY@
 BITLBEE = @BITLBEE@
+ASCIIDOC = @ASCIIDOC@
 INSTALL = @INSTALL@
 prefix = @prefix@
 sysconfdir = @sysconfdir@/skyped
@@ -11,3 +12,5 @@ exec_prefix = @exec_prefix@
 bindir = @bindir@
 libdir = @libdir@
 plugindir = ${libdir}/bitlbee
+datarootdir = @datarootdir@
+mandir = @mandir@
diff -pruN 0.8.1-0.2/configure 0.8.4-0ubuntu1/configure
--- 0.8.1-0.2/configure	2010-03-17 18:12:49.000000000 +0000
+++ 0.8.4-0ubuntu1/configure	2010-12-08 03:22:25.000000000 +0000
@@ -1,12 +1,14 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for Skype plugin for BitlBee 1.0.
+# Generated by GNU Autoconf 2.65 for Skype plugin for BitlBee 1.0.
 #
 # Report bugs to <vmiklos@vmiklos.hu>.
 #
+#
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-# Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+#
 #
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
@@ -526,7 +528,8 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
 
 # Name of the host.
 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
@@ -556,6 +559,7 @@ PACKAGE_URL=''
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
 SKYPE4PY
+ASCIIDOC
 BITLBEE
 SHARED_EXT
 SHARED_FLAGS
@@ -611,6 +615,7 @@ ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_debug
+enable_asciidoc
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1231,6 +1236,7 @@ Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-debug          Enable debug support (default: disabled)
+  --disable-asciidoc      Disable asciidoc support (default: test)
 
 Some influential environment variables:
   CC          C compiler command
@@ -1238,7 +1244,7 @@ Some influential environment variables:
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
   LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
 
 Use these variables to override the choices made by `configure' or to help
@@ -1308,7 +1314,7 @@ test -n "$ac_init_help" && exit $ac_stat
 if $ac_init_version; then
   cat <<\_ACEOF
 Skype plugin for BitlBee configure 1.0
-generated by GNU Autoconf 2.64
+generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
@@ -1355,7 +1361,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_retval=1
 fi
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
+  as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
 cat >config.log <<_ACEOF
@@ -1363,7 +1369,7 @@ This file contains any messages produced
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by Skype plugin for BitlBee $as_me 1.0, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
 
@@ -1616,7 +1622,7 @@ fi
 for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
   test "x$ac_site_file" = xNONE && continue
-  if test -r "$ac_site_file"; then
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
@@ -1625,9 +1631,9 @@ $as_echo "$as_me: loading site script $a
 done
 
 if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
@@ -2031,32 +2037,30 @@ $as_echo "$ac_try_echo"; } >&5
 ... rest of stderr output deleted ...
          10q' conftest.err >conftest.er1
     cat conftest.er1 >&5
-    rm -f conftest.er1 conftest.err
   fi
+  rm -f conftest.er1 conftest.err
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+
 int
 main ()
 {
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
 
   ;
   return 0;
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
@@ -2118,10 +2122,10 @@ test "$ac_cv_exeext" = no && ac_cv_exeex
 else
   ac_file=''
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
 if test -z "$ac_file"; then :
-  $as_echo "$as_me: failed program was:" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
@@ -2129,51 +2133,18 @@ $as_echo "$as_me: error: in \`$ac_pwd':"
 { as_fn_set_status 77
 as_fn_error "C compiler cannot create executables
 See \`config.log' for more details." "$LINENO" 5; }; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 $as_echo_n "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
@@ -2206,13 +2177,72 @@ $as_echo "$as_me: error: in \`$ac_pwd':"
 as_fn_error "cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." "$LINENO" 5; }
 fi
-rm -f conftest$ac_cv_exeext
+rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
 $as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then :
@@ -2610,7 +2640,7 @@ $as_echo "no" >&6; }
 fi
 
 case "`$CC -dumpmachine`" in
-	*linux*|*freebsd*)
+	*linux*|*freebsd*|*netbsd*)
 		SHARED_FLAGS="-fPIC -shared"
 		SHARED_EXT="so"
 		;;
@@ -2654,9 +2684,54 @@ $as_echo "yes" >&6; }
 fi
 
 
+# Check whether --enable-asciidoc was given.
+if test "${enable_asciidoc+set}" = set; then :
+  enableval=$enable_asciidoc;
+fi
+
+if test "$enable_asciidoc" != "no"; then
+	# Extract the first word of "asciidoc", so it can be a program name with args.
+set dummy asciidoc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ASCIIDOC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ASCIIDOC"; then
+  ac_cv_prog_ASCIIDOC="$ASCIIDOC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ASCIIDOC="yes"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ASCIIDOC=$ac_cv_prog_ASCIIDOC
+if test -n "$ASCIIDOC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ASCIIDOC" >&5
+$as_echo "$ASCIIDOC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python module Skype4Py" >&5
 $as_echo_n "checking for Python module Skype4Py... " >&6; }
-python -c "import Skype4Py" 2>&5
+python2.7 -c "import Skype4Py" 2>&5
 if test "$?" != "0"; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -3216,7 +3291,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
 # values after options handling.
 ac_log="
 This file was extended by Skype plugin for BitlBee $as_me 1.0, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -3251,6 +3326,7 @@ Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
   -q, --quiet, --silent
                    do not print progress messages
   -d, --debug      don't remove temporary files
@@ -3265,10 +3341,11 @@ Report bugs to <vmiklos@vmiklos.hu>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 Skype plugin for BitlBee config.status 1.0
-configured by $0, generated by GNU Autoconf 2.64,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.65,
+  with options \\"\$ac_cs_config\\"
 
 Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
@@ -3304,6 +3381,8 @@ do
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
     $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
@@ -3471,7 +3550,7 @@ s/'"$ac_delim"'$//
 t delim
 :nl
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more1
 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
 p
@@ -3485,7 +3564,7 @@ s/.\{148\}//
 t nl
 :delim
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more2
 s/["\\]/\\&/g; s/^/"/; s/$/"/
 p
@@ -4357,7 +4436,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
 # values after options handling.
 ac_log="
 This file was extended by Skype plugin for BitlBee $as_me 1.0, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -4392,6 +4471,7 @@ Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
   -q, --quiet, --silent
                    do not print progress messages
   -d, --debug      don't remove temporary files
@@ -4406,10 +4486,11 @@ Report bugs to <vmiklos@vmiklos.hu>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 Skype plugin for BitlBee config.status 1.0
-configured by $0, generated by GNU Autoconf 2.64,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.65,
+  with options \\"\$ac_cs_config\\"
 
 Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
@@ -4445,6 +4526,8 @@ do
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
     $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
@@ -4613,7 +4696,7 @@ s/'"$ac_delim"'$//
 t delim
 :nl
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more1
 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
 p
@@ -4627,7 +4710,7 @@ s/.\{148\}//
 t nl
 :delim
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more2
 s/["\\]/\\&/g; s/^/"/; s/$/"/
 p
diff -pruN 0.8.1-0.2/configure.ac 0.8.4-0ubuntu1/configure.ac
--- 0.8.1-0.2/configure.ac	2010-03-17 18:12:30.000000000 +0000
+++ 0.8.4-0ubuntu1/configure.ac	2010-12-08 03:22:05.000000000 +0000
@@ -12,7 +12,7 @@ else
 fi
 
 case "`$CC -dumpmachine`" in
-	*linux*|*freebsd*)
+	*linux*|*freebsd*|*netbsd*)
 		SHARED_FLAGS="-fPIC -shared"
 		SHARED_EXT="so"
 		;;
@@ -54,9 +54,15 @@ else
 fi
 AC_SUBST(BITLBEE)
 
+dnl Check for a2x
+AC_ARG_ENABLE([asciidoc], AS_HELP_STRING([--disable-asciidoc], [Disable asciidoc support (default: test)]))
+if test "$enable_asciidoc" != "no"; then
+	AC_CHECK_PROG(ASCIIDOC, asciidoc, yes, [])
+fi
+
 dnl Check for Skype4Py
 AC_MSG_CHECKING(for Python module Skype4Py)
-python -c "import Skype4Py" 2>&AS_MESSAGE_LOG_FD
+python2.7 -c "import Skype4Py" 2>&AS_MESSAGE_LOG_FD
 if test "$?" != "0"; then
 	AC_MSG_RESULT(no)
 	SKYPE4PY="no"
diff -pruN 0.8.1-0.2/debian/changelog 0.8.4-0ubuntu1/debian/changelog
--- 0.8.1-0.2/debian/changelog	2010-12-16 22:05:07.000000000 +0000
+++ 0.8.4-0ubuntu1/debian/changelog	2010-12-16 21:58:27.000000000 +0000
@@ -1,3 +1,13 @@
+bitlbee-skype (0.8.4-0ubuntu1) natty; urgency=low
+
+  * New upstream release
+    + Supports bitlbee 3.0
+  * Added debian/watch
+  * Removed 01-config-files.patch as it got applied upstream.
+  * Added python2.7.diff to use python instead of python2.7
+
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.org>  Thu, 16 Dec 2010 20:02:19 +0200
+
 bitlbee-skype (0.8.1-0.2) unstable; urgency=low
 
   * Non-maintainer upload.
diff -pruN 0.8.1-0.2/debian/patches/01-config-files.patch 0.8.4-0ubuntu1/debian/patches/01-config-files.patch
--- 0.8.1-0.2/debian/patches/01-config-files.patch	2010-12-16 22:05:07.000000000 +0000
+++ 0.8.4-0ubuntu1/debian/patches/01-config-files.patch	1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' bitlbee-skype-0.7.1/skyped.conf.dist.in bitlbee-skype-0.7.1.new/skyped.conf.dist.in
---- bitlbee-skype-0.7.1/skyped.conf.dist.in	2009-02-13 14:39:38.000000000 -0800
-+++ bitlbee-skype-0.7.1.new/skyped.conf.dist.in	2009-04-02 12:25:33.000000000 -0700
-@@ -1,7 +1,10 @@
- [skyped]
-+# change to your skype username
- username = john
- # use `echo -n foo|sha1sum` to generate this hash for your password
- password = 0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33
--cert = @sysconfdir@/skyped/skyped.cert.pem
--key  = @sysconfdir@/skyped/skyped.key.pem
-+
-+# you have to change the following paths to your home directory:
-+cert = /home/YOUR_USER/.skyped/skyped.cert.pem
-+key  = /home/YOUR_USER/.skyped/skyped.key.pem
- port = 2727
diff -pruN 0.8.1-0.2/debian/patches/python2.7.diff 0.8.4-0ubuntu1/debian/patches/python2.7.diff
--- 0.8.1-0.2/debian/patches/python2.7.diff	1970-01-01 01:00:00.000000000 +0100
+++ 0.8.4-0ubuntu1/debian/patches/python2.7.diff	2010-12-16 21:58:27.000000000 +0000
@@ -0,0 +1,21 @@
+Description: Use python instead of python2.7
+Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.org>
+--- a/configure
++++ b/configure
+@@ -2731,7 +2731,7 @@
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python module Skype4Py" >&5
+ $as_echo_n "checking for Python module Skype4Py... " >&6; }
+-python2.7 -c "import Skype4Py" 2>&5
++python -c "import Skype4Py" 2>&5
+ if test "$?" != "0"; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+--- a/skyped.py
++++ b/skyped.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python2.7
++#!/usr/bin/env python
+ # 
+ #   skyped.py
+ #  
diff -pruN 0.8.1-0.2/debian/watch 0.8.4-0ubuntu1/debian/watch
--- 0.8.1-0.2/debian/watch	1970-01-01 01:00:00.000000000 +0100
+++ 0.8.4-0ubuntu1/debian/watch	2010-12-16 21:58:27.000000000 +0000
@@ -0,0 +1,2 @@
+version=3
+http://vmiklos.hu/project/bitlbee-skype/bitlbee-skype-(.*).tar.gz
diff -pruN 0.8.1-0.2/Makefile 0.8.4-0ubuntu1/Makefile
--- 0.8.1-0.2/Makefile	2010-12-16 22:05:07.000000000 +0000
+++ 0.8.4-0ubuntu1/Makefile	2010-12-08 03:22:05.000000000 +0000
@@ -1,22 +1,34 @@
 -include config.mak
 
-VERSION = 0.8.1
+VERSION = 0.8.4
 DATE := $(shell date +%Y-%m-%d)
 # latest stable
-BITLBEE_VERSION = 1.2.5
+BITLBEE_VERSION = 3.0.1
+
+ifeq ($(ASCIIDOC),yes)
+MANPAGES = skyped.1
+else
+MANPAGES =
+endif
 
 ifeq ($(BITLBEE),yes)
-all: skype.$(SHARED_EXT) skyped.1
+LIBS = skype.$(SHARED_EXT)
 else
-all: skyped.1
+LIBS =
 endif
 
+all: $(LIBS) $(MANPAGES)
+
 skype.$(SHARED_EXT): skype.c config.mak
 ifeq ($(BITLBEE),yes)
 	$(CC) $(CFLAGS) $(SHARED_FLAGS) -o skype.$(SHARED_EXT) skype.c $(LDFLAGS)
 endif
 
 install: all
+ifeq ($(ASCIIDOC),yes)
+	$(INSTALL) -d $(DESTDIR)$(mandir)/man1
+	$(INSTALL) -m644 $(MANPAGES) $(DESTDIR)$(mandir)/man1
+endif
 ifeq ($(BITLBEE),yes)
 	$(INSTALL) -d $(DESTDIR)$(plugindir)
 	$(INSTALL) skype.$(SHARED_EXT) $(DESTDIR)$(plugindir)
@@ -38,7 +50,7 @@ autogen: configure.ac
 	autoconf
 
 clean:
-	rm -f skype.$(SHARED_EXT)
+	rm -f $(LIBS) $(MANPAGES)
 
 distclean: clean
 	rm -f config.log config.mak config.status
@@ -67,7 +79,7 @@ release:
 doc: HEADER.html Changelog
 
 HEADER.html: README Makefile
-	asciidoc -a toc -a numbered -a sectids -o HEADER.html README
+	asciidoc -a toc -a numbered -a sectids -o HEADER.html -a icons -a data-uri --attribute iconsdir=./images/icons README
 	sed -i 's|@VERSION@|$(VERSION)|g' HEADER.html
 	sed -i 's|@BITLBEE_VERSION@|$(BITLBEE_VERSION)|g' HEADER.html
 
diff -pruN 0.8.1-0.2/NEWS 0.8.4-0ubuntu1/NEWS
--- 0.8.1-0.2/NEWS	2010-03-17 18:12:30.000000000 +0000
+++ 0.8.4-0ubuntu1/NEWS	2010-12-08 03:22:05.000000000 +0000
@@ -1,5 +1,17 @@
 VERSION         DESCRIPTION
 -----------------------------------------------------------------------------
+0.8.4         - now using python2.7 directly in case python would point to python3k
+              - merge patch to avoid a crash when failing to connect to skyped
+              - merge support for building the plugin on NetBSD
+              - merge Debian patches
+0.8.3         - support for BitlBee 1.3dev
+              - fixed --debug switch (-d was fine)
+              - documentation fixes
+0.8.2         - building documentation is now optional
+              - new settings: test_join and show_moods
+              - '~' in skyped.conf is now expanded to the user's home directory
+	      - groupchat channel names are now persistent (requires
+	        BitlBee-1.2.6)
 0.8.1         - support for BitlBee 1.2.5
               - support for Skype 2.1.0.81 and Skype4Py 1.0.32.0
               - the plugin part now supports FreeBSD
diff -pruN 0.8.1-0.2/README 0.8.4-0ubuntu1/README
--- 0.8.1-0.2/README	2010-03-17 18:12:30.000000000 +0000
+++ 0.8.4-0ubuntu1/README	2010-12-08 03:22:05.000000000 +0000
@@ -31,8 +31,9 @@ not..)
 == Requirements
 
 * Skype >= 1.4.0.99. The latest version I've tested is 2.1.0.81.
-* BitlBee >= @BITLBEE_VERSION@. Use old versions (0.5.1 or earlier) if
-  you have older BitlBee installed.
+* BitlBee >= 1.2.6. The lastest version I've tested is @BITLBEE_VERSION@. Use
+  old versions (see the NEWS file about which one) if you have older BitlBee
+  installed.
 * Skype4Py >= 0.9.28.7. Previous versions won't work due to API changes.
   The latest version I've tested is 1.0.32.0.
 
@@ -72,7 +73,7 @@ or
 # apt-get install skyped bitlbee-plugin-skype
 ----
 
-(the later from the experimental repo)
+(the later from the unstable repo)
 
 and you don't have to compile anything manually.
 
@@ -184,6 +185,11 @@ if you used the `--sysconfdir` switch wh
 NOTE: Maybe you want to adjust the permissions in the `~/.skyped`
 dir. For example make it readable by just your user.
 
+TIP: In case you have difficulties generating `skyped.cert.pem` /
+`skyped.key.pem` and you just want to experiment, you can copy&paste the
+contents of those files from
+http://code.google.com/p/gdata-python-client/source/browse/src/gdata/oauth/rsa.py#87[here].
+
 - If both pyopenssl and python-gnutls are available, then python-gnutls
   will be used. This behaviour can be overwritten by:
 
@@ -201,7 +207,7 @@ $ skyped
 
 ----
 account add skype <user> <pass>
-account set skype/server localhost
+account skype set server localhost
 ----
 
 <user> should be your Skype account name, <pass> should be the one you declared
@@ -211,20 +217,20 @@ in `skyped.conf`. If you want to run sky
 If you are running skyped on a custom port:
 
 ----
-account set skype/port <port>
+account skype set port <port>
 ----
 
 If you want to set your full name (optional):
 
 ----
-account set skype/display_name "John Smith"
+account skype set display_name "John Smith"
 ----
 
 If you want to see your skypeout contacts online as well (they are
 offline by default):
 
 ----
-account set skype/skypeout_offline false
+account skype set skypeout_offline false
 ----
 
 == Setting up Skype in a VNC server (optional)
@@ -332,36 +338,44 @@ $ skyped -n -d
 - Managing outgoing calls (with call duration at the end, including
   SkypeOut calls if you use a phone number instead of a nick):
 
-  * `account set skype/call nick`
-  * `account set -del skype/call`
+  * `account skype set call nick`
+  * `account skype set -del skype/call`
 
 - Managing incoming calls via questions, just like when you add / remove
   contacts.
 
 - Querying the current SkypeOut balance:
 
-  * `account set skype/balance query`
+  * `account skype set balance query`
 
 - For debug purposes, it's possible to send any command to `skyped`. To
   achieve this, you need to:
 
-  * `account set skype/skypeconsole true`
+  * `account skype set skypeconsole true`
 
   * then writing `skypeconsole: <command>` will work in the control
     channel.
 
-  * `account set skype/skypeconsole_receive true` will make the
+  * `account skype set skypeconsole_receive true` will make the
     `skypeconsole` account dump all the recieved raw traffic for you
 
 - If you want to automatically join bookmarked groupchats right after
   you logged in, do:
 
-  * `account set skype/auto_join true`
+  * `account skype set auto_join true`
 
 - Edited messages are shown with the `EDIT:` prefix. If you don't like
   this, you can set your own prefix using:
 
-  * `account set skype/edit_prefix "updated message:"`
+  * `account skype set edit_prefix "updated message:"`
+
+- The `echo123` test account is hidden by default. If you want to see it:
+
+  * `account skype set test_join true`
+
+- Mood texts are not shown by default. If you want to see it:
+
+  * `account skype set show_moods true`
 
 == What needs to be done (aka. TODO)
 
@@ -402,7 +416,8 @@ You can reach the Changelog link:Changel
 http://vmiklos.hu/gitweb/?p=bitlbee-skype.git[here].
 
 The Skype API documentation is
-https://developer.skype.com/Docs/ApiDoc[here] if you're interested.
+http://developer.skype.com/resources/public_api_ref.zip[here] if you're
+interested.
 
 
 == Testimonials
diff -pruN 0.8.1-0.2/skype.c 0.8.4-0ubuntu1/skype.c
--- 0.8.1-0.2/skype.c	2010-03-17 18:12:30.000000000 +0000
+++ 0.8.4-0ubuntu1/skype.c	2010-12-08 03:22:05.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  *  skype.c - Skype plugin for BitlBee
  *
- *  Copyright (c) 2007, 2008, 2009 by Miklos Vajna <vmiklos@frugalware.org>
+ *  Copyright (c) 2007, 2008, 2009, 2010 by Miklos Vajna <vmiklos@frugalware.org>
  *
  *  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
@@ -23,7 +23,7 @@
 #define _BSD_SOURCE
 #include <poll.h>
 #include <bitlbee.h>
-#include <bitlbee/ssl_client.h>
+#include <ssl_client.h>
 
 #define SKYPE_DEFAULT_SERVER "localhost"
 #define SKYPE_DEFAULT_PORT "2727"
@@ -31,6 +31,13 @@
 #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
 
 /*
+ * Compatibility with BitlBee 1.3+
+ */
+#if BITLBEE_VERSION_CODE < BITLBEE_VER(1, 3, 0)
+#define B_EV_IO_READ GAIM_INPUT_READ
+#endif
+
+/*
  * Enumerations
  */
 
@@ -144,6 +151,9 @@ int skype_write(struct im_connection *ic
 	struct skype_data *sd = ic->proto_data;
 	struct pollfd pfd[1];
 
+	if (!sd->ssl)
+		return FALSE;
+
 	pfd[0].fd = sd->fd;
 	pfd[0].events = POLLOUT;
 
@@ -234,6 +244,7 @@ void skype_call_ask(struct im_connection
 }
 struct groupchat *skype_chat_by_name(struct im_connection *ic, char *name)
 {
+#if BITLBEE_VERSION_CODE < BITLBEE_VER(1, 3, 0)
 	struct groupchat *ret;
 
 	for (ret = ic->groupchats; ret; ret = ret->next)
@@ -241,6 +252,9 @@ struct groupchat *skype_chat_by_name(str
 			break;
 
 	return ret;
+#else
+	return bee_chat_by_title(ic->bee, ic, name);
+#endif
 }
 
 static char *skype_call_strerror(int err)
@@ -299,9 +313,12 @@ static void skype_parse_user(struct im_c
 		return;
 	*ptr = '\0';
 	ptr++;
-	if (!strncmp(ptr, "ONLINESTATUS ", 13) &&
-			strcmp(user, sd->username) != 0
-			&& strcmp(user, "echo123") != 0) {
+	if (!strncmp(ptr, "ONLINESTATUS ", 13)) {
+			if (!strcmp(user, sd->username))
+				return;
+			if (!set_getbool(&ic->acc->set, "test_join")
+				&& !strcmp(user, "echo123"))
+				return;
 		ptr = g_strdup_printf("%s@skype.com", user);
 		imcb_add_buddy(ic, ptr, NULL);
 		if (strcmp(status, "OFFLINE") && (strcmp(status, "SKYPEOUT") ||
@@ -322,6 +339,31 @@ static void skype_parse_user(struct im_c
 			imcb_add_buddy(ic, buf, NULL);
 			g_free(buf);
 		}
+	} else if (!strncmp(ptr, "MOOD_TEXT ", 10)) {
+		char *buf = g_strdup_printf("%s@skype.com", user);
+#if BITLBEE_VERSION_CODE < BITLBEE_VER(1, 3, 0)
+		user_t *u = user_findhandle(ic, buf);
+		g_free(buf);
+		buf = ptr + 10;
+		if (u) {
+			if (u->status_msg)
+				g_free(u->status_msg);
+			if (strlen(buf))
+				u->status_msg = g_strdup(buf);
+			else
+				u->status_msg = NULL;
+		}
+#else
+		bee_user_t *bu = bee_user_by_handle(ic->bee, ic, buf);
+		g_free(buf);
+		buf = ptr + 10;
+		if (bu) {
+			imcb_buddy_status(ic, bu->handle, bu->flags, NULL,
+					*buf ? buf : NULL);
+		}
+#endif
+		if (set_getbool(&ic->acc->set, "show_moods"))
+			imcb_log(ic, "User `%s' changed mood text to `%s'", user, buf);
 	} else if (!strncmp(ptr, "FULLNAME ", 9))
 		sd->info_fullname = g_strdup(ptr + 9);
 	else if (!strncmp(ptr, "PHONE_HOME ", 11))
@@ -749,11 +791,13 @@ static void skype_parse_chat(struct im_c
 	if (gc)
 		imcb_chat_free(gc);
 	if (!strcmp(info, "STATUS MULTI_SUBSCRIBED")) {
-		imcb_chat_new(ic, id);
+		gc = imcb_chat_new(ic, id);
+		imcb_chat_name_hint(gc, id);
 		skype_printf(ic, "GET CHAT %s ADDER\n", id);
 		skype_printf(ic, "GET CHAT %s TOPIC\n", id);
 	} else if (!strcmp(info, "STATUS DIALOG") && sd->groupchat_with) {
 		gc = imcb_chat_new(ic, id);
+		imcb_chat_name_hint(gc, id);
 		/* According to the docs this
 		 * is necessary. However it
 		 * does not seem the situation
@@ -831,6 +875,8 @@ static void skype_parse_profile(struct i
 
 static void skype_parse_ping(struct im_connection *ic, char *line)
 {
+	/* Unused parameter */
+	line = line;
 	skype_printf(ic, "PONG\n");
 }
 
@@ -874,6 +920,10 @@ static gboolean skype_read_callback(gpoi
 		{ "CHATS ", skype_parse_chats },
 	};
 
+	/* Unused parameters */
+	fd = fd;
+	cond = cond;
+
 	if (!sd || sd->fd == -1)
 		return FALSE;
 	/* Read the whole data. */
@@ -917,7 +967,7 @@ gboolean skype_start_stream(struct im_co
 		return FALSE;
 
 	if (sd->bfd <= 0)
-		sd->bfd = b_input_add(sd->fd, GAIM_INPUT_READ,
+		sd->bfd = b_input_add(sd->fd, B_EV_IO_READ,
 			skype_read_callback, ic);
 
 	/* Log in */
@@ -938,6 +988,10 @@ gboolean skype_connected(gpointer data, 
 {
 	struct im_connection *ic = data;
 	struct skype_data *sd = ic->proto_data;
+
+	/* Unused parameter */
+	cond = cond;
+
 	if (!source) {
 		sd->ssl = NULL;
 		imcb_error(ic, "Could not connect to server");
@@ -945,6 +999,7 @@ gboolean skype_connected(gpointer data, 
 		return FALSE;
 	}
 	imcb_log(ic, "Connected to server, logging in");
+
 	return skype_start_stream(ic);
 }
 
@@ -985,6 +1040,9 @@ static int skype_buddy_msg(struct im_con
 	char *ptr, *nick;
 	int st;
 
+	/* Unused parameter */
+	flags = flags;
+
 	nick = g_strdup(who);
 	ptr = strchr(nick, '@');
 	if (ptr)
@@ -1015,6 +1073,9 @@ static void skype_set_away(struct im_con
 {
 	const struct skype_away_state *state;
 
+	/* Unused parameter */
+	message = message;
+
 	if (state_txt == NULL)
 		state = skype_away_state_by_name("Online");
 	else
@@ -1027,6 +1088,9 @@ static GList *skype_away_states(struct i
 	static GList *l;
 	int i;
 
+	/* Unused parameter */
+	ic = ic;
+
 	if (l == NULL)
 		for (i = 0; skype_away_state_list[i].full_name; i++)
 			l = g_list_append(l,
@@ -1061,12 +1125,15 @@ static char *skype_set_call(set_t *set, 
 	char *nick, *ptr;
 
 	if (value) {
+#if BITLBEE_VERSION_CODE < BITLBEE_VER(1, 3, 0)
+		/* IRC stuff shouldn't be touched from inside IM modules. */
 		user_t *u = user_find(acc->irc, value);
 		/* We are starting a call */
-		if (!u)
-			nick = g_strdup(value);
-		else
+		if (u)
 			nick = g_strdup(u->handle);
+		else
+#endif
+			nick = g_strdup(value);
 		ptr = strchr(nick, '@');
 		if (ptr)
 			*ptr = '\0';
@@ -1090,6 +1157,9 @@ static void skype_add_buddy(struct im_co
 {
 	char *nick, *ptr;
 
+	/* Unused parameter */
+	group = group;
+
 	nick = g_strdup(who);
 	ptr = strchr(nick, '@');
 	if (ptr)
@@ -1103,6 +1173,9 @@ static void skype_remove_buddy(struct im
 {
 	char *nick, *ptr;
 
+	/* Unused parameter */
+	group = group;
+
 	nick = g_strdup(who);
 	ptr = strchr(nick, '@');
 	if (ptr)
@@ -1114,6 +1187,10 @@ static void skype_remove_buddy(struct im
 void skype_chat_msg(struct groupchat *gc, char *message, int flags)
 {
 	struct im_connection *ic = gc->ic;
+
+	/* Unused parameter */
+	flags = flags;
+
 	skype_printf(ic, "CHATMESSAGE %s %s\n", gc->title, message);
 }
 
@@ -1128,6 +1205,10 @@ void skype_chat_invite(struct groupchat 
 {
 	struct im_connection *ic = gc->ic;
 	char *ptr, *nick;
+
+	/* Unused parameter */
+	who = who;
+
 	nick = g_strdup(message);
 	ptr = strchr(nick, '@');
 	if (ptr)
@@ -1223,6 +1304,11 @@ static void skype_init(account_t *acc)
 	s = set_add(&acc->set, "auto_join", "false", set_eval_bool, acc);
 	s->flags |= ACC_SET_OFFLINE_ONLY;
 
+	s = set_add(&acc->set, "test_join", "false", set_eval_bool, acc);
+	s->flags |= ACC_SET_OFFLINE_ONLY;
+
+	s = set_add(&acc->set, "show_moods", "false", set_eval_bool, acc);
+
 	s = set_add(&acc->set, "edit_prefix", "EDIT:",
 			NULL, acc);
 }
diff -pruN 0.8.1-0.2/skyped.conf.dist.in 0.8.4-0ubuntu1/skyped.conf.dist.in
--- 0.8.1-0.2/skyped.conf.dist.in	2010-03-17 18:12:30.000000000 +0000
+++ 0.8.4-0ubuntu1/skyped.conf.dist.in	2010-12-08 03:22:05.000000000 +0000
@@ -1,7 +1,10 @@
 [skyped]
+# change to your skype username
 username = john
 # use `echo -n foo|sha1sum` to generate this hash for your password
 password = 0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33
-cert = @sysconfdir@/skyped/skyped.cert.pem
-key  = @sysconfdir@/skyped/skyped.key.pem
+
+# you have to change the following paths to your home directory:
+cert = /home/YOUR_USER/.skyped/skyped.cert.pem
+key  = /home/YOUR_USER/.skyped/skyped.key.pem
 port = 2727
diff -pruN 0.8.1-0.2/skyped.py 0.8.4-0ubuntu1/skyped.py
--- 0.8.1-0.2/skyped.py	2010-03-17 18:12:30.000000000 +0000
+++ 0.8.4-0ubuntu1/skyped.py	2010-12-08 03:22:05.000000000 +0000
@@ -1,8 +1,8 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 # 
 #   skyped.py
 #  
-#   Copyright (c) 2007, 2008, 2009 by Miklos Vajna <vmiklos@frugalware.org>
+#   Copyright (c) 2007, 2008, 2009, 2010 by Miklos Vajna <vmiklos@frugalware.org>
 #
 #   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
@@ -244,7 +244,7 @@ Options:
 if __name__=='__main__':
 	options = Options()
 	try:
-		opts, args = getopt.getopt(sys.argv[1:], "c:dhH:l:np:v", ["config=", "daemon", "help", "host=", "log=", "nofork", "port=", "version"])
+		opts, args = getopt.getopt(sys.argv[1:], "c:dhH:l:np:v", ["config=", "debug", "help", "host=", "log=", "nofork", "port=", "version"])
 	except getopt.GetoptError:
 		options.usage(1)
 	for opt, arg in opts:
@@ -278,8 +278,8 @@ if __name__=='__main__':
 	options.config.read(options.cfgpath)
 	options.config.username = options.config.get('skyped', 'username').split('#')[0]
 	options.config.password = options.config.get('skyped', 'password').split('#')[0]
-	options.config.sslkey = options.config.get('skyped', 'key').split('#')[0]
-	options.config.sslcert = options.config.get('skyped', 'cert').split('#')[0]
+	options.config.sslkey = os.path.expanduser(options.config.get('skyped', 'key').split('#')[0])
+	options.config.sslcert = os.path.expanduser(options.config.get('skyped', 'cert').split('#')[0])
 	# hack: we have to parse the parameters first to locate the
 	# config file but the -p option should overwrite the value from
 	# the config file
diff -pruN 0.8.1-0.2/t/irssi/skype-info.test 0.8.4-0ubuntu1/t/irssi/skype-info.test
--- 0.8.1-0.2/t/irssi/skype-info.test	2010-03-17 18:12:30.000000000 +0000
+++ 0.8.4-0ubuntu1/t/irssi/skype-info.test	2010-12-08 03:22:05.000000000 +0000
@@ -6,6 +6,7 @@ TESTPASSWORD="$TEST_SKYPE_PASSWORD"
 ### Test receiving info output
 /expectbee 'Welcome to the BitlBee' -command 'msg $$C register testing'
 /expectbee 'Account successfully created' -command 'msg $$C account add skype @LOGIN@ @PASSWORD@'
-/expectbee 'Account successfully added' -command 'msg $$C account on 0'
-/expectbee 'Logged in' -command 'msg $$C info anothrcom'
-/expectbee 'Full Name: iNeZha Bot' -command 'quit Test Passed'
+/expectbee 'Account successfully added' -command 'msg $$C account 0 set test_join true'
+/expectbee 'test_join' -command 'msg $$C account 0 on'
+/expectjoin echo123 -command 'msg $$C info echo123'
+/expectbee 'Full Name: Echo / Sound Test Service' -command 'quit Test Passed'
diff -pruN 0.8.1-0.2/t/irssi/skype-login.test 0.8.4-0ubuntu1/t/irssi/skype-login.test
--- 0.8.1-0.2/t/irssi/skype-login.test	2010-03-17 18:12:30.000000000 +0000
+++ 0.8.4-0ubuntu1/t/irssi/skype-login.test	2010-12-08 03:22:05.000000000 +0000
@@ -6,5 +6,5 @@ TESTPASSWORD="$TEST_SKYPE_PASSWORD"
 ### Test login
 /expectbee 'Welcome to the BitlBee' -command 'msg $$C register testing'
 /expectbee 'Account successfully created' -command 'msg $$C account add skype @LOGIN@ @PASSWORD@'
-/expectbee 'Account successfully added' -command 'msg $$C account on 0'
+/expectbee 'Account successfully added' -command 'msg $$C account 0 on'
 /expectbee 'Logged in' -command 'quit Test Passed'
diff -pruN 0.8.1-0.2/t/irssi/skype-msg.test 0.8.4-0ubuntu1/t/irssi/skype-msg.test
--- 0.8.1-0.2/t/irssi/skype-msg.test	2010-03-17 18:12:30.000000000 +0000
+++ 0.8.4-0ubuntu1/t/irssi/skype-msg.test	2010-12-08 03:22:05.000000000 +0000
@@ -6,6 +6,7 @@ TESTPASSWORD="$TEST_SKYPE_PASSWORD"
 ### Test sending and receiving messages
 /expectbee 'Welcome to the BitlBee' -command 'msg $$C register testing'
 /expectbee 'Account successfully created' -command 'msg $$C account add skype @LOGIN@ @PASSWORD@'
-/expectbee 'Account successfully added' -command 'msg $$C account on 0'
-/expectbee 'Logged in' -command 'msg $$C anothrcom: ?'
-/expectbee 'Manage your feeds' -command 'quit Test Passed'
+/expectbee 'Account successfully added' -command 'msg $$C account 0 set test_join true'
+/expectbee 'test_join' -command 'msg $$C account 0 on'
+/expectjoin echo123 -command 'msg $$C echo123: ping, say pong'
+/expectbee 'pong' -command 'quit Test Passed'
diff -pruN 0.8.1-0.2/t/livetest-bitlbee.sh 0.8.4-0ubuntu1/t/livetest-bitlbee.sh
--- 0.8.1-0.2/t/livetest-bitlbee.sh	2010-03-17 18:12:30.000000000 +0000
+++ 0.8.4-0ubuntu1/t/livetest-bitlbee.sh	2010-12-08 03:22:05.000000000 +0000
@@ -11,7 +11,8 @@ mkdir livetest 2>/dev/null || rm livetes
 
 # Run the bee
 echo Running bitlbee...
-$VALGRIND $BITLBEE -n -c bitlbee.conf -d livetest/ -D -P bitlbeetest.pid -p $PORT & sleep 2
+$VALGRIND $BITLBEE -n -c bitlbee.conf -d livetest/ -D -P bitlbeetest.pid -p $PORT 2>bitlbee.log &
+sleep 2
 
 # Check if it's really running
 kill -0 `cat bitlbeetest.pid 2>/dev/null ` 2>/dev/null || { echo Failed to run bitlbee daemon on port $PORT; exit 1; }
@@ -22,13 +23,19 @@ rm -rf etc
 mkdir etc
 cd etc
 cp ../../skyped.cnf .
-yes ""|openssl req -new -x509 -days 365 -nodes -config skyped.cnf -out skyped.cert.pem -keyout skyped.key.pem 2> openssl.log
+if [ ! -e ~/.skyped/skyped.cert.pem -o ! -e ~/.skyped/skyped.key.pem ]; then
+	yes ""|openssl req -new -x509 -days 365 -nodes -config skyped.cnf -out skyped.cert.pem -keyout skyped.key.pem 2> openssl.log
+else
+	cp ~/.skyped/skyped.cert.pem .
+	cp ~/.skyped/skyped.key.pem .
+fi
 cd ..
 echo "[skyped]" > skyped.conf
 echo "username = $TEST_SKYPE_ID" >> skyped.conf
 echo "password = $(echo -n $TEST_SKYPE_PASSWORD|sha1sum|sed 's/ *-$//')" >> skyped.conf
-echo "cert = $(pwd)/etc/skyped.cert.pem" >> skyped.conf
-echo "key = $(pwd)/etc/skyped.key.pem" >> skyped.conf
+# we use ~ here to test that resolve that syntax works
+echo "cert = $(pwd|sed "s|$HOME|~|")/etc/skyped.cert.pem" >> skyped.conf
+echo "key = $(pwd|sed "s|$HOME|~|")/etc/skyped.key.pem" >> skyped.conf
 echo "port = 2727" >> skyped.conf
 
 # Run skyped
diff -pruN 0.8.1-0.2/t/Makefile 0.8.4-0ubuntu1/t/Makefile
--- 0.8.1-0.2/t/Makefile	2010-03-17 18:12:30.000000000 +0000
+++ 0.8.4-0ubuntu1/t/Makefile	2010-12-08 03:22:05.000000000 +0000
@@ -1,31 +1,19 @@
 PORT=9876
 BITLBEE=/usr/sbin/bitlbee
 
-export TEST_SKYPE_ID=bitlbee-skype
-export TEST_SKYPE_PASSWORD=:9eQBgoh8
+export TEST_SKYPE_ID=user
+export TEST_SKYPE_PASSWORD=pass
 
 testfiles := $(wildcard irssi/*.test)
 tests := $(patsubst %.test,%,$(testfiles))
 
-.PHONY: checkvars $(tests)
+.PHONY: $(tests)
 
 default: $(tests)
 	@echo "passed $$(echo $(testfiles)|wc -w) tests."
 
-checkvars:
-	@for test in irssi/*.test; do NVAR="$$NVAR `irssi/livetest-irssi.sh $$test checkvars`";done;\
-		if echo $$NVAR|grep TEST &>/dev/null; then \
-			echo Needed variables: ; \
-			echo $$NVAR | tr ' ' '\n' | sort | uniq; \
-			exit 1; \
-		else \
-			echo "--- Environment OK ---";\
-		fi
-
 $(tests): % : %.test
-	@if ! NVARS=`irssi/livetest-irssi.sh $< checkvars`; then echo Need environment variables for $@: $$NVARS;\
-		echo Skipping...;exit 0;fi;\
-	echo "--- Running test $@ ---"; \
+	@echo "--- Running test $@ ---"; \
 		if ! ./livetest-bitlbee.sh $(BITLBEE) $(PORT) irssi/livetest-irssi.sh $< >$@.log; then \
 			echo Test failed, log: ;\
 			cat $@.log;\