[SCM] marco Debian package branch, wheezy-bpo, updated. debian/1.8.0+dfsg1-4-3-g7b7cf58

[Mike Gabriel]

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

The following commit has been merged in the wheezy-bpo branch:
commit f7f070e972f8df6eb2f304f1fb7d433b50da07ad
Merge: 9a49bd18821b8dc1d62e0587b8d3797bf99579f6 8f328ef08cac003075a1366498672f249700d93d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon May 5 15:09:01 2014 +0200

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

 debian/changelog      | 12 +++++++++++-
 debian/marco.postinst | 12 ++++++++++++
 debian/marco.prerm    |  9 +++++++++
 debian/rules          |  1 -
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 4708e3e,d03f672..efd4271
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,13 +1,19 @@@
- marco (1.8.0+dfsg1-3~bpo70+1) wheezy-backports; urgency=low
++marco (1.8.0+dfsg1-4~bpo70+1) UNRELEASED; urgency=low
 +
 +  * Upload to wheezy-backports.
 +
 + -- Mike Gabriel <sunweaver at debian.org>  Wed, 30 Apr 2014 16:30:32 +0200
 +
+ marco (1.8.0+dfsg1-4) unstable; urgency=low
+ 
+   * debian/rules:
+     + Fix copy+paste error in tarball repacking code.
+   * postinst/prerm:
+     + Register marco as x-window-manager with Debian's alternatives system.
+       (Closes: #746781).
+ 
+  -- Mike Gabriel <sunweaver at debian.org>  Mon, 05 May 2014 14:37:06 +0200
+ 
  marco (1.8.0+dfsg1-3) unstable; urgency=low
  
    * debian/patches:

-- 
marco Debian package