7 files changed, 21 insertions, 69 deletions
diff --git a/debian/bitlbee-plugin-skype.docs b/debian/bitlbee-plugin-skype.docs
deleted file mode 100644
index 3f99862a..00000000
--- a/debian/bitlbee-plugin-skype.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-protocols/skype/NEWS
-protocols/skype/README
diff --git a/debian/changelog b/debian/changelog
index 7c411798..ff6ec7e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+bitlbee (3.5.1-1.1) UNRELEASED; urgency=medium
+
+  * Remove bitlbee-plugin-skype and skyped (obsolete)
+  * Enable only bitlbee.service, not bitlbee.socket too
+
+ -- dequis <dx@dxzone.com.ar>  Mon, 19 Mar 2018 22:18:43 -0300
+
+bitlbee (3.5.1-1) unstable; urgency=medium
+
+  * Crash bug fix. (Closes: #853282)
+
+ -- Wilmer van der Gaast <wilmer@gaast.net>  Thu, 09 Feb 2017 00:46:53 +0000
+
 bitlbee (3.5-2) unstable; urgency=medium
 
   * TFW you find out the corrected fix diff posted on #821967 was still the
diff --git a/debian/compat b/debian/compat
index 1e8b3149..ec635144 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+9
diff --git a/debian/control b/debian/control
index 89a7efb3..9f7db6db 100644
--- a/debian/control
+++ b/debian/control
@@ -68,26 +68,3 @@ Description: 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: ${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.
diff --git a/debian/rules b/debian/rules
index e31e0710..8cdb9628 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,11 +8,8 @@
 #
 
 # 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
 
@@ -29,10 +26,6 @@ ifneq ($(BITLBEE_OTR),plugin)
 DH_OPTIONS += -Nbitlbee-plugin-otr
 endif
 
-ifneq ($(BITLBEE_SKYPE),plugin)
-DH_OPTIONS += -Nbitlbee-plugin-skype -Nskyped
-endif
-
 CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
 CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
 LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
@@ -51,12 +44,12 @@ build-stamp:
 	dh_testdir
 
 	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) --systemdsystemunitdir=/lib/systemd/system $(BITLBEE_CONFIGURE_FLAGS)
 	$(MAKE) -C debian/build-native
 
 ifeq ($(BITLBEE_LIBPURPLE),1)
 	mkdir -p debian/build-libpurple
-	ROOT=$$PWD; cd debian/build-libpurple; $(BITLBEE_CONFIGURE_VERSION) $(CONFIGURE_OVERRIDES) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --purple=1 $(BITLBEE_CONFIGURE_FLAGS)
+	ROOT=$$PWD; cd debian/build-libpurple; $(BITLBEE_CONFIGURE_VERSION) $(CONFIGURE_OVERRIDES) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --systemdsystemunitdir=/lib/systemd/system --purple=1 $(BITLBEE_CONFIGURE_FLAGS)
 	$(MAKE) -C debian/build-libpurple
 endif
 
@@ -85,20 +78,11 @@ install: build
 	$(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-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
-
 ifeq ($(BITLBEE_LIBPURPLE),1)
 	$(MAKE) -C debian/build-libpurple install-bin DESTDIR=`pwd`/debian/bitlbee-libpurple
 	ln -sf debian/bitlbee.prerm debian/bitlbee-libpurple.prerm
@@ -119,12 +103,12 @@ binary-common:
 	for p in bitlbee bitlbee-libpurple bitlbee-dev bitlbee-plugin-otr; do rm -r debian/$$p/usr/share/doc/$$p && ln -s bitlbee-common debian/$$p/usr/share/doc/$$p || true; done
 	dh_installdebconf
 ifeq ($(HAS_DH_SYSTEMD),1)
-	dh_systemd_enable --no-enable bitlbee.socket
-	dh_systemd_enable bitlbee.service
-	dh_installinit --init-script=bitlbee
-	dh_systemd_start
+	dh_systemd_enable -p bitlbee-common --no-enable bitlbee.socket
+	dh_systemd_enable -p bitlbee-common bitlbee.service
+	dh_installinit -p bitlbee-common --init-script=bitlbee
+	dh_systemd_start -p bitlbee-common
 else
-	dh_installinit --init-script=bitlbee
+	dh_installinit -p bitlbee-common --init-script=bitlbee
 endif
 	dh_installman
 	dh_lintian
diff --git a/debian/skyped.README.Debian b/debian/skyped.README.Debian
deleted file mode 100644
index 502e6147..00000000
--- a/debian/skyped.README.Debian
+++ /dev/null
@@ -1,18 +0,0 @@
-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
deleted file mode 100644
index 3f99862a..00000000
--- a/debian/skyped.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-protocols/skype/NEWS
-protocols/skype/README