[SCM] mate-desktop Debian package branch, wheezy-bpo, updated. debian/1.8.1+dfsg1-1-4-g5b50899

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-desktop.git;a=commitdiff;h=5cf5483

The following commit has been merged in the wheezy-bpo branch:
commit 5cf5483780c5321d969099354c695091afb9d98b
Merge: 4a828af1c16b652702d01e545b1326deacde28cb 911d8a23ba1238646594e1b054b5dd38839f6a6a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed May 21 09:33:57 2014 +0200

    Merge commit '911d8a23ba1238646594e1b054b5dd38839f6a6a' into wheezy-bpo
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog

 debian/changelog                        | 10 +++++++++-
 debian/patches/1001_fix-pkgconfig.patch | 33 ---------------------------------
 debian/patches/series                   |  1 -
 3 files changed, 9 insertions(+), 35 deletions(-)

diff --cc debian/changelog
index 226b278,038964b..71263c5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,17 @@@
- mate-desktop (1.8.0+dfsg1-5~bpo70+1) wheezy-backports; urgency=low
++mate-desktop (1.8.1+dfsg1-1~bpo70+1) wheezy-backports; urgency=low
 +
 +  * Upload to wheezy-backports.
 +
 + -- Mike Gabriel <sunweaver at debian.org>  Wed, 30 Apr 2014 14:52:16 +0200
 +
+ mate-desktop (1.8.1+dfsg1-1) unstable; urgency=low
+ 
+   * New upstream release.
+   * debian/patches:
+     + Drop 1001_fix-pkgconfig.patch. Applied upstream.
+ 
+  -- Mike Gabriel <sunweaver at debian.org>  Sun, 18 May 2014 23:34:16 +0200
+ 
  mate-desktop (1.8.0+dfsg1-5) unstable; urgency=low
  
    * debian/changelog:

-- 
mate-desktop Debian package