Some Debian package fixes. If nothing else comes up, this will be 1.2-2.

(Not sure if I will roll back the non-Debian changes...)

4 files changed, 29 insertions, 5 deletions

diff --git a/debian/README.Debian b/debian/README.Debian
index 6056f488..b5a514c0 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -6,7 +6,21 @@ want to use this, you can disable the init scripts (best way to do this is
 by editing /etc/default/bitlbee) and restore the inetd.conf entry. This
 should be necessary only once, it won't be touched during upgrades.
 
---------------------------------------------------------------------------
+Another important change in BitlBee 1.2 is the file format used for your
+personal settings. Everything's now saved in a single .xml (per account,
+of course) file instead of $nick.accounts and $nick.nicks. One advantage
+of this new format is that the passwords are actually encrypted instead of
+just vaguely obfuscated. BitlBee can still read the old files, and will
+save things in the new format when you save/disconnect. After that, you
+can safely remove the old-style files (this is recommended).
+
+I tried making this transition (the new file format but especially, in this
+case, the inetd->forkdaemon mode change) as smooth as possible, but I'm
+aware that many BitlBee users will have their own hacks already to run the
+program. I hope the package won't break any of this for anyone. 1.2-2
+should fix at least some of the issues.
+
+---------------------------------------------------------------------------
 
 Debconf should have asked you on what port you want BitlBee to run. If it
 did not, the port number should be 6667 or 6668. (6668 if you already got
diff --git a/debian/changelog b/debian/changelog
index 2cf6510c..0eb05525 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+bitlbee (1.2-2) unstable; urgency=low
+
+  * Fixed some packaging issues reported by IRC and e-mail. (Closes: #472373)
+  * Not ready yet.
+
+ -- Wilmer van der Gaast <wilmer@gaast.net>  Sun, 23 Mar 2008 21:51:57 +0000
+
 bitlbee (1.2-1) unstable; urgency=low
 
   * New upstream release. (Closes: #325017, #386914, #437515)
diff --git a/debian/conffiles b/debian/conffiles
index 2ccc958d..dcb4078e 100644
--- a/debian/conffiles
+++ b/debian/conffiles
@@ -1,2 +1,3 @@
 /etc/bitlbee/motd.txt
 /etc/bitlbee/bitlbee.conf
+/etc/init.d/bitlbee
diff --git a/debian/postinst b/debian/postinst
index c4edb8e8..1a906474 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -13,17 +13,19 @@ update-rc.d bitlbee defaults > /dev/null 2>&1
 BITLBEE_OPTS=-F
 BITLBEE_DISABLED=0
 BITLBEE_UPGRADE_DONT_RESTART=0
-[ -r /etc/default/bitlbee ] && source /etc/default/bitlbee
+[ -r /etc/default/bitlbee ] && . /etc/default/bitlbee
 
-if [ "$BITLBEE_DISABLED" = "0" ] && expr "$2" : '0\..*' > /dev/null || expr "$2" : '1\.0\..*' > /dev/null; then
-	## In case it's still there (if we're upgrading right now)
+if [ "$BITLBEE_DISABLED" = "0" ] && type update-inetd > /dev/null 2> /dev/null &&
+   ( expr "$2" : '0\..*' > /dev/null || expr "$2" : '1\.0\..*' > /dev/null ); then
+	## Make sure the inetd entry is gone (can still be there from a
+	## previous version.
 	update-inetd --remove '.*/usr/sbin/bitlbee'
 	if grep -q /usr/sbin/bitlbee /etc/inetd.conf 2> /dev/null; then
 		# Thanks for breaking update-inetd! (bugs.debian.org/311111)
 		# I hope that it works at least with xinetd, because this
 		# emergency hack doesn't:
 		perl -pi -e 's:^[^#].*/usr/sbin/bitlbee$:## Now using daemon mode\: # $&:' /etc/inetd.conf
-		killall -HUP inetd
+		killall -HUP inetd || true
 	fi
 fi