[SCM] mate-screensaver Debian package branch, wheezy-bpo, updated. debian/1.8.0-2_bpo70+1-4-g1c77661

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-screensaver.git;a=commitdiff;h=e3ea55d

The following commit has been merged in the wheezy-bpo branch:
commit e3ea55dc72a8e00b5fb7fc3aeb88ea18549852b9
Merge: 637dd1294de0897175deea982625b15900823d18 0f7aa7c748bd565aba9351b8387b85bed5b6824d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun May 11 22:22:19 2014 +0200

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

 debian/changelog | 12 ++++++++++--
 debian/control   |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index b01c993,8eab3d2..4818faf
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,10 +1,16 @@@
- mate-screensaver (1.8.0-2~bpo70+1) wheezy-backports; urgency=low
++mate-screensaver (1.8.0-3~bpo70+1) wheezy-backports; urgency=low
 +
 +  * Upload to wheezy-backports.
 +
-  -- Mike Gabriel <sunweaver at debian.org>  Mon, 05 May 2014 10:05:34 +0200
++ -- Mike Gabriel <sunweaver at debian.org>  Mon, 05 May 2014 16:34:20 +0200
++
+ mate-screensaver (1.8.0-3) unstable; urgency=low
+ 
+   * debian/control:
+     + Add Breaks: field to mate-screensaver. The package breaks
+       mate-screensaver-common (<< 1.8.0-1).
+ 
+  -- Mike Gabriel <sunweaver at debian.org>  Mon, 05 May 2014 16:29:20 +0200
  
  mate-screensaver (1.8.0-2) unstable; urgency=low
  

-- 
mate-screensaver Debian package