Changeset f60dc5c

Timestamp:

2016-07-09T01:01:15Z (8 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'

Files:

• debian/bitlbee-common.postinst (modified) (2 diffs)
• debian/bitlbee-common.postrm (modified) (1 diff)
• debian/bitlbee-common.prerm (modified) (1 diff)
• debian/bitlbee.prerm (modified) (1 diff)
• debian/control (modified) (1 diff)
• debian/rules (modified) (3 diffs)
• init/bitlbee.service.in (modified) (1 diff)
• protocols/purple/purple.c (modified) (1 diff)

debian/bitlbee-common.postinst

@@ -9 +9 @@
 
 CONFDIR=/var/lib/bitlbee/
-
-update-rc.d bitlbee defaults > /dev/null 2>&1
 
 ## Load default option. Don't want to put this in debconf (yet?)
@@ -92 +90 @@
 fi
 
-if [ -z "$2" ]; then
-        invoke-rc.d bitlbee start
-fi
+#DEBHELPER#

debian/bitlbee-common.postrm

@@ -3 +3 @@
 set -e
 
-[ "$1" = "purge" ] || exit 0
-
-if [ -e /usr/share/debconf/confmodule ]; then
-        . /usr/share/debconf/confmodule;
-        db_purge;
+if [ "$1" = "purge" ]; then
+        rm -f /etc/default/bitlbee
+        deluser --system bitlbee || true
+        rm -rf /var/lib/bitlbee ## deluser doesn't seem to do this for homedirs in /var
 fi
 
-update-rc.d bitlbee remove > /dev/null 2>&1 || true
-rm -f /etc/default/bitlbee
-
-deluser --system bitlbee || true
-rm -rf /var/lib/bitlbee ## deluser doesn't seem to do this for homedirs in /var
+#DEBHELPER#

debian/bitlbee-common.prerm

@@ -11 +11 @@
                 mv /usr/share/bitlbee/help.txt /usr/share/bitlbee/help.upgrading
         fi
-else
-        invoke-rc.d bitlbee stop
 fi
+
+#DEBHELPER#

debian/bitlbee.prerm

@@ -6 +6 @@
         invoke-rc.d bitlbee stop
 fi
+
+#DEBHELPER#

debian/control

@@ -5 +5 @@
 Uploaders: Jelmer Vernooij <jelmer@debian.org>
 Standards-Version: 3.9.8
-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~)
+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~), dh-systemd (>= 1.5) | debhelper (<< 9.20131227)
 Homepage: http://www.bitlbee.org/
 Vcs-Git: https://github.com/bitlbee/bitlbee

debian/rules

@@ -39 +39 @@
 
 CONFIGURE_OVERRIDES:=CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+
+HAS_DH_SYSTEMD:=$(shell dpkg-query -W -f='$${Status}' dh-systemd 2>/dev/null | grep -c "ok installed")
 
 build: build-stamp
@@ -81 +83 @@
         $(MAKE) -C debian/build-native install-plugin-skype DESTDIR=`pwd`/debian/skyped
 
+ifeq ($(HAS_DH_SYSTEMD),1)
+        $(MAKE) -C debian/build-native install-systemd DESTDIR=`pwd`/debian/bitlbee-common
+endif
+
 ifneq ($(BITLBEE_SKYPE),0)
         mkdir -p debian/bitlbee-plugin-skype/usr
@@ -108 +114 @@
         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
         dh_installdebconf
+ifeq ($(HAS_DH_SYSTEMD),1)
+        dh_systemd_enable
         dh_installinit --init-script=bitlbee
+        dh_systemd_start
+else
+        dh_installinit --init-script=bitlbee
+endif
         dh_installman
         dh_lintian

init/bitlbee.service.in

@@ -5 +5 @@
 [Service]
 ExecStart=@sbindir@bitlbee -F -n
+KillMode=process
 
 [Install]

protocols/purple/purple.c

@@ -1452 +1452 @@
         dir = g_strdup_printf("%s/purple", global.conf->configdir);
         purple_util_set_user_dir(dir);
+        g_free(dir);
+
+        dir = g_strdup_printf("%s/purple", global.conf->plugindir);
+        purple_plugins_add_search_path(dir);
         g_free(dir);