Changeset 57da960


Ignore:
Timestamp:
2011-12-10T22:43:10Z (12 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
8b39b1a
Parents:
06b5893
Message:

Skype module packaging.

Files:
3 added
6 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    r06b5893 r57da960  
    8585
    8686install-bin:
    87         mkdir -p $(DESTDIR)$(BINDIR)
    88         install -m 0755 $(OUTFILE) $(DESTDIR)$(BINDIR)/$(OUTFILE)
     87        mkdir -p $(DESTDIR)$(SBINDIR)
     88        install -m 0755 $(OUTFILE) $(DESTDIR)$(SBINDIR)/$(OUTFILE)
    8989
    9090uninstall-bin:
    91         rm -f $(DESTDIR)$(BINDIR)/$(OUTFILE)
     91        rm -f $(DESTDIR)$(SBINDIR)/$(OUTFILE)
    9292
    9393install-dev:
    … …  
    113113        -rmdir $(DESTDIR)$(ETCDIR)
    114114
    115 install-plugins:
     115install-plugins: install-plugin-otr install-plugin-skype
     116
     117install-plugin-otr:
    116118ifdef OTR_PI
    117119        mkdir -p $(DESTDIR)$(PLUGINDIR)
    118120        install -m 0755 otr.so $(DESTDIR)$(PLUGINDIR)
    119121endif
     122
     123install-plugin-skype:
    120124ifdef SKYPE_PI
    121125        mkdir -p $(DESTDIR)$(PLUGINDIR)
    122126        install -m 0755 skype.so $(DESTDIR)$(PLUGINDIR)
    123         mkdir -p $(DESTDIR)$(ETCDIR)/../skyped
     127        mkdir -p $(DESTDIR)$(ETCDIR)/../skyped $(DESTDIR)$(BINDIR)
    124128        install -m 0644 $(SRCDIR)protocols/skype/skyped.cnf $(DESTDIR)$(ETCDIR)/../skyped/skyped.cnf
    125129        install -m 0644 $(SRCDIR)protocols/skype/skyped.conf.dist $(DESTDIR)$(ETCDIR)/../skyped/skyped.conf
    126130        install -m 0755 $(SRCDIR)protocols/skype/skyped.py $(DESTDIR)$(BINDIR)/skyped
     131        make -C protocols/skype install-doc
    127132endif
    128133

  • configure

    r06b5893 r57da960  
    99
    1010prefix='/usr/local/'
    11 bindir='$prefix/sbin/'
     11bindir='$prefix/bin/'
     12sbindir='$prefix/sbin/'
    1213etcdir='$prefix/etc/bitlbee/'
    1314mandir='$prefix/share/man/'
    … …  
    5960--prefix=...    Directories to put files in             $prefix
    6061--bindir=...                                            $bindir
     62--sbindir=...                                           $sbindir
    6163--etcdir=...                                            $etcdir
    6264--mandir=...                                            $mandir
    … …  
    99101# Expand $prefix and get rid of double slashes
    100102bindir=`eval echo "$bindir/" | sed 's/\/\{1,\}/\//g'`
     103sbindir=`eval echo "$sbindir/" | sed 's/\/\{1,\}/\//g'`
    101104etcdir=`eval echo "$etcdir/" | sed 's/\/\{1,\}/\//g'`
    102105mandir=`eval echo "$mandir/" | sed 's/\/\{1,\}/\//g'`
    … …  
    117120PREFIX=$prefix
    118121BINDIR=$bindir
     122SBINDIR=$sbindir
    119123ETCDIR=$etcdir
    120124MANDIR=$mandir

  • debian/changelog

    r06b5893 r57da960  
     1bitlbee (3.0.4-0) unstable; urgency=low
     2
     3  * New upstream release.
     4  * Added bitlbee-plugin-skype and skyped packages, now part of BitlBee
     5    instead of a separate package.
     6  * Fixed dependencies of bitlbee-plugin-otr package to not break with
     7    binary MTUs. (Closes: #651612)
     8
     9 -- Wilmer van der Gaast <wilmer@gaast.net>  Sat, 10 Dec 2011 22:42:08 +0000
     10
    111bitlbee (3.0.3-1) unstable; urgency=low
    212

  • debian/control

    r06b5893 r57da960  
    6161Package: bitlbee-plugin-otr
    6262Architecture: any
    63 Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${bee:Version}) | bitlbee-libpurple (= ${bee:Version}), bitlbee-common (= ${bee:Version})
     63Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (>= ${bee:Version}) | bitlbee-libpurple (>= ${bee:Version}), bitlbee (<< ${bee:Version}.1~) | bitlbee-libpurple (<< ${bee:Version}.1~)
    6464Description: An IRC to other chat networks gateway (OTR plugin)
    6565 This program can be used as an IRC server which forwards everything you
    … …  
    6969 This package contains a plugin that adds support for Off-The-Record
    7070 encryption of instant messages.
     71
     72Package: bitlbee-plugin-skype
     73Architecture: any
     74Depends: ${shlibs:Depends}, ${misc:Depends}, bitlbee (>= ${bee:Version}) | bitlbee-libpurple (>= ${bee:Version}), bitlbee (<< ${bee:Version}.1~) | bitlbee-libpurple (<< ${bee:Version}.1~)
     75Recommends: skyped
     76Description: An IRC to other chat networks gateway (Skype plugin)
     77 This program can be used as an IRC server which forwards everything you
     78 say to people on other chat networks: Jabber (which includes Google Talk
     79 and Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
     80 .
     81 This package contains a plugin that adds support for the Skype IM network.
     82 You need to download and install the Skype client for this to work.
     83
     84Package: skyped
     85Architecture: any
     86Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.5), python-gnutls, python-skype (>=0.9.28.7)
     87Recommends: skype
     88Description: Daemon to control Skype remotely
     89 Daemon to control the GUI Skype client. Currently required to control Skype
     90 from the BitlBee IRC2IM gateway. Skyped and Skype can run on a different
     91 host than the BitlBee server, the communication is encrypted.
     92 .
     93 You need to download and install the Skype client for this to work.

  • debian/rules

    r06b5893 r57da960  
    1111BITLBEE_LIBPURPLE ?= 1
    1212BITLBEE_OTR ?= plugin
     13BITLBEE_SKYPE ?= plugin
    1314BITLBEE_CONFIGURE_FLAGS ?=
    1415DEBUG ?= 0
    … …  
    2728endif
    2829
     30ifneq ($(BITLBEE_SKYPE),plugin)
     31DH_OPTIONS += -Nbitlbee-plugin-skype -Nskyped
     32endif
     33
    2934build: build-stamp
    3035build-stamp:
    … …  
    3237
    3338        mkdir -p debian/build-native
    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)
     39        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)
    3540        $(MAKE) -C debian/build-native
    3641
    … …  
    6469        $(MAKE) -C debian/build-native install-etc install-doc DESTDIR=`pwd`/debian/bitlbee-common
    6570        $(MAKE) -C debian/build-native install-dev DESTDIR=`pwd`/debian/bitlbee-dev
    66         $(MAKE) -C debian/build-native install-plugins DESTDIR=`pwd`/debian/bitlbee-plugin-otr
     71        $(MAKE) -C debian/build-native install-plugin-otr DESTDIR=`pwd`/debian/bitlbee-plugin-otr
     72        $(MAKE) -C debian/build-native install-plugin-skype DESTDIR=`pwd`/debian/skyped
     73
     74        mkdir -p debian/bitlbee-plugin-skype/usr
     75        mv debian/skyped/usr/lib debian/bitlbee-plugin-skype/usr
    6776
    6877ifeq ($(BITLBEE_LIBPURPLE),1)

  • protocols/skype/Makefile

    r06b5893 r57da960  
    11-include ../../Makefile.settings
    22ifdef SRCDIR
    3 SRCDIR := $(SRCDIR)protocls/skype/
     3SRCDIR := $(SRCDIR)protocols/skype/
    44endif
    55
    … …  
    2323all: $(LIBS) $(MANPAGES)
    2424
    25 skype.$(SHARED_EXT): skype.c config.mak
     25skype.$(SHARED_EXT): $(SRCDIR)skype.c config.mak
    2626ifeq ($(BITLBEE),yes)
    27         $(CC) $(CFLAGS) $(SHARED_FLAGS) -o skype.$(SHARED_EXT) skype.c $(LDFLAGS)
     27        $(CC) $(CFLAGS) $(SHARED_FLAGS) -o skype.$(SHARED_EXT) $(SRCDIR)skype.c $(LDFLAGS)
    2828endif
    2929
    … …  
    4747endif
    4848
    49 client: client.c
     49client: $(SRCDIR)client.c
    5050
    5151autogen: configure.ac
    … …  
    5757
    5858distclean: clean
    59         rm -f config.log config.mak config.status
     59        rm -f config.log config.mak config.status skyped.1
    6060
    6161autoclean: distclean
    … …  
    103103        git shortlog -s -n |sed 's/.*\t//'> AUTHORS
    104104
    105 %.1: %.txt asciidoc.conf
    106         a2x --asciidoc-opts="-f asciidoc.conf" \
     105%.1: $(SRCDIR)%.txt $(SRCDIR)asciidoc.conf
     106        a2x --asciidoc-opts="-f $(SRCDIR)asciidoc.conf" \
    107107                -a bs_version=$(VERSION) -a bs_date=$(DATE) -f manpage $<
Note: See TracChangeset for help on using the changeset viewer.