[SCM] mate-settings-daemon Debian package branch, wheezy-bpo, updated. debian/1.8.1-1-3-gb2b97b7

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-settings-daemon.git;a=commitdiff;h=cfc1a12

The following commit has been merged in the wheezy-bpo branch:
commit cfc1a12c330905e8d9f48b7cfe27fc70ea10ec1f
Merge: 6d2cadc76831451512c7654e576f35eecf9e52b1 fd27b053ee4b394ff49cb2ee5f3b84e987ea6ac6
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed May 21 09:51:28 2014 +0200

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

 debian/changelog | 17 ++++++++++++++++-
 debian/control   |  2 +-
 debian/rules     |  9 ++++++++-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 0738a83,c51ee6e..1bbfd88
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,18 +1,24 @@@
- mate-settings-daemon (1.8.0-3~bpo70+1) wheezy-backports; urgency=low
++mate-settings-daemon (1.8.1-1~bpo70+1) UNRELEASED; urgency=low
 +
 +  * Upload to wheezy-backports
 +
 + -- Mike Gabriel <sunweaver at debian.org>  Wed, 30 Apr 2014 16:39:45 +0200
 +
+ mate-settings-daemon (1.8.1-1) unstable; urgency=low
+ 
+   [ Mike Gabriel ]
+   * New upstream release.
+   * debian/control: 
+     + Versioned B-D: libmate-desktop-dev (>= 1.8.1).
+   * debian/rules:
+     + Remove files after build that we do not install into any bin:package.
+ 
+   [ Vangelis Mouhtsis ]
+   * debian/rules:
+     + Replace on dh_install --list-missing -> --fail-missing.
+ 
+  -- Mike Gabriel <sunweaver at debian.org>  Mon, 19 May 2014 08:33:41 +0200
+ 
  mate-settings-daemon (1.8.0-3) unstable; urgency=low
  
    * debian/rules:

-- 
mate-settings-daemon Debian package