Changeset 5b94e9e


Ignore:
Timestamp:
2010-08-17T23:34:25Z (9 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
57782e4
Parents:
d20ea9f
Message:

Move scripts, debconf and /etc stuff to bitlbee-common and really have
*just* the binary in bitlbee{,-libpurple}. This should fix issues with
installing the package on a clean machine.

Location:
debian
Files:
1 added
3 edited
3 moved

Legend:

Unmodified
Added
Removed
  • debian/bitlbee-common.postinst

    rd20ea9f r5b94e9e  
    6565
    6666if [ -n "$2" -a "$BITLBEE_UPGRADE_DONT_RESTART" != "1" ]; then
    67         if which invoke-rc.d >/dev/null 2>&1; then
    68                 invoke-rc.d bitlbee restart
    69         else
    70                 /etc/init.d/bitlbee restart
    71         fi
     67        invoke-rc.d bitlbee restart
    7268fi
    7369
     
    9591
    9692if [ -z "$2" ]; then
    97         if which invoke-rc.d >/dev/null 2>&1; then
    98                 invoke-rc.d bitlbee start
    99         else
    100                 /etc/init.d/bitlbee start
    101         fi
     93        invoke-rc.d bitlbee start
    10294fi
  • debian/bitlbee.prerm

    rd20ea9f r5b94e9e  
    11#!/bin/sh -e
    22
    3 if [ "$1" = "upgrade" ]; then
    4         ## To prevent the help function from breaking in currently running
    5         ## BitlBee processes. Have to do it like this because dpkg-reconfigure
    6         ## looks a lot like an upgrade and we don't want to lose help.txt...
    7         if [ -e /usr/share/bitlbee/help.txt ]; then
    8                 rm -f /usr/share/bitlbee/help.upgrading
    9                 mv /usr/share/bitlbee/help.txt /usr/share/bitlbee/help.upgrading
    10         fi
    11 else
    12         if which invoke-rc.d >/dev/null 2>&1; then
    13                 invoke-rc.d bitlbee stop || exit 0
    14         else
    15                 /etc/init.d/bitlbee stop || exit 0
    16         fi
     3if [ "$1" != "upgrade" ]; then
     4        invoke-rc.d bitlbee stop || exit 0
    175fi
  • debian/changelog

    rd20ea9f r5b94e9e  
    1 bitlbee (1.3-0) unstable; urgency=low
     1bitlbee (1.3-1) unstable; urgency=low
    22
    33  * Setting some bogus version number, fix that later.
  • debian/rules

    rd20ea9f r5b94e9e  
    4141        rm -f build-stamp
    4242
    43         rm -rf build-arch-stamp debian/build-*
     43        rm -rf build-arch-stamp debian/build-* debian/bitlbee-libpurple.prerm
    4444        $(MAKE) distclean
    4545
     
    5252        dh_installdirs
    5353
    54         $(MAKE) -C debian/build-native install install-etc DESTDIR=`pwd`/debian/bitlbee
     54        $(MAKE) -C debian/build-native install DESTDIR=`pwd`/debian/bitlbee
     55        $(MAKE) -C debian/build-native install-etc DESTDIR=`pwd`/debian/bitlbee-common
    5556        $(MAKE) -C debian/build-native install-dev DESTDIR=`pwd`/debian/bitlbee-dev
    56         patch debian/bitlbee/etc/bitlbee/bitlbee.conf debian/patches/bitlbee.conf.diff
     57        patch debian/bitlbee-common/etc/bitlbee/bitlbee.conf debian/patches/bitlbee.conf.diff
    5758
    5859ifeq ($(BITLBEE_LIBPURPLE),1)
    59         $(MAKE) -C debian/build-libpurple install install-etc DESTDIR=`pwd`/debian/bitlbee-libpurple
    60         patch debian/bitlbee-libpurple/etc/bitlbee/bitlbee.conf debian/patches/bitlbee.conf.diff
     60        $(MAKE) -C debian/build-libpurple install DESTDIR=`pwd`/debian/bitlbee-libpurple
     61        ln -sf debian/bitlbee.prerm debian/bitlbee-libpurple.prerm
    6162endif
    6263
     
    7677        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
    7778        dh_installdebconf
    78         dh_installinit
    79 ifeq ($(BITLBEE_LIBPURPLE)$(DH_OPTIONS),1-a)
    80         cp -a debian/bitlbee/etc debian/bitlbee-libpurple
    81 endif
     79        dh_installinit --init-script=bitlbee
    8280        dh_installman
    8381        dh_strip
     
    8684        dh_fixperms
    8785        dh_installdeb
    88 ifeq ($(BITLBEE_LIBPURPLE)$(DH_OPTIONS),1-a)
    89         cp -a debian/bitlbee/DEBIAN/post* debian/bitlbee/DEBIAN/pre* debian/bitlbee-libpurple/DEBIAN
    90 endif
    9186        dh_shlibdeps
    9287ifdef BITLBEE_VERSION
Note: See TracChangeset for help on using the changeset viewer.