[SCM] marco Debian package branch, wheezy-bpo, updated. debian/1.8.0+dfsg1-5-5-g477e991

[Mike Gabriel]

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

The following commit has been merged in the wheezy-bpo branch:
commit 46c29a654fe2878babedda61d60bf6ff61f239f0
Merge: 7b7cf58a4e959aeb1edf9d8dc9d6a6dc0a856d03 a1ce80f7372e74b8634a2e0b5155afa082346042
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Jun 7 14:35:30 2014 +0200

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

 debian/changelog   | 21 +++++++++++++++++++++
 debian/marco.prerm |  4 ++--
 debian/rules       |  3 ++-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 4b7d18d,542555e..7bfd5d7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,18 +1,30 @@@
++marco (1.8.0+dfsg1-5~bpo70+1) UNRELEASED; urgency=low
++
++  * Upload to wheezy-backports.
++
++ -- Mike Gabriel <sunweaver at debian.org>  Mon, 05 May 2014 15:09:11 +0200
++
+ marco (1.8.0+dfsg1-5) unstable; urgency=medium
+ 
+   [ Vangelis Mouhtsis ]
+   * debian/rules:
+     + Replace on dh_install --list-missing -> --fail-missing.
+     + Remove non-packaged *.la files after build.
+ 
+   [ Mike Gabriel ]
+   * debian/marco.prerm:
+     + Fix severe copy+paste flaw. We need to remove an alternative for
+       x-window-manager (not x-session-manager) and we remove marco (not
+       mate-session). (Closes: #749593).
+ 
+  -- Mike Gabriel <sunweaver at debian.org>  Fri, 30 May 2014 11:46:58 +0200
+ 
 +marco (1.8.0+dfsg1-4~bpo70+1) wheezy-backports; urgency=low
 +
 +  * Upload to wheezy-backports.
 +
 + -- Mike Gabriel <sunweaver at debian.org>  Mon, 05 May 2014 15:09:11 +0200
 +
  marco (1.8.0+dfsg1-4) unstable; urgency=low
  
    * debian/rules:

-- 
marco Debian package