[mate-desktop] 01/02: Merge branch 'master' into debian/experimental

[Mike Gabriel]

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

sunweaver pushed a commit to branch debian/experimental
in repository mate-desktop.

commit f56a8e4d75a7bec7e31511d5913f95e3c722cd6f
Merge: d95b305 3110f68
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Apr 6 10:26:47 2015 +0200

    Merge branch 'master' into debian/experimental
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog

 debian/changelog                                   | 11 ++++
 ...0001_fix-pkexec-calls-in-desktop-launcher.patch | 64 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 76 insertions(+)

diff --cc debian/changelog
index a698786,526e2c7..6cc4256
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,14 +1,22 @@@
 +mate-desktop (1.8.2+dfsg1-1) experimental; urgency=medium
 +
 +  * New upstream release.
 +    - Including the GLib >= 2.43 compatibility patch. (Closes: #779570,
 +      LP:#1426327).
 +
 + -- Mike Gabriel <sunweaver at debian.org>  Fri, 13 Mar 2015 16:19:52 +0100
 +
+ mate-desktop (1.8.1+dfsg1-3) unstable; urgency=medium
+ 
+   [ Mike Gabriel ]
+   * debian/patches:
+     + Add 0001_fix-pkexec-calls-in-desktop-launcher.patch. In
+       mate-desktop-item.c: Add a child watch if "do not reap child" flag is set.
+       This avoids double forking with desktop files that have "exec pkexec ..."
+       inside. (Closes: #781246).
+ 
+  -- Mike Gabriel <sunweaver at debian.org>  Sat, 28 Mar 2015 14:53:31 +0100
+ 
  mate-desktop (1.8.1+dfsg1-2) unstable; urgency=medium
  
    [ Vangelis Mouhtsis ]

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