diff -u heroes-0.21/debian/changelog heroes-0.21/debian/changelog
--- heroes-0.21/debian/changelog
+++ heroes-0.21/debian/changelog
@@ -1,3 +1,26 @@
+heroes (0.21-9ubuntu1) trusty; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/{control,rules}: Use autotools-dev for newer arches,
+      resolving FTBFS.
+
+ -- Logan Rosen <logan@ubuntu.com>  Thu, 27 Mar 2014 10:50:08 -0400
+
+heroes (0.21-9) unstable; urgency=medium
+
+  * QA upload.
+  * The package is orphaned, change the maintainer to Debian QA Group.
+  * Drop the build-dependency on libmikmod2-dev, the package explicitly
+    configures without mikmod.
+  * Fix the segfault on free when levels aren't loaded in heroeslvl
+    (closes: #716016).
+  * Avoid installing /usr/share/info/dir (closes: #597415).
+  * Update debian/watch using Bart Martens' version.
+  * Add ${misc:Depends} to heroes-sdl and heroes-common.
+  * Remove dh_desktop from debian/rules.
+
+ -- Stephen Kitt <skitt@debian.org>  Mon, 17 Mar 2014 20:58:57 +0100
+
 heroes (0.21-8.4ubuntu1) trusty; urgency=low
 
   * Use autotools-dev for newer arches, resolving FTBFS.
diff -u heroes-0.21/debian/watch heroes-0.21/debian/watch
--- heroes-0.21/debian/watch
+++ heroes-0.21/debian/watch
@@ -2 +2 @@
-http://prdownloads.sourceforge.net /heroes/ heroes-([0-9.]*)\.tar\.gz debian
+http://qa.debian.org/watch/sf.php/heroes/heroes-(\d.*)\.(?:tgz|tbz2|tar\.(?:gz|bz2|xz))
diff -u heroes-0.21/debian/control heroes-0.21/debian/control
--- heroes-0.21/debian/control
+++ heroes-0.21/debian/control
@@ -2,8 +2,8 @@
 Section: games
 Priority: optional
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Daniel Burrows <dburrows@debian.org>
-Build-Depends: libmikmod2-dev (>= 3.1.10-1), libsdl1.2-dev (>= 1.2.2-3.1), libsdl-mixer1.2-dev, debhelper (>= 5), gettext, autogen, help2man, heroes-data (>= 1.4-1), texinfo, autotools-dev
+XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org>
+Build-Depends: libsdl1.2-dev (>= 1.2.2-3.1), libsdl-mixer1.2-dev, debhelper (>= 5), gettext, autogen, help2man, heroes-data (>= 1.4-1), texinfo, autotools-dev
 Standards-Version: 3.8.0
 
 Package: heroes-common
diff -u heroes-0.21/debian/rules heroes-0.21/debian/rules
--- heroes-0.21/debian/rules
+++ heroes-0.21/debian/rules
@@ -70,6 +70,7 @@
 	rm debian/heroes-common/usr/share/games/heroes/etc/heroesrc
 	dh_install
 	ln -s /etc/heroesrc debian/heroes-common/usr/share/games/heroes/etc/heroesrc
+	rm -f debian/heroes-common/usr/share/info/dir
 
 	touch install-stamp
 
@@ -107,6 +108,4 @@
 	dh_builddeb $(DH_OPTIONS_ARCH) -pheroes-common
 
-	dh_desktop $(DH_OPTIONS_ARCH) -pheroes-common
-
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install
only in patch2:
unchanged:
--- heroes-0.21.orig/src/lvl/free.c
+++ heroes-0.21/src/lvl/free.c
@@ -24,10 +24,12 @@
 void
 lvl_free (a_level *lvl)
 {
-  XFREE0 (lvl->private->tile);
-  XFREE0 (lvl->private->sound_track_alias);
-  XFREE0 (lvl->private->tile_sprite_map_basename);
-  XFREE0 (lvl->private);
+  if (lvl->private) {
+    XFREE0 (lvl->private->tile);
+    XFREE0 (lvl->private->sound_track_alias);
+    XFREE0 (lvl->private->tile_sprite_map_basename);
+    XFREE0 (lvl->private);
+  }
   XFREE0 (lvl->square_type);
   XFREE0 (lvl->square_walls_out);
   XFREE0 (lvl->square_direction);