diff -u mtd-utils-20080508/debian/changelog mtd-utils-20080508/debian/changelog
--- mtd-utils-20080508/debian/changelog
+++ mtd-utils-20080508/debian/changelog
@@ -1,3 +1,10 @@
+mtd-utils (20080508-1ubuntu0.1) intrepid-proposed; urgency=low
+
+  * Corrected FTBFS on intrepid by disabling -werror, and
+    incorperating a patch from Aloisio Almeida (LP: #294428)
+
+ -- Michael Casadevall <sonicmctails@gmail.com>  Thu, 06 Nov 2008 11:26:52 -0500
+
 mtd-utils (20080508-1) unstable; urgency=low
 
   [ Riku Voipio ]
diff -u mtd-utils-20080508/debian/control mtd-utils-20080508/debian/control
--- mtd-utils-20080508/debian/control
+++ mtd-utils-20080508/debian/control
@@ -1,7 +1,8 @@
 Source: mtd-utils
 Section: utils
 Priority: extra
-Maintainer: Riku Voipio <riku.voipio@iki.fi>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Riku Voipio <riku.voipio@iki.fi>
 Uploaders: Otavio Salvador <otavio@debian.org>
 Build-Depends: debhelper (>= 5.0), zlib1g-dev, libacl1-dev, liblzo2-dev
 Standards-Version: 3.7.3
only in patch2:
unchanged:
--- mtd-utils-20080508.orig/recv_image.c
+++ mtd-utils-20080508/recv_image.c
@@ -1,6 +1,6 @@
 
 #define _XOPEN_SOURCE 500
-#define _USE_MISC
+#define _GNU_SOURCE
 
 #include <errno.h>  	
 #include <error.h> 	
@@ -307,7 +307,7 @@
 						~(meminfo.erasesize - 1);
 					erase.length = meminfo.erasesize;
 
-					printf("Will erase at %08lx len %08lx (bad write was at %08lx)\n", 
+					printf("Will erase at %08x len %08x (bad write was at %08x)\n", 
 					       erase.start, erase.length, eraseblocks[block_nr].flash_offset);
 					if (ioctl(flfd, MEMERASE, &erase)) {
 						perror("MEMERASE");
only in patch2:
unchanged:
--- mtd-utils-20080508.orig/ubi-utils/Makefile
+++ mtd-utils-20080508/ubi-utils/Makefile
@@ -10,7 +10,7 @@
 INCLUDEDIR=/usr/include
 
 CC := $(CROSS)gcc
-CFLAGS := -I./inc -I./src -I$(KERNELHDR) $(OPTFLAGS) -Werror \
+CFLAGS := -I./inc -I./src -I$(KERNELHDR) $(OPTFLAGS) \
 	-Wwrite-strings -W -std=gnu99 -DPACKAGE_VERSION=\"1.0\"
 
 PERLPROGS = mkpfi ubicrc32.pl
only in patch2:
unchanged:
--- mtd-utils-20080508.orig/ubi-utils/new-utils/Makefile
+++ mtd-utils-20080508/ubi-utils/new-utils/Makefile
@@ -10,7 +10,7 @@
 INCLUDEDIR=/usr/include
 
 CC := $(CROSS)gcc
-CFLAGS := -Iinclude -Isrc -I$(KERNELHDR) $(OPTFLAGS) -Werror -Wall
+CFLAGS := -Iinclude -Isrc -I$(KERNELHDR) $(OPTFLAGS) -Wall
 
 LIBS = libubi libmtd libubigen libiniparser libscan
 UTILS = ubiupdatevol ubimkvol ubirmvol ubicrc32 ubinfo ubiattach \