diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | configure | 10 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | protocols/skype/Makefile | 15 | ||||
| -rw-r--r-- | protocols/skype/skyped.1 | 207 |
5 files changed, 211 insertions, 25 deletions
diff --git a/.travis.yml b/.travis.yml index b94b4a40..306d0caf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ script: before_install: - sudo apt-get update -qq - - sudo apt-get install --no-install-recommends -qq asciidoc libevent-dev libpurple-dev check + - sudo apt-get install --no-install-recommends -qq libevent-dev libpurple-dev check - wget http://dump.dequis.org/indexed/bitlbee-travis-libs/libotr5{,-dev}_4.1.0-2~bpo70+1_amd64.deb - sudo dpkg -i *.deb @@ -687,16 +687,6 @@ if [ "$doc" = "1" ]; then exit 1 fi echo "DOC=1" >> Makefile.settings - - if [ "$skype" = "1" -o "$skype" = "plugin" ]; then - # skype also needs asciidoc - if ! type a2x > /dev/null 2> /dev/null; then - echo - echo 'WARNING: The skyped man page requires asciidoc. It will not be generated.' - else - echo "ASCIIDOC=1" >> Makefile.settings - fi - fi fi get_version diff --git a/debian/control b/debian/control index 7392b454..4feedb5f 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Wilmer van der Gaast <wilmer@gaast.net> Uploaders: Jelmer Vernooij <jelmer@debian.org> Standards-Version: 3.9.5 -Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls28-dev | libgnutls-dev | gnutls-dev, po-debconf, libpurple-dev, libotr5-dev, debhelper (>= 6.0.7~), asciidoc +Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls28-dev | libgnutls-dev | gnutls-dev, po-debconf, libpurple-dev, libotr5-dev, debhelper (>= 6.0.7~) Homepage: http://www.bitlbee.org/ Vcs-Bzr: http://code.bitlbee.org/bitlbee/ diff --git a/protocols/skype/Makefile b/protocols/skype/Makefile index b0ad2237..12a45da3 100644 --- a/protocols/skype/Makefile +++ b/protocols/skype/Makefile @@ -6,17 +6,8 @@ endif DATE := $(shell date +%Y-%m-%d) INSTALL = install - -ifdef ASCIIDOC -MANPAGES = skyped.1 -else -MANPAGES = -endif - -all: $(MANPAGES) - +all: clean: - rm -f $(MANPAGES) # take this from the kernel check: @@ -28,13 +19,11 @@ test: all doc: $(MANPAGES) install-doc: doc -ifdef ASCIIDOC $(INSTALL) -d $(DESTDIR)$(MANDIR)/man1 $(INSTALL) -m644 $(MANPAGES) $(DESTDIR)$(MANDIR)/man1 -endif uninstall-doc: rm -f $(DESTDIR)$(MANDIR)/man1/skyped.1* %.1: $(_SRCDIR_)%.txt $(_SRCDIR_)asciidoc.conf - a2x --asciidoc-opts="-f $(_SRCDIR_)asciidoc.conf" -a bee_date=$(DATE) -f manpage -D . $< + a2x --asciidoc-opts="-f $(_SRCDIR_)asciidoc.conf" -a bee_date=$(DATE) -f manpage $< diff --git a/protocols/skype/skyped.1 b/protocols/skype/skyped.1 new file mode 100644 index 00000000..d7542184 --- /dev/null +++ b/protocols/skype/skyped.1 @@ -0,0 +1,207 @@ +'\" t +.\" Title: skyped +.\" Author: [see the "AUTHOR" section] +.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> +.\" Date: 123 +.\" Manual: BitlBee manual +.\" Source: BitlBee +.\" Language: English +.\" +.TH "SKYPED" "1" "123" "BitlBee" "BitlBee manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +skyped \- allows remote control of the Skype GUI client +.SH "SYNOPSIS" +.sp +skyped [<options>] +.SH "DESCRIPTION" +.sp +Skype supports remote control of the GUI client only via X11 or DBus messages\&. This is hard in case you want remote control\&. This daemon listens on a TCP port and runs on the same machine where the GUI client runs\&. It passes all the input it gets to Skype directly, except for a few commands which is related to authentication\&. The whole communication is done via SSL\&. +.SH "CONFIGURATION" +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +Set up +~/\&.skyped/skyped\&.conf: Create the +~/\&.skyped +directory, copy +skyped\&.conf +and +skyped\&.cnf +from +/usr/local/etc/skyped/ +to +~/\&.skyped, adjust +username +and +password\&. The +username +should be your Skype login and the +password +can be whatever you want, but you will have to specify that one when adding the Skype account to BitlBee (see later)\&. +.RE +.if n \{\ +.sp +.\} +.RS 4 +.it 1 an-trap +.nr an-no-space-flag 1 +.nr an-break-flag 1 +.br +.ps +1 +\fBNote\fR +.ps -1 +.br +.sp +Here, and later \- /usr/local/etc can be different on your installation if you used the \-\-sysconfdir switch when running the configure of BitlBee\&. +.sp .5v +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +Generate the SSL pem files: +.RE +.sp +.if n \{\ +.RS 4 +.\} +.nf +$ cd ~/\&.skyped +$ openssl req \-new \-x509 \-days 365 \-nodes \-config skyped\&.cnf \-out skyped\&.cert\&.pem \e + \-keyout skyped\&.key\&.pem +.fi +.if n \{\ +.RE +.\} +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +Start +skyped +(the TCP server), initially without detaching and enabling debug messages: +.RE +.sp +.if n \{\ +.RS 4 +.\} +.nf +$ skyped \-d \-n +.fi +.if n \{\ +.RE +.\} +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +Start your +IRC +client, connect to BitlBee and add your account: +.RE +.sp +.if n \{\ +.RS 4 +.\} +.nf +account add skype <user> <pass> +.fi +.if n \{\ +.RE +.\} +.sp +<user> should be your Skype account name, <pass> should be the one you declared in skyped\&.conf\&. +.SH "OPTIONS" +.PP +\-c, \-\-config +.RS 4 +Path to configuration file (default: $HOME/\&.skyped/skyped\&.conf) +.RE +.PP +\-d, \-\-debug +.RS 4 +Enable debug messages +.RE +.PP +\-h, \-\-help +.RS 4 +Show short summary of options +.RE +.PP +\-H, \-\-host +.RS 4 +Set the tcp host (default: 0\&.0\&.0\&.0) +.RE +.PP +\-l, \-\-log +.RS 4 +Set the log file in background mode (default: none) +.RE +.PP +\-m, \-\-mock=<file> +.RS 4 +Mock mode: replay session from file, instead of connecting to Skype\&. +.RE +.PP +\-n, \-\-nofork +.RS 4 +Don\(cqt run as daemon in the background +.RE +.PP +\-s, \-\-dont\-start\-skype +.RS 4 +Assume that skype is running independently, don\(cqt try to start/stop it\&. +.RE +.PP +\-p, \-\-port +.RS 4 +Set the tcp port (default: 2727) +.RE +.PP +\-v, \-\-version +.RS 4 +Display version information +.RE +.SH "AUTHOR" +.sp +Written by Miklos Vajna <vmiklos@vmiklos\&.hu> |