diff -u meritous-1.2+dfsg/debian/patches/series meritous-1.2+dfsg/debian/patches/series
--- meritous-1.2+dfsg/debian/patches/series
+++ meritous-1.2+dfsg/debian/patches/series
@@ -6,0 +7 @@
+undefined-reference.patch
diff -u meritous-1.2+dfsg/debian/rules meritous-1.2+dfsg/debian/rules
--- meritous-1.2+dfsg/debian/rules
+++ meritous-1.2+dfsg/debian/rules
@@ -63,7 +63,6 @@
 	dh_install
 	dh_installmenu
 	dh_installman
-	dh_desktop
 	dh_link
 	dh_strip
 	dh_compress
diff -u meritous-1.2+dfsg/debian/changelog meritous-1.2+dfsg/debian/changelog
--- meritous-1.2+dfsg/debian/changelog
+++ meritous-1.2+dfsg/debian/changelog
@@ -1,3 +1,12 @@
+meritous (1.2+dfsg-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/patches/undefined-reference.patch: Fixed FTBFS.  Closes: #555597.
+  * Fixed debian-watch-file-should-mangle-version.
+  * Fixed dh_desktop-is-deprecated.
+
+ -- Bart Martens <bartm@debian.org>  Tue, 04 Oct 2011 19:48:07 +0200
+
 meritous (1.2+dfsg-1) unstable; urgency=low
 
   * Dylan R. E. Moonfire
diff -u meritous-1.2+dfsg/debian/watch meritous-1.2+dfsg/debian/watch
--- meritous-1.2+dfsg/debian/watch
+++ meritous-1.2+dfsg/debian/watch
@@ -2,3 +2,3 @@
 version=3
-
+opts=dversionmangle=s/\+dfsg$// \
 http://www.asceai.net/meritous/ .*?meritous_v(\d)(\d)_src.tar.bz2.*
only in patch2:
unchanged:
--- meritous-1.2+dfsg.orig/debian/patches/undefined-reference.patch
+++ meritous-1.2+dfsg/debian/patches/undefined-reference.patch
@@ -0,0 +1,11 @@
+--- ./Makefile.orig	2011-10-04 19:52:32.000000000 +0200
++++ ./Makefile	2011-10-04 19:52:58.000000000 +0200
+@@ -18,7 +18,7 @@
+ #   You should have received a copy of the GNU General Public License
+ #   along with Meritous.  If not, see <http://www.gnu.org/licenses/>.
+ #
+-LDFLAGS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lz
++LDFLAGS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lm
+ CCFLAGS = -DSAVES_IN_HOME -O2 -Wall `sdl-config --cflags` -g
+ #
+ OBJS = 	src/levelblit.o \