Changeset 5b94e9e

Timestamp:

2010-08-17T23:34:25Z (14 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:

• bitlbee-common.init (moved) (moved from debian/bitlbee.init)
• bitlbee-common.postinst (moved) (moved from debian/bitlbee.postinst) (2 diffs)
• bitlbee-common.postrm (moved) (moved from debian/bitlbee.postrm)
• bitlbee-common.prerm (added)
• bitlbee.prerm (modified) (1 diff)
• changelog (modified) (1 diff)
• rules (modified) (4 diffs)

debian/bitlbee-common.postinst

@@ -65 +65 @@
 
 if [ -n "$2" -a "$BITLBEE_UPGRADE_DONT_RESTART" != "1" ]; then
-        if which invoke-rc.d >/dev/null 2>&1; then
-                invoke-rc.d bitlbee restart
-        else
-                /etc/init.d/bitlbee restart
-        fi
+        invoke-rc.d bitlbee restart
 fi
 
@@ -95 +91 @@
 
 if [ -z "$2" ]; then
-        if which invoke-rc.d >/dev/null 2>&1; then
-                invoke-rc.d bitlbee start
-        else
-                /etc/init.d/bitlbee start
-        fi
+        invoke-rc.d bitlbee start
 fi

debian/bitlbee.prerm

@@ -1 +1 @@
 #!/bin/sh -e
 
-if [ "$1" = "upgrade" ]; then
-        ## To prevent the help function from breaking in currently running
-        ## BitlBee processes. Have to do it like this because dpkg-reconfigure
-        ## looks a lot like an upgrade and we don't want to lose help.txt...
-        if [ -e /usr/share/bitlbee/help.txt ]; then
-                rm -f /usr/share/bitlbee/help.upgrading
-                mv /usr/share/bitlbee/help.txt /usr/share/bitlbee/help.upgrading
-        fi
-else
-        if which invoke-rc.d >/dev/null 2>&1; then
-                invoke-rc.d bitlbee stop || exit 0
-        else
-                /etc/init.d/bitlbee stop || exit 0
-        fi
+if [ "$1" != "upgrade" ]; then
+        invoke-rc.d bitlbee stop || exit 0
 fi

debian/changelog

@@ -1 @@
-bitlbee (1.3-0) unstable; urgency=low
+bitlbee (1.3-1) unstable; urgency=low
 
   * Setting some bogus version number, fix that later.

debian/rules

@@ -41 +41 @@
         rm -f build-stamp
 
-        rm -rf build-arch-stamp debian/build-*
+        rm -rf build-arch-stamp debian/build-* debian/bitlbee-libpurple.prerm
         $(MAKE) distclean
 
@@ -52 +52 @@
         dh_installdirs
 
-        $(MAKE) -C debian/build-native install install-etc DESTDIR=`pwd`/debian/bitlbee
+        $(MAKE) -C debian/build-native install DESTDIR=`pwd`/debian/bitlbee
+        $(MAKE) -C debian/build-native install-etc DESTDIR=`pwd`/debian/bitlbee-common
         $(MAKE) -C debian/build-native install-dev DESTDIR=`pwd`/debian/bitlbee-dev
-        patch debian/bitlbee/etc/bitlbee/bitlbee.conf debian/patches/bitlbee.conf.diff
+        patch debian/bitlbee-common/etc/bitlbee/bitlbee.conf debian/patches/bitlbee.conf.diff
 
 ifeq ($(BITLBEE_LIBPURPLE),1)
-        $(MAKE) -C debian/build-libpurple install install-etc DESTDIR=`pwd`/debian/bitlbee-libpurple
-        patch debian/bitlbee-libpurple/etc/bitlbee/bitlbee.conf debian/patches/bitlbee.conf.diff
+        $(MAKE) -C debian/build-libpurple install DESTDIR=`pwd`/debian/bitlbee-libpurple
+        ln -sf debian/bitlbee.prerm debian/bitlbee-libpurple.prerm
 endif
 
@@ -76 +77 @@
         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
         dh_installdebconf
-        dh_installinit
-ifeq ($(BITLBEE_LIBPURPLE)$(DH_OPTIONS),1-a)
-        cp -a debian/bitlbee/etc debian/bitlbee-libpurple
-endif
+        dh_installinit --init-script=bitlbee
         dh_installman
         dh_strip
@@ -86 +84 @@
         dh_fixperms
         dh_installdeb
-ifeq ($(BITLBEE_LIBPURPLE)$(DH_OPTIONS),1-a)
-        cp -a debian/bitlbee/DEBIAN/post* debian/bitlbee/DEBIAN/pre* debian/bitlbee-libpurple/DEBIAN
-endif
         dh_shlibdeps
 ifdef BITLBEE_VERSION