[pkg-fso-commits] [nodm] 03/50: import NMU upload unstable (0.11-1.3)

[Mike Gabriel]

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

sunweaver pushed a commit to branch master
in repository nodm.

commit 2a7f72154743906a37a08d0711bd3eb9168b194b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Aug 27 11:22:22 2014 +0200

    import NMU upload unstable (0.11-1.3)
    
    Conflicts (changelog stanza worked in):
    	debian/changelog
---
 debian/changelog   | 9 +++++++++
 debian/nodm.config | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 44599ea..6c18176 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,15 @@ nodm (0.11-2) unstable; urgency=low
 
  -- Enrico Zini <enrico at debian.org>  Tue, 08 Nov 2011 17:09:38 +0100
 
+nodm (0.11-1.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "subprocess installed post-installation script returned error exit
+    status 10": nodm.config: don't fail if the nodm/xinit debconf value was
+    already unregistered. (Closes: #642903)
+
+ -- gregor herrmann <gregoa at debian.org>  Sat, 15 Sep 2012 16:47:18 +0200
+
 nodm (0.11-1.2) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/nodm.config b/debian/nodm.config
index 08b88ac..685e429 100644
--- a/debian/nodm.config
+++ b/debian/nodm.config
@@ -17,7 +17,8 @@ if [ -s /etc/default/nodm ] ; then
 	if [ -n "$2" ] && dpkg --compare-versions "$2" lt "0.10"
 	then
 		# After 0.10 nodm/xinit is not needed anymore
-		db_unregister nodm/xinit
+		# don't fail if it was unregistered before
+		db_unregister nodm/xinit || true
 	fi
 
 	if [ -n "$2" ] && dpkg --compare-versions "$2" lt "0.5"

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-fso/nodm.git