[Pkg-xmpp-commits] [jabberd2] 01/01: Don't fail if defaults file is removed. Closes: #541743.

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script.

jas pushed a commit to branch master
in repository jabberd2.

commit 0e869a418aca45b10fdd8a113c722687a45d20f3
Author: Simon Josefsson <simon at josefsson.org>
Date:   Sun Sep 25 18:57:35 2016 +0200

    Don't fail if defaults file is removed.  Closes: #541743.
---
 debian/changelog | 6 ++++++
 debian/default   | 4 ----
 debian/init      | 3 +++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bbd58a3..81bdded 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jabberd2 (2.4.0-2) unstable; urgency=medium
+
+  * Don't fail if defaults file is removed.  Closes: #541743.
+
+ -- Simon Josefsson <simon at josefsson.org>  Sun, 25 Sep 2016 18:57:04 +0200
+
 jabberd2 (2.4.0-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/default b/debian/default
index be9828c..a2f249a 100644
--- a/debian/default
+++ b/debian/default
@@ -2,10 +2,6 @@
 # sourced by /etc/init.d/jabberd2
 # installed at /etc/default/jabberd2 by the maintainer scripts
 
-# user and group
-USER=jabber
-GROUP=jabber
-
 # run router
 ROUTER_RUN=1
 
diff --git a/debian/init b/debian/init
index d71be91..b874088 100644
--- a/debian/init
+++ b/debian/init
@@ -13,6 +13,9 @@
 
 set -e
 
+# user and group
+USER=jabber
+GROUP=jabber
 test -f /etc/default/jabberd2 && . /etc/default/jabberd2
 
 COMPONENTDPATH=/etc/jabberd2/component.d

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xmpp/jabberd2.git