[SCM] mate-polkit Debian package branch, wheezy-bpo, updated. debian/1.8.0+dfsg1-2_bpo70+1-5-g5fd3c28

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-polkit.git;a=commitdiff;h=547160b

The following commit has been merged in the wheezy-bpo branch:
commit 547160b9e39643a824c4ce232234651ead3afdd8
Merge: 6514bf46f11e51ee54e0364d25cd242c87a0f6bf 545b4bb8d0c5a181652a73f0efc8969588198818
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue May 6 18:01:54 2014 +0200

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

 debian/changelog | 12 +++++++++++-
 debian/control   |  5 +++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index dfb41c6,9f089ff..6cb9fca
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,13 +1,19 @@@
- mate-polkit (1.8.0+dfsg1-2~bpo70+1) UNRELEASED; urgency=low
++mate-polkit (1.8.0+dfsg1-3~bpo70+1) UNRELEASED; urgency=low
 +
 +  * Upload to wheezy-backports.
 +
 + -- Mike Gabriel <sunweaver at debian.org>  Wed, 30 Apr 2014 16:22:15 +0200
 +
+ mate-polkit (1.8.0+dfsg1-3) unstable; urgency=low
+ 
+   * debian/control:
+     + Binary package mate-polkit-common breaks mate-polkit (<< 1.8.0).
+       (LP: #1270567).
+     + Add versioned Breaks:/Replaces: for formerly named bin:package
+       libmatepolkit.
+ 
+  -- Mike Gabriel <sunweaver at debian.org>  Tue, 06 May 2014 17:56:10 +0200
+ 
  mate-polkit (1.8.0+dfsg1-2) unstable; urgency=low
  
    * debian/copyright:

-- 
mate-polkit Debian package