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.

7 files changed, 25 insertions, 37 deletions

diff --git a/debian/bitlbee.init b/debian/bitlbee-common.init
index be1dcd66..be1dcd66 100644
--- a/debian/bitlbee.init
+++ b/debian/bitlbee-common.init
diff --git a/debian/bitlbee.postinst b/debian/bitlbee-common.postinst
index db541f6c..c91fa89f 100644
--- a/debian/bitlbee.postinst
+++ b/debian/bitlbee-common.postinst
@@ -64,11 +64,7 @@ if [ -e /usr/share/bitlbee/help.upgrading ]; then
 fi
 
 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
 
 ## If we're upgrading, we'll probably skip this next part
@@ -94,9 +90,5 @@ else
 fi
 
 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
diff --git a/debian/bitlbee.postrm b/debian/bitlbee-common.postrm
index 5c3b4b2e..5c3b4b2e 100644
--- a/debian/bitlbee.postrm
+++ b/debian/bitlbee-common.postrm
diff --git a/debian/bitlbee-common.prerm b/debian/bitlbee-common.prerm
new file mode 100644
index 00000000..50a49bee
--- /dev/null
+++ b/debian/bitlbee-common.prerm
@@ -0,0 +1,13 @@
+#!/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
+	invoke-rc.d bitlbee stop || exit 0
+fi
diff --git a/debian/bitlbee.prerm b/debian/bitlbee.prerm
index 687c2cc1..c61db24b 100644
--- a/debian/bitlbee.prerm
+++ b/debian/bitlbee.prerm
@@ -1,17 +1,5 @@
 #!/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
diff --git a/debian/changelog b/debian/changelog
index 70f1ed47..9606800a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-bitlbee (1.3-0) unstable; urgency=low
+bitlbee (1.3-1) unstable; urgency=low
 
   * Setting some bogus version number, fix that later.
   * Now using debhelper to improve maintainability.
diff --git a/debian/rules b/debian/rules
index a93f4db4..0b8a4dd6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,7 +40,7 @@ clean:
 	dh_testroot
 	rm -f build-stamp
 
-	rm -rf build-arch-stamp debian/build-*
+	rm -rf build-arch-stamp debian/build-* debian/bitlbee-libpurple.prerm
 	$(MAKE) distclean
 
 	dh_clean
@@ -51,13 +51,14 @@ install: build
 	dh_clean -k
 	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
 
 	mkdir -p debian/bitlbee-common/usr
@@ -75,19 +76,13 @@ binary-common:
 	# Hardy and Lenny are deprecated.
 	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
 	dh_link
 	dh_compress
 	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
 	dh_gencontrol -- -v1:$(BITLBEE_VERSION)-0  -Vbee:Version=1:$(BITLBEE_VERSION)-0