diff -Nru lockfile-progs-0.1.11ubuntu1/debian/changelog lockfile-progs-0.1.11ubuntu2/debian/changelog
--- lockfile-progs-0.1.11ubuntu1/debian/changelog	2008-02-24 20:46:14.000000000 +0100
+++ lockfile-progs-0.1.11ubuntu2/debian/changelog	2008-06-22 12:50:18.000000000 +0200
@@ -1,10 +1,22 @@
-lockfile-progs (0.1.11ubuntu1) hardy; urgency=low
+lockfile-progs (0.1.11ubuntu2) intrepid; urgency=low
 
-  * debian/control:
-    + Remove duplicate Priority line (LP: #194529).
-    + Modify Maintainer value to match DebianMaintainerField spec.
+  * Merge with Debian unstable (0.1.11-0.1)(LP: #242086). Old changes remaining:
+    + debian/control:
+      - Modify Maintainer value to match DebianMaintainerField spec.
+  * New changes:
+    + lockfile-progs.c:
+      - Fix "error: format not a string literal and no format arguments"
+        (forwarded to Debian as bug #487503).
 
- -- Michael Bienia <geser@ubuntu.com>  Sun, 24 Feb 2008 13:47:51 +0100
+ -- Michael Bienia <geser@ubuntu.com>  Sun, 22 Jun 2008 12:49:21 +0200
+
+lockfile-progs (0.1.11-0.1) unstable; urgency=low
+
+  * Non-maintainer upload to fix FTBFS on i386
+  * Fixed control file: Priority: belongs into general section
+    + The same for Section: (Closes: #464297)
+
+ -- Patrick Winnertz <winnie@debian.org>  Tue, 04 Mar 2008 09:40:26 +0100
 
 lockfile-progs (0.1.11) unstable; urgency=low
 
diff -Nru lockfile-progs-0.1.11ubuntu1/debian/control lockfile-progs-0.1.11ubuntu2/debian/control
--- lockfile-progs-0.1.11ubuntu1/debian/control	2008-02-24 20:46:14.000000000 +0100
+++ lockfile-progs-0.1.11ubuntu2/debian/control	2008-06-20 18:13:39.000000000 +0200
@@ -7,8 +7,6 @@
 Standards-Version: 3.6.1
 
 Package: lockfile-progs
-Section: misc
-Priority: optional
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: Programs for locking and unlocking files and mailboxes
diff -Nru lockfile-progs-0.1.11ubuntu1/lockfile-progs.c lockfile-progs-0.1.11ubuntu2/lockfile-progs.c
--- lockfile-progs-0.1.11ubuntu1/lockfile-progs.c	2007-08-25 02:21:18.000000000 +0200
+++ lockfile-progs-0.1.11ubuntu2/lockfile-progs.c	2008-06-20 18:12:23.000000000 +0200
@@ -76,7 +76,7 @@
         command_name);
     exit(1);
   }
-  msg(file, usage_str);
+  msg(file, "%s", usage_str);
 }
 
 static void