[gnome-main-menu] 01/02: Merge branch 'master' into wheezy-bpo

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch wheezy-bpo
in repository gnome-main-menu.

commit 3d1a553682d244e4e0e5f1a63b7177f1cc4b4fa1
Merge: 15e09f7 492ac64
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jul 8 00:32:54 2014 +0200

    Merge branch 'master' into wheezy-bpo
    
    Conflicts:
    	debian/changelog

 debian/changelog | 18 ++++++++++++++++++
 debian/control   |  8 ++++----
 debian/rules     |  2 +-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index aa10714,7cd3f4f..38468ee
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,27 @@@
++gnome-main-menu (1.8.0-2~bpo70+1) UNRELEASED; urgency=low
++
++  * Upload to wheezy-backports.
++
++ -- Mike Gabriel <sunweaver at debian.org>  Mon, 05 May 2014 17:14:11 +0200
++
+ gnome-main-menu (1.8.0-2) unstable; urgency=low
+ 
+   [ Vangelis Mouhtsis ]
+   * debian/rules:
+     + Replace on dh_install --list-missing -> --fail-missing.
+ 
+   [ Mike Gabriel ]
+   * debian/control:
+     + Fix several B-Ds for non-Linux platforms. (Closes: #751335).
+ 
+  -- Mike Gabriel <sunweaver at debian.org>  Thu, 12 Jun 2014 08:25:51 +0200
+ 
 +gnome-main-menu (1.8.0-1~bpo70+1) wheezy-backports; urgency=low
 +
 +  * Upload to wheezy-backports.
 +
 + -- Mike Gabriel <sunweaver at debian.org>  Mon, 05 May 2014 17:14:11 +0200
 +
  gnome-main-menu (1.8.0-1) unstable; urgency=low
  
    * Initial release. (Closes: #746716).

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/gnome-main-menu.git