diff -Nru warmux-11.04.1+repack2/debian/changelog warmux-11.04.1+repack2/debian/changelog
--- warmux-11.04.1+repack2/debian/changelog	2016-04-23 00:31:20.000000000 +0000
+++ warmux-11.04.1+repack2/debian/changelog	2016-07-01 16:48:34.000000000 +0000
@@ -1,14 +1,9 @@
-warmux (1:11.04.1+repack2-1build2) yakkety; urgency=medium
+warmux (1:11.04.1+repack2-2) unstable; urgency=medium
 
-  * No-change rebuild for libpng soname change.
+  * Drop Debian menu entry.
+  * Fix FTBFS with GCC 6. (Closes: #811616)
 
- -- Matthias Klose <doko@ubuntu.com>  Sat, 23 Apr 2016 00:31:20 +0000
-
-warmux (1:11.04.1+repack2-1build1) utopic; urgency=medium
-
-  * Rebuild against libsdl-gfx1.2-5.
-
- -- Colin Watson <cjwatson@ubuntu.com>  Thu, 01 May 2014 11:27:50 +0100
+ -- Felix Geyer <fgeyer@debian.org>  Fri, 01 Jul 2016 18:48:33 +0200
 
 warmux (1:11.04.1+repack2-1) unstable; urgency=medium
 
diff -Nru warmux-11.04.1+repack2/debian/control warmux-11.04.1+repack2/debian/control
--- warmux-11.04.1+repack2/debian/control	2014-04-26 11:21:42.000000000 +0000
+++ warmux-11.04.1+repack2/debian/control	2016-07-01 16:48:12.000000000 +0000
@@ -17,8 +17,8 @@
                libxml2-dev
 Standards-Version: 3.9.5
 Homepage: http://download.gna.org/warmux/
-Vcs-Git: git://anonscm.debian.org/pkg-games/warmux/
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/warmux.git;a=summary
+Vcs-Git: https://anonscm.debian.org/git/pkg-games/warmux.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/warmux.git/
 
 Package: warmux
 Architecture: any
diff -Nru warmux-11.04.1+repack2/debian/patches/10_fix_build_gcc60.patch warmux-11.04.1+repack2/debian/patches/10_fix_build_gcc60.patch
--- warmux-11.04.1+repack2/debian/patches/10_fix_build_gcc60.patch	1970-01-01 00:00:00.000000000 +0000
+++ warmux-11.04.1+repack2/debian/patches/10_fix_build_gcc60.patch	2016-07-01 15:34:27.000000000 +0000
@@ -0,0 +1,11 @@
+--- a/src/interface/weapon_menu.cpp
++++ b/src/interface/weapon_menu.cpp
+@@ -391,7 +391,7 @@
+ Weapon * WeaponsMenu::UpdateCurrentOverflyItem(const Polygon * poly)
+ {
+   if (!show)
+-    return false;
++    return 0;
+   const std::vector<PolygonItem *>& items = poly->GetItem();
+   WeaponMenuItem * tmp;
+   Interface::GetInstance()->SetCurrentOverflyWeapon(NULL);
diff -Nru warmux-11.04.1+repack2/debian/patches/series warmux-11.04.1+repack2/debian/patches/series
--- warmux-11.04.1+repack2/debian/patches/series	2013-06-10 19:59:33.000000000 +0000
+++ warmux-11.04.1+repack2/debian/patches/series	2016-07-01 15:32:22.000000000 +0000
@@ -7,3 +7,4 @@
 07_fix_build_gcc47.patch
 08_fix_dirlisting.patch
 09_translation_fixes_de.patch
+10_fix_build_gcc60.patch
diff -Nru warmux-11.04.1+repack2/debian/warmux.menu warmux-11.04.1+repack2/debian/warmux.menu
--- warmux-11.04.1+repack2/debian/warmux.menu	2011-02-12 18:33:42.000000000 +0000
+++ warmux-11.04.1+repack2/debian/warmux.menu	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-?package(warmux): \
-	needs="X11" \
-	section="Games/Action"\
-	icon="/usr/share/pixmaps/warmux.xpm" \
-	title="WarMUX" \
-	longtitle="A 2D game where funny characters launch funny weapons" \
-	command="/usr/games/warmux"