aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2012-07-28 12:32:32 +0100
committerWilmer van der Gaast <wilmer@gaast.net>2012-07-28 12:32:32 +0100
commit809cd379e85beaa2117fe56f29d54cf91d4aef59 (patch)
tree0f67e7a224b6f91408df8cb52ea9d4ad70775d6b
parent5ffa4f74c458f6e5617d0756ce76fcf56aca3482 (diff)
Merge 3.0.5-1.1 NMU by gregor herrmann.
Fixes RC Debian bug http://bugs.debian.org/681146 .
-rw-r--r--debian/bitlbee-common.postrm2
-rw-r--r--debian/changelog11
2 files changed, 12 insertions, 1 deletions
diff --git a/debian/bitlbee-common.postrm b/debian/bitlbee-common.postrm
index de48e229..92465c4a 100644
--- a/debian/bitlbee-common.postrm
+++ b/debian/bitlbee-common.postrm
@@ -12,5 +12,5 @@ fi
update-rc.d bitlbee remove > /dev/null 2>&1 || true
rm -f /etc/default/bitlbee
-deluser --system --remove-home bitlbee || true
+deluser --system bitlbee || true
rm -rf /var/lib/bitlbee ## deluser doesn't seem to do this for homedirs in /var
diff --git a/debian/changelog b/debian/changelog
index 11e08f5c..b34cf5c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+bitlbee (3.0.5-1.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * Fix "fails to install, purge, and install again":
+ remove --remove-home option from deluser call in bitlbee-common.postrm.
+ The option needs perl-modules which is not guaranteed to be there, and the
+ directory gets removed manually anyway.
+ (Closes: #681146)
+
+ -- gregor herrmann <gregoa@debian.org> Thu, 26 Jul 2012 18:44:36 +0200
+
bitlbee (3.0.5-1) unstable; urgency=low
* New upstream release.