Changeset 6197702 for debian


Ignore:
Timestamp:
2010-10-09T18:41:19Z (14 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
d150a9d
Parents:
23b29c6 (diff), 27b407f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merging OTR branch. It's more or less a plugin if you enable it, and
otherwise a no-op. DO NOT INSTALL THIS ON PUBLIC SERVERS.

Location:
debian
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • debian/control

    r23b29c6 r6197702  
    55Uploaders: Jelmer Vernooij <jelmer@samba.org>
    66Standards-Version: 3.8.4
    7 Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), po-debconf, libpurple-dev, debhelper (>= 6)
     7Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), po-debconf, libpurple-dev, libotr2-dev, debhelper (>= 6)
    88Homepage: http://www.bitlbee.org/
    99Vcs-Bzr: http://code.bitlbee.org/bitlbee/
     
    5959 .
    6060 This package holds development stuff for compiling plug-ins.
     61
     62Package: bitlbee-plugin-otr
     63Architecture: any
     64Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${bee:Version}) | bitlbee-libpurple (= ${bee:Version})
     65Description: An IRC to other chat networks gateway (default version)
     66 This program can be used as an IRC server which forwards everything you
     67 say to people on other chat networks: Jabber (which includes Google Talk
     68 and Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
     69 .
     70 This package contains a plugin that adds support for Off-The-Record
     71 encryption of instant messages.
  • debian/rules

    r23b29c6 r6197702  
    88#
    99
    10 # Include the bitlbee-libpurple variant by default
     10# Include the bitlbee-libpurple variant and OTR plugin by default
    1111BITLBEE_LIBPURPLE ?= 1
     12BITLBEE_OTR ?= plugin
    1213BITLBEE_CONFIGURE_FLAGS ?=
    1314DEBUG ?= 0
     
    2223endif
    2324
     25ifneq ($(BITLBEE_OTR),plugin)
     26DH_OPTIONS += -Nbitlbee-plugin-otr
     27endif
     28
    2429build: build-stamp
    2530build-stamp:
     
    2732
    2833        mkdir -p debian/build-native
    29         ROOT=$$PWD; cd debian/build-native; $(BITLBEE_CONFIGURE_VERSION) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --events=libevent $(BITLBEE_CONFIGURE_FLAGS)
     34        ROOT=$$PWD; cd debian/build-native; $(BITLBEE_CONFIGURE_VERSION) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --events=libevent --otr=$(BITLBEE_OTR) $(BITLBEE_CONFIGURE_FLAGS)
    3035        $(MAKE) -C debian/build-native
    3136
     
    5661        dh_installdirs
    5762
    58         $(MAKE) -C debian/build-native install DESTDIR=`pwd`/debian/bitlbee
    59         $(MAKE) -C debian/build-native install-etc DESTDIR=`pwd`/debian/bitlbee-common
     63        $(MAKE) -C debian/build-native install-bin DESTDIR=`pwd`/debian/bitlbee
     64        $(MAKE) -C debian/build-native install-etc install-doc DESTDIR=`pwd`/debian/bitlbee-common
    6065        $(MAKE) -C debian/build-native install-dev DESTDIR=`pwd`/debian/bitlbee-dev
    61         patch debian/bitlbee-common/etc/bitlbee/bitlbee.conf debian/patches/bitlbee.conf.diff
     66        $(MAKE) -C debian/build-native install-plugins DESTDIR=`pwd`/debian/bitlbee-plugin-otr
    6267
    6368ifeq ($(BITLBEE_LIBPURPLE),1)
    64         $(MAKE) -C debian/build-libpurple install DESTDIR=`pwd`/debian/bitlbee-libpurple
     69        $(MAKE) -C debian/build-libpurple install-bin DESTDIR=`pwd`/debian/bitlbee-libpurple
    6570        ln -sf debian/bitlbee.prerm debian/bitlbee-libpurple.prerm
    6671endif
    6772
    68         mkdir -p debian/bitlbee-common/usr
    69         mv debian/bitlbee/usr/share debian/bitlbee-common/usr
    70         rm -rf debian/bitlbee-libpurple/usr/share
     73        patch debian/bitlbee-common/etc/bitlbee/bitlbee.conf debian/patches/bitlbee.conf.diff
     74        chmod 640 debian/bitlbee-common/etc/bitlbee/bitlbee.conf
    7175
    7276binary-common:
     
    7983        # TODO: Restore --link-doc up here and remove the hack below once
    8084        # Hardy and Lenny are deprecated.
    81         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; done
     85        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
    8286        dh_installdebconf
    8387        dh_installinit --init-script=bitlbee
Note: See TracChangeset for help on using the changeset viewer.