[SCM] mate-screensaver Debian package branch, wheezy-bpo, updated. debian/1.8.0-5-10-gf570d4b

[Mike Gabriel]

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

The following commit has been merged in the wheezy-bpo branch:
commit d9491525744f481cbb583d972072ebb56c25456a
Merge: da0dd6e8c5c2b1ec03427c3631eff2b70c65d1b8 11be389955f546e27c33e451023ec0f94f7a2677
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jul 7 21:57:33 2014 +0200

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

 debian/changelog                                 | 14 ++++++++++++++
 debian/patches/1003_proper-locale-datetime.patch | 23 +++++++++++++++++++++++
 debian/patches/series                            |  1 +
 3 files changed, 38 insertions(+)

diff --cc debian/changelog
index 1c8aa7c,8382075..7b48ba6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,23 @@@
++mate-screensaver (1.8.0-4~bpo70+1) UNRELEASED; urgency=low
++
++  * Upload to wheezy-backports.
++
++ -- Mike Gabriel <sunweaver at debian.org>  Thu, 12 Jun 2014 08:37:32 +0200
++
+ mate-screensaver (1.8.0-5) unstable; urgency=low
+ 
+   * debian/patches:
+     + Add 1003_proper-locale-datetime.patch. Use locale system to obtain
+       correct date and time format for screensaver clock. (Closes: #746019).
+ 
+  -- Mike Gabriel <sunweaver at debian.org>  Wed, 11 Jun 2014 22:24:50 +0200
+ 
 +mate-screensaver (1.8.0-4~bpo70+1) wheezy-backports; urgency=low
 +
 +  * Upload to wheezy-backports.
 +
 + -- Mike Gabriel <sunweaver at debian.org>  Thu, 12 Jun 2014 08:37:32 +0200
 +
  mate-screensaver (1.8.0-4) unstable; urgency=low
  
    [ Vangelis Mouhtsis ]

-- 
mate-screensaver Debian package