diff -Nru binutils-z80-2.22/debian/changelog binutils-z80-2.22/debian/changelog
--- binutils-z80-2.22/debian/changelog	2012-05-14 13:30:01.000000000 +0530
+++ binutils-z80-2.22/debian/changelog	2012-06-21 21:37:04.000000000 +0530
@@ -1,3 +1,11 @@
+binutils-z80 (2.22-3ubuntu1) quantal; urgency=low
+
+  * Merge from Debian Unstable (LP: #1016128). Remaining Changes:
+    -  debian/tc-z80.c.diff:
+    - Fix FTBFS with -Werror=format-security.
+ 
+ -- Vibhav Pant <vibhavp@gmail.com>  Thu, 21 Jun 2012 21:30:19 +0530
+
 binutils-z80 (2.22-3) unstable; urgency=low
 
   * debian/app.c.diff: fix FTBFS (array subscript is below array bounds)
@@ -19,6 +27,14 @@
 
  -- Alberto Garcia <agarcia@igalia.com>  Fri, 30 Mar 2012 14:09:40 +0300
 
+binutils-z80 (2.22-1ubuntu1) precise; urgency=low
+
+  * Resync with Debian.
+  * debian/tc-z80.c.diff:
+    - Fix FTBFS with -Werror=format-security.
+
+ -- Luca Falavigna <dktrkranz@ubuntu.com>  Sat, 24 Dec 2011 12:59:06 +0100
+
 binutils-z80 (2.22-1) unstable; urgency=low
 
   * Update to binutils 2.22 (Closes: #639590):
diff -Nru binutils-z80-2.22/debian/tc-z80.c.diff binutils-z80-2.22/debian/tc-z80.c.diff
--- binutils-z80-2.22/debian/tc-z80.c.diff	2012-05-14 13:30:01.000000000 +0530
+++ binutils-z80-2.22/debian/tc-z80.c.diff	2012-06-21 19:15:42.000000000 +0530
@@ -1,5 +1,14 @@
 --- tc-z80.c.orig	2011-12-23 17:17:55.860988588 +0100
 +++ tc-z80.c	2011-12-23 17:17:59.969093857 +0100
+@@ -440,7 +440,7 @@
+   if (ins_type & ins_err)
+     error (_(p));
+   else
+-    as_warn (_(p));
++    as_warn (_("%s"), p);
+ }
+ 
+ static void
 @@ -702,6 +702,7 @@
        fixp = fix_new_exp (frag_now, p - frag_now->fr_literal, 1, val,
  			  (r_type == BFD_RELOC_8_PCREL) ? TRUE : FALSE, r_type);