From 6c0fe9ba555df4950445775dfdcbd8cd1870d950 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Tue, 20 Dec 2011 10:57:35 +0100 Subject: Build skyped as arch=all, and don't build it by default. Debian has removed the python-skype package.. :-( --- debian/rules | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 57d60090..79024825 100755 --- a/debian/rules +++ b/debian/rules @@ -7,10 +7,12 @@ # exercise is over now. # -# Include the bitlbee-libpurple variant and OTR plugin by default +# 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 ?= plugin +BITLBEE_SKYPE ?= 0 BITLBEE_CONFIGURE_FLAGS ?= DEBUG ?= 0 @@ -71,11 +73,13 @@ install: build $(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 +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 -- cgit v1.2.3 From 256164c49f83e85f5c5a04c9b659721b56cd35ec Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Tue, 20 Dec 2011 12:18:30 +0100 Subject: Merging Debian 3.0.3-1.1 changes. --- debian/rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 79024825..8b90640c 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,7 @@ DEBUG ?= 0 ifndef BITLBEE_VERSION # Want to use the full package version number instead of just the release. -BITLBEE_CONFIGURE_VERSION ?= BITLBEE_VERSION=\"$(shell dpkg-parsechangelog | grep ^Version: | awk '{print $$2}')\" +BITLBEE_CONFIGURE_VERSION ?= BITLBEE_VERSION=\"$(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')\" endif ifneq ($(BITLBEE_LIBPURPLE),1) @@ -110,9 +110,9 @@ binary-common: dh_installdeb dh_shlibdeps ifdef BITLBEE_VERSION - dh_gencontrol -- -v$(BITLBEE_VERSION) -Vbee:Version=$(BITLBEE_VERSION) + dh_gencontrol -- -v$(BITLBEE_VERSION) else - dh_gencontrol -- -Vbee:Version=$(shell dpkg-parsechangelog | grep ^Version: | awk '{print $$2}' | sed -e 's/+b[0-9]\+$$//') + dh_gencontrol endif dh_md5sums dh_builddeb -- cgit v1.2.3 From 2d93a51e15ac2d6daaac0d6ac1e2c41e33486c53 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Fri, 23 Dec 2011 09:47:02 +0100 Subject: Removing the version number override hack broken by a recent NMU. Instead, I'll try to solve this problem on just the buildbot using "dch". --- debian/rules | 4 ---- 1 file changed, 4 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 8b90640c..2c9e3a12 100755 --- a/debian/rules +++ b/debian/rules @@ -109,11 +109,7 @@ binary-common: dh_fixperms dh_installdeb dh_shlibdeps -ifdef BITLBEE_VERSION - dh_gencontrol -- -v$(BITLBEE_VERSION) -else dh_gencontrol -endif dh_md5sums dh_builddeb -- cgit v1.2.3