[SCM] mate-session-manager Debian package branch, wheezy-bpo, updated. debian/1.8.1-1_bpo70+1-7-g57578e7

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-session-manager.git;a=commitdiff;h=427aa90

The following commit has been merged in the wheezy-bpo branch:
commit 427aa908fc69dd0683bcd0c60f9d27589069267a
Merge: fb20f34859c2a39b28610d4ec4fd01788e5c6409 5ae6542ef83577b9f440172a78ab2feb1dd84e63
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon May 5 14:30:37 2014 +0200

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

 debian/changelog                     | 17 +++++++++++++++--
 debian/control                       |  2 +-
 debian/mate-session-manager.postinst |  8 ++++----
 debian/mate-session-manager.prerm    |  2 +-
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --cc debian/changelog
index e1c5d92,9334f92..319a566
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,15 +1,21 @@@
- mate-session-manager (1.8.1-1~bpo70+1) wheezy-backports; urgency=low
++mate-session-manager (1.8.1-2~bpo70+1) wheezy-backports; urgency=low
 +
 +  * Upload to wheezy-backports.
 +
-  -- Mike Gabriel <sunweaver at debian.org>  Wed, 30 Apr 2014 16:52:43 +0200
++ -- Mike Gabriel <sunweaver at debian.org>  Mon, 05 May 2014 14:30:25 +0200
++
+ mate-session-manager (1.8.1-2) unstable; urgency=medium
+ 
+   [ Mike Gabriel ]
+   * postinst/prerm:
+     + Tab'ify package scripts.
+ 
+   [ Stefano Karapetsas ]
+   * debian/control:
+     + Modify B-D: Use [linux-any] for libsystemd-login-dev. Allow build with
+       non-Linux kernels.
+ 
+  -- Mike Gabriel <sunweaver at debian.org>  Mon, 05 May 2014 14:28:07 +0200
  
  mate-session-manager (1.8.1-1) unstable; urgency=low
  

-- 
mate-session-manager Debian package