diff -u bitlbee-3.2.1+otr4/debian/changelog bitlbee-3.2.1+otr4/debian/changelog --- bitlbee-3.2.1+otr4/debian/changelog +++ bitlbee-3.2.1+otr4/debian/changelog @@ -1,3 +1,10 @@ +bitlbee (3.2.1+otr4-1ubuntu0.2) trusty; urgency=medium + + * debian/rules: apply the patch manually (LP: #1315550) + * debian/patches/series: remove, not needed + + -- Timo Jyrinki Thu, 22 Oct 2015 09:11:15 +0300 + bitlbee (3.2.1+otr4-1ubuntu0.1) trusty; urgency=medium [ Dx ] reverted: --- bitlbee-3.2.1+otr4/debian/patches/series +++ bitlbee-3.2.1+otr4.orig/debian/patches/series @@ -1 +0,0 @@ -bitlbee-3.2.1+otr4-1-otr-bugfixes.patch diff -u bitlbee-3.2.1+otr4/debian/rules bitlbee-3.2.1+otr4/debian/rules --- bitlbee-3.2.1+otr4/debian/rules +++ bitlbee-3.2.1+otr4/debian/rules @@ -37,6 +37,8 @@ build-stamp: dh_testdir + patch -p1 < debian/patches/bitlbee-3.2.1+otr4-1-otr-bugfixes.patch + 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) --skype=$(BITLBEE_SKYPE) $(BITLBEE_CONFIGURE_FLAGS) $(MAKE) -C debian/build-native