Changeset f60dc5c for debian


Ignore:
Timestamp:
2016-07-09T01:01:15Z (3 years ago)
Author:
dequis <dx@…>
Branches:
master
Children:
9ae8f82
Parents:
7949d5a (diff), 60d6c03 (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:

Merge branch 'develop'

Location:
debian
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • debian/bitlbee-common.postinst

    r7949d5a rf60dc5c  
    99
    1010CONFDIR=/var/lib/bitlbee/
    11 
    12 update-rc.d bitlbee defaults > /dev/null 2>&1
    1311
    1412## Load default option. Don't want to put this in debconf (yet?)
     
    9290fi
    9391
    94 if [ -z "$2" ]; then
    95         invoke-rc.d bitlbee start
    96 fi
     92#DEBHELPER#
  • debian/bitlbee-common.postrm

    r7949d5a rf60dc5c  
    33set -e
    44
    5 [ "$1" = "purge" ] || exit 0
    6 
    7 if [ -e /usr/share/debconf/confmodule ]; then
    8         . /usr/share/debconf/confmodule;
    9         db_purge;
     5if [ "$1" = "purge" ]; then
     6        rm -f /etc/default/bitlbee
     7        deluser --system bitlbee || true
     8        rm -rf /var/lib/bitlbee ## deluser doesn't seem to do this for homedirs in /var
    109fi
    1110
    12 update-rc.d bitlbee remove > /dev/null 2>&1 || true
    13 rm -f /etc/default/bitlbee
    14 
    15 deluser --system bitlbee || true
    16 rm -rf /var/lib/bitlbee ## deluser doesn't seem to do this for homedirs in /var
     11#DEBHELPER#
  • debian/bitlbee-common.prerm

    r7949d5a rf60dc5c  
    1111                mv /usr/share/bitlbee/help.txt /usr/share/bitlbee/help.upgrading
    1212        fi
    13 else
    14         invoke-rc.d bitlbee stop
    1513fi
     14
     15#DEBHELPER#
  • debian/bitlbee.prerm

    r7949d5a rf60dc5c  
    66        invoke-rc.d bitlbee stop
    77fi
     8
     9#DEBHELPER#
  • debian/control

    r7949d5a rf60dc5c  
    55Uploaders: Jelmer Vernooij <jelmer@debian.org>
    66Standards-Version: 3.9.8
    7 Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls28-dev | libgnutls-dev | gnutls-dev, po-debconf, libpurple-dev, libotr5-dev, debhelper (>= 6.0.7~)
     7Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls28-dev | libgnutls-dev | gnutls-dev, po-debconf, libpurple-dev, libotr5-dev, debhelper (>= 6.0.7~), dh-systemd (>= 1.5) | debhelper (<< 9.20131227)
    88Homepage: http://www.bitlbee.org/
    99Vcs-Git: https://github.com/bitlbee/bitlbee
  • debian/rules

    r7949d5a rf60dc5c  
    3939
    4040CONFIGURE_OVERRIDES:=CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
     41
     42HAS_DH_SYSTEMD:=$(shell dpkg-query -W -f='$${Status}' dh-systemd 2>/dev/null | grep -c "ok installed")
    4143
    4244build: build-stamp
     
    8183        $(MAKE) -C debian/build-native install-plugin-skype DESTDIR=`pwd`/debian/skyped
    8284
     85ifeq ($(HAS_DH_SYSTEMD),1)
     86        $(MAKE) -C debian/build-native install-systemd DESTDIR=`pwd`/debian/bitlbee-common
     87endif
     88
    8389ifneq ($(BITLBEE_SKYPE),0)
    8490        mkdir -p debian/bitlbee-plugin-skype/usr
     
    108114        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
    109115        dh_installdebconf
     116ifeq ($(HAS_DH_SYSTEMD),1)
     117        dh_systemd_enable
    110118        dh_installinit --init-script=bitlbee
     119        dh_systemd_start
     120else
     121        dh_installinit --init-script=bitlbee
     122endif
    111123        dh_installman
    112124        dh_lintian
Note: See TracChangeset for help on using the changeset viewer.