From ac3b8ff3752e20c087fc3ad0fddb277e0a4e6b33 Mon Sep 17 00:00:00 2001 From: dequis Date: Mon, 19 Mar 2018 14:02:01 -0300 Subject: debian: remove skype plugin stuff --- debian/rules | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index e31e0710..3cb71e67 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,7 +44,7 @@ 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) $(BITLBEE_CONFIGURE_FLAGS) $(MAKE) -C debian/build-native ifeq ($(BITLBEE_LIBPURPLE),1) @@ -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 -- cgit v1.2.3 From 46b5ed190e4f4cc1403054c5f990e6e0450b0a0a Mon Sep 17 00:00:00 2001 From: dequis Date: Tue, 27 Mar 2018 13:13:54 -0300 Subject: debian: limit dh_systemd actions to the bitlbee-common package Fixes issues such as the following in debian testing/sid >dh_systemd_enable: Requested unit "bitlbee.socket" but it was not found in any package acted on. --- debian/rules | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 3cb71e67..7f2fc811 100755 --- a/debian/rules +++ b/debian/rules @@ -103,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 -- cgit v1.2.3 From 9459ca2536b6a2dad3ad243415ee830a5569e021 Mon Sep 17 00:00:00 2001 From: dequis Date: Tue, 27 Mar 2018 21:54:49 -0300 Subject: debian: pass --systemdsystemunitdir to ./configure explicitly It normally comes from a pkg-config in the systemd package, but for some reason the debian stretch image in wilmer's pbuilder doesn't have it, even though it's installed in both newer and older debians. Who knows. Easiest to just not depend on it here. --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 7f2fc811..8cdb9628 100755 --- a/debian/rules +++ b/debian/rules @@ -44,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) $(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 -- cgit v1.2.3