Changeset ac3b8ff

Timestamp:

2018-03-19T17:02:01Z (7 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

1c7b646

Parents:

1de945b

Message:

debian: remove skype plugin stuff

Files:

• .travis.yml (modified) (1 diff)
• debian/bitlbee-plugin-skype.docs (deleted)
• debian/control (modified) (1 diff)
• debian/rules (modified) (4 diffs)
• debian/skyped.README.Debian (deleted)
• debian/skyped.docs (deleted)

.travis.yml

@@ -5 +5 @@
  - ./configure --pam=1 --ldap=1
  - make check
- - BITLBEE_SKYPE=plugin dpkg-buildpackage -uc -us -d
+ - dpkg-buildpackage -uc -us -d
 
 # ubuntu precise doesn't have libotr5, so extract a prebuilt version to ~/otr

debian/control

@@ -69 +69 @@
  This package contains a plugin that adds support for Off-The-Record
  encryption of instant messages.
-
-Package: bitlbee-plugin-skype
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${binary:Version}) | bitlbee-libpurple (= ${binary:Version}), bitlbee-common (= ${source:Version})
-Recommends: skyped
-Description: IRC to other chat networks gateway (Skype plugin)
- This program can be used as an IRC server which forwards everything you
- say to people on other chat networks: Jabber (which includes Google
- Talk), ICQ, AIM, MSN and Twitter.
- .
- This package contains a plugin that adds support for the Skype IM network.
- You need to download and install the Skype client for this to work.
-
-Package: skyped
-Architecture: all
-Depends: ${misc:Depends}, ${shlibs:Depends}, python (>= 2.5), python-gnutls, python-skype (>=0.9.28.7)
-Recommends: skype
-Description: Daemon to control Skype remotely
- Daemon to control the GUI Skype client. Currently required to control Skype
- from the BitlBee IRC2IM gateway. Skyped and Skype can run on a different
- host than the BitlBee server, the communication is encrypted.
- .
- You need to download and install the Skype client for this to work.

debian/rules

@@ -9 +9 @@
 
 # Include the bitlbee-libpurple variant and OTR plugin by default.
-# Don't build skype by default since it depends on deleted/non-free
-# packages. Need to at least get python-skype back into Debian.
 BITLBEE_LIBPURPLE ?= 1
 BITLBEE_OTR ?= plugin
-BITLBEE_SKYPE ?= 0
 BITLBEE_CONFIGURE_FLAGS ?=
 DEBUG ?= 0
@@ -28 +25 @@
 ifneq ($(BITLBEE_OTR),plugin)
 DH_OPTIONS += -Nbitlbee-plugin-otr
-endif
-
-ifneq ($(BITLBEE_SKYPE),plugin)
-DH_OPTIONS += -Nbitlbee-plugin-skype -Nskyped
 endif
 
@@ -52 +45 @@
 
         mkdir -p debian/build-native
-        ROOT=$$PWD; cd debian/build-native; $(BITLBEE_CONFIGURE_VERSION) $(CONFIGURE_OVERRIDES) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --events=libevent --otr=$(BITLBEE_OTR) --skype=$(BITLBEE_SKYPE) $(BITLBEE_CONFIGURE_FLAGS)
+        ROOT=$$PWD; cd debian/build-native; $(BITLBEE_CONFIGURE_VERSION) $(CONFIGURE_OVERRIDES) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --events=libevent --otr=$(BITLBEE_OTR) $(BITLBEE_CONFIGURE_FLAGS)
         $(MAKE) -C debian/build-native
 
@@ -86 +79 @@
         $(MAKE) -C debian/build-native install-dev DESTDIR=`pwd`/debian/bitlbee-dev
         $(MAKE) -C debian/build-native install-plugin-otr DESTDIR=`pwd`/debian/bitlbee-plugin-otr
-        $(MAKE) -C debian/build-native install-plugin-skype DESTDIR=`pwd`/debian/skyped
 
 ifeq ($(HAS_DH_SYSTEMD),1)
         $(MAKE) -C debian/build-native install-systemd DESTDIR=`pwd`/debian/bitlbee-common
-endif
-
-ifneq ($(BITLBEE_SKYPE),0)
-        mkdir -p debian/bitlbee-plugin-skype/usr
-        mv debian/skyped/usr/lib debian/bitlbee-plugin-skype/usr
-
-        mkdir -p debian/skyped/usr/share/man/man1
-        mv debian/bitlbee-common/usr/share/man/man1/skyped* debian/skyped/usr/share/man/man1
 endif