Control: tag -1 patch
intrigeri <intrig...@debian.org> (2013-09-17):
> Cyril Brulebois wrote (17 Sep 2013 18:14:34 GMT) :
> > Do you have a patch handy, or should I take care of that now?
>
> I don't, feel free to take care of that :)
There you go. I don't mind somebody else's uploading it, was just
looking quickly at current transitions…
--otr=0 seems to properly disable otr support, making sure having
libotr{2,5}-dev installed doesn't change anything as far as bitlbee
is concerned.
As for garbage collection in the archive, since the dropped package
isn't depended on by anyone, it should show up on cruft report, and
be removed by ftpmasters.
Mraw,
KiBi.
diff -u bitlbee-3.2/debian/rules bitlbee-3.2/debian/rules
--- bitlbee-3.2/debian/rules
+++ bitlbee-3.2/debian/rules
@@ -25,10 +25,6 @@
DH_OPTIONS += -Nbitlbee-libpurple
endif
-ifneq ($(BITLBEE_OTR),plugin)
-DH_OPTIONS += -Nbitlbee-plugin-otr
-endif
-
ifneq ($(BITLBEE_SKYPE),plugin)
DH_OPTIONS += -Nbitlbee-plugin-skype -Nskyped
endif
@@ -38,7 +34,7 @@
dh_testdir
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)
+ ROOT=$$PWD; cd debian/build-native; $(BITLBEE_CONFIGURE_VERSION) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --events=libevent --otr=0 --skype=$(BITLBEE_SKYPE) $(BITLBEE_CONFIGURE_FLAGS)
$(MAKE) -C debian/build-native
ifeq ($(BITLBEE_LIBPURPLE),1)
@@ -70,7 +66,6 @@
$(MAKE) -C debian/build-native install-bin DESTDIR=`pwd`/debian/bitlbee
$(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
ifneq ($(BITLBEE_SKYPE),0)
@@ -98,7 +93,7 @@
dh_installdocs #--link-doc=bitlbee-common
# TODO: Restore --link-doc up here and remove the hack below once
# Hardy and Lenny are deprecated.
- 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
+ for p in bitlbee bitlbee-libpurple bitlbee-dev; do rm -r debian/$$p/usr/share/doc/$$p && ln -s bitlbee-common debian/$$p/usr/share/doc/$$p || true; done
dh_installdebconf
dh_installinit --init-script=bitlbee
dh_installman
diff -u bitlbee-3.2/debian/control bitlbee-3.2/debian/control
--- bitlbee-3.2/debian/control
+++ bitlbee-3.2/debian/control
@@ -4,7 +4,7 @@
Maintainer: Wilmer van der Gaast <wil...@gaast.net>
Uploaders: Jelmer Vernooij <jel...@samba.org>
Standards-Version: 3.9.1
-Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | gnutls-dev, po-debconf, libpurple-dev, libotr2-dev, debhelper (>= 6.0.7~), asciidoc
+Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | gnutls-dev, po-debconf, libpurple-dev, debhelper (>= 6.0.7~), asciidoc
Homepage: http://www.bitlbee.org/
Vcs-Bzr: http://code.bitlbee.org/bitlbee/
DM-Upload-Allowed: yes
@@ -58,17 +58,6 @@
.
This package holds development stuff for compiling plug-ins.
-Package: bitlbee-plugin-otr
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${binary:Version}) | bitlbee-libpurple (= ${binary:Version}), bitlbee-common (= ${source:Version})
-Description: An IRC to other chat networks gateway (OTR 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
- and Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
- .
- 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})
diff -u bitlbee-3.2/debian/changelog bitlbee-3.2/debian/changelog
--- bitlbee-3.2/debian/changelog
+++ bitlbee-3.2/debian/changelog
@@ -1,3 +1,14 @@
+bitlbee (3.2-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Disable libotr support (hopefully temporarily) for the transition from
+ libotr2 to libotr5 (Closes: #711071):
+ - debian/control: Drop bitlbee-plugin-otr package.
+ - debian/rules: Adjust DH_OPTIONS handling, drop support for
+ bitlbee-plugin-otr, and pass --otr=0 to configure.
+
+ -- Cyril Brulebois <k...@debian.org> Wed, 18 Sep 2013 14:24:48 +0200
+
bitlbee (3.2-1.1) unstable; urgency=low
* Non-maintainer upload.
