diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/bitlbee-plugin-skype.docs | 2 | ||||
| -rw-r--r-- | debian/changelog | 21 | ||||
| -rw-r--r-- | debian/control | 27 | ||||
| -rwxr-xr-x | debian/rules | 16 | ||||
| -rw-r--r-- | debian/skyped.README.Debian | 18 | ||||
| -rw-r--r-- | debian/skyped.docs | 2 |
6 files changed, 82 insertions, 4 deletions
diff --git a/debian/bitlbee-plugin-skype.docs b/debian/bitlbee-plugin-skype.docs new file mode 100644 index 00000000..3f99862a --- /dev/null +++ b/debian/bitlbee-plugin-skype.docs @@ -0,0 +1,2 @@ +protocols/skype/NEWS +protocols/skype/README diff --git a/debian/changelog b/debian/changelog index a7d008f3..5702b417 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,24 @@ +bitlbee (3.0.4-1) unstable; urgency=low + + * New upstream release. + * Added bitlbee-plugin-skype and skyped packages, now part of BitlBee + instead of a separate package. + * Fixed dependencies of bitlbee-plugin-otr package to not break with + binary MTUs. (Closes: #651612) + * ^B and some other things are stripped in outgoing XMPP stanzas. + (Closes: #507856) + * OTR module linking fix. Not with the fix from the Debian bug but with + one from bugs.bitlbee.org. I hope that covers it. (Closes: #646369) + * Closing a few old bugs that were filed against the Debian package + instead of upstream: + - Joining password-protected MUCs is working for a while already, set + the password using "chan set". (Closes: #615624) + - "Headline:" msgs (Closes: #605459) + - Yahoo! was fixed long ago and Etch is deprecated. (Closes: #476529) + - identi.ca support is documented. (Closes: #613789) + + -- Wilmer van der Gaast <wilmer@gaast.net> Sun, 11 Dec 2011 16:53:31 +0000 + bitlbee (3.0.3-1) unstable; urgency=low * New upstream release. (Skipped 3.0.2, sorry!) diff --git a/debian/control b/debian/control index 497ed91a..41fc0366 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@samba.org> Standards-Version: 3.9.1 -Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), po-debconf, libpurple-dev, libotr2-dev, debhelper (>= 6.0.7~) +Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), po-debconf, libpurple-dev, libotr2-dev, debhelper (>= 6.0.7~), asciidoc Homepage: http://www.bitlbee.org/ Vcs-Bzr: http://code.bitlbee.org/bitlbee/ DM-Upload-Allowed: yes @@ -60,7 +60,7 @@ Description: An IRC to other chat networks gateway (dev files) Package: bitlbee-plugin-otr Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${bee:Version}) | bitlbee-libpurple (= ${bee:Version}), bitlbee-common (= ${bee:Version}) +Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (>= ${bee:Version}) | bitlbee-libpurple (>= ${bee:Version}), bitlbee (<< ${bee:Version}.1~) | bitlbee-libpurple (<< ${bee:Version}.1~), bitlbee-common (= ${bee:Version}) Description: An 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 @@ -68,3 +68,26 @@ Description: An IRC to other chat networks gateway (OTR plugin) . This package contains a plugin that adds support for Off-The-Record encryption of instant messages. + +Package: bitlbee-plugin-skype +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, bitlbee (>= ${bee:Version}) | bitlbee-libpurple (>= ${bee:Version}), bitlbee (<< ${bee:Version}.1~) | bitlbee-libpurple (<< ${bee:Version}.1~) +Recommends: skyped +Description: An 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. + . + This package contains a plugin that adds support for the Skype IM network. + You need to download and install the Skype client for this to work. + +Package: skyped +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.5), python-gnutls, python-skype (>=0.9.28.7) +Recommends: skype +Description: Daemon to control Skype remotely + Daemon to control the GUI Skype client. Currently required to control Skype + from the BitlBee IRC2IM gateway. Skyped and Skype can run on a different + host than the BitlBee server, the communication is encrypted. + . + You need to download and install the Skype client for this to work. diff --git a/debian/rules b/debian/rules index 2afadd90..57d60090 100755 --- a/debian/rules +++ b/debian/rules @@ -10,6 +10,7 @@ # Include the bitlbee-libpurple variant and OTR plugin by default BITLBEE_LIBPURPLE ?= 1 BITLBEE_OTR ?= plugin +BITLBEE_SKYPE ?= plugin BITLBEE_CONFIGURE_FLAGS ?= DEBUG ?= 0 @@ -26,12 +27,16 @@ ifneq ($(BITLBEE_OTR),plugin) DH_OPTIONS += -Nbitlbee-plugin-otr endif +ifneq ($(BITLBEE_SKYPE),plugin) +DH_OPTIONS += -Nbitlbee-plugin-skype -Nskyped +endif + build: build-stamp build-stamp: dh_testdir mkdir -p debian/build-native - ROOT=$$PWD; cd debian/build-native; $(BITLBEE_CONFIGURE_VERSION) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --events=libevent --otr=$(BITLBEE_OTR) $(BITLBEE_CONFIGURE_FLAGS) + ROOT=$$PWD; cd debian/build-native; $(BITLBEE_CONFIGURE_VERSION) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --events=libevent --otr=$(BITLBEE_OTR) --skype=$(BITLBEE_SKYPE) $(BITLBEE_CONFIGURE_FLAGS) $(MAKE) -C debian/build-native ifeq ($(BITLBEE_LIBPURPLE),1) @@ -63,7 +68,14 @@ install: build $(MAKE) -C debian/build-native install-bin DESTDIR=`pwd`/debian/bitlbee $(MAKE) -C debian/build-native install-etc install-doc DESTDIR=`pwd`/debian/bitlbee-common $(MAKE) -C debian/build-native install-dev DESTDIR=`pwd`/debian/bitlbee-dev - $(MAKE) -C debian/build-native install-plugins DESTDIR=`pwd`/debian/bitlbee-plugin-otr + $(MAKE) -C debian/build-native install-plugin-otr DESTDIR=`pwd`/debian/bitlbee-plugin-otr + $(MAKE) -C debian/build-native install-plugin-skype DESTDIR=`pwd`/debian/skyped + + mkdir -p debian/bitlbee-plugin-skype/usr + mv debian/skyped/usr/lib debian/bitlbee-plugin-skype/usr + + mkdir -p debian/skyped/usr/share/man/man1 + mv debian/bitlbee-common/usr/share/man/man1/skyped* debian/skyped/usr/share/man/man1 ifeq ($(BITLBEE_LIBPURPLE),1) $(MAKE) -C debian/build-libpurple install-bin DESTDIR=`pwd`/debian/bitlbee-libpurple diff --git a/debian/skyped.README.Debian b/debian/skyped.README.Debian new file mode 100644 index 00000000..502e6147 --- /dev/null +++ b/debian/skyped.README.Debian @@ -0,0 +1,18 @@ +bitlbee-skype for Debian +------------------------ + +The upstream package installs global configuration files in /etc. Since +configuration cannot be used by multiple users, however, the default for +Debian packages is in ~/.skyped/. Please copy the configuration files +from ./examples to ~/.skyped/. + +You will also need to change the configuration values in skyped.conf +and skyped.cnf to suit your needs and create the keys. More information +in the respective files as well as the README.gz. + +Without these measures, skyped will NOT work. + +You need to download the official skype client for this to be of any +use. Go to http://www.skype.com/. + + -- David Spreen <netzwurm@debian.org>, Thu, 2 Apr 2009 15:01:25 -0700 diff --git a/debian/skyped.docs b/debian/skyped.docs new file mode 100644 index 00000000..3f99862a --- /dev/null +++ b/debian/skyped.docs @@ -0,0 +1,2 @@ +protocols/skype/NEWS +protocols/skype/README |