xinit: Changes to 'debian-unstable'

[Timo Aaltonen <tjaalton@moszumanska.debian.org>]

 debian/changelog      |    7 +++++++
 debian/xinit.postinst |    3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 091916933d19240c60b1eeaff8b61139bb3c6d6e
Author: Timo Aaltonen <tjaalton@debian.org>
Date:   Fri Apr 22 06:53:35 2016 +0300

    postinst: Check that xinitrc exists before trying to chmod it. (LP: #1562033)

diff --git a/debian/changelog b/debian/changelog
index 68ad392..513c3e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xinit (1.3.4-4) UNRELEASED; urgency=medium
+
+  * postinst: Check that xinitrc exists before trying to chmod it. (LP:
+    #1562033)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Fri, 22 Apr 2016 06:53:18 +0300
+
 xinit (1.3.4-3) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/xinit.postinst b/debian/xinit.postinst
index e0d08f6..6555210 100644
--- a/debian/xinit.postinst
+++ b/debian/xinit.postinst
@@ -8,7 +8,8 @@ set -e
 case "$1" in
     configure)
 	if dpkg --compare-versions "$2" lt-nl "1.3.4-2~"; then
-            if ! dpkg-statoverride --list /etc/X11/xinit/xinitrc >/dev/null 2>&1; then
+            if ! dpkg-statoverride --list /etc/X11/xinit/xinitrc >/dev/null 2>&1 && \
+                [ -e /etc/X11/xinit/xinitrc ]; then
                 chmod 0755 /etc/X11/xinit/xinitrc
             fi
 	fi