diff -pruN 1.5-6/debian/changelog 1.5-6ubuntu1/debian/changelog
--- 1.5-6/debian/changelog	2008-11-29 22:32:19.000000000 +0000
+++ 1.5-6ubuntu1/debian/changelog	2008-11-29 22:27:56.000000000 +0000
@@ -1,3 +1,10 @@
+xorp (1.5-6ubuntu1) jaunty; urgency=low
+
+  * Fix build failure caused by two instances of "format not a string literal
+    and no format arguments"
+
+ -- James Westby <james.westby@canonical.com>  Sat, 29 Nov 2008 17:18:56 +0000
+
 xorp (1.5-6) unstable; urgency=low
 
   * changed -fpic to -fPIC in cli/libtecla/configure.in and run autoconf
diff -pruN 1.5-6/debian/control 1.5-6ubuntu1/debian/control
--- 1.5-6/debian/control	2008-11-29 22:32:19.000000000 +0000
+++ 1.5-6ubuntu1/debian/control	2008-11-29 22:27:56.000000000 +0000
@@ -1,7 +1,8 @@
 Source: xorp
 Section: net
 Priority: extra
-Maintainer: Jose Calhariz <jose.calhariz@tagus.ist.utl.pt>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Jose Calhariz <jose.calhariz@tagus.ist.utl.pt>
 Uploaders: Javier Fernandez-Sanguino Pen~a <jfs@debian.org>
 Build-Depends: debhelper (>= 5), autotools-dev, libssl-dev, 
  libncurses5-dev | ncurses-dev, docbook-to-man, libpcap0.8-dev, libsnmp-dev
diff -pruN 1.5-6/policy/filter_manager.cc 1.5-6ubuntu1/policy/filter_manager.cc
--- 1.5-6/policy/filter_manager.cc	2008-07-23 06:11:18.000000000 +0100
+++ 1.5-6ubuntu1/policy/filter_manager.cc	2008-11-29 22:27:56.000000000 +0000
@@ -119,7 +119,7 @@ FilterManager::policy_backend_cb(const X
 	debug_msg("[POLICY] XRL exception: %s\n", e.str().c_str());
 	error_msg = c_format("XRL policy_backend_cb() error: %s",
 			     e.str().c_str());
-	XLOG_ERROR(error_msg.c_str());
+	XLOG_ERROR("%s", error_msg.c_str());
 //	xorp_throw(FMException, error_msg); // XXX: what else can we do ?
     }	
 }
diff -pruN 1.5-6/policy/process_watch.cc 1.5-6ubuntu1/policy/process_watch.cc
--- 1.5-6/policy/process_watch.cc	2008-07-23 06:11:20.000000000 +0100
+++ 1.5-6ubuntu1/policy/process_watch.cc	2008-11-29 22:27:56.000000000 +0000
@@ -40,7 +40,7 @@ ProcessWatch::register_cb(const XrlError
 
     if (err != XrlError::OKAY()) {
 	error_msg = c_format("XRL register_cb() error: %s", err.str().c_str());
-	XLOG_ERROR(error_msg.c_str());
+	XLOG_ERROR("%s", error_msg.c_str());
 // 	xorp_throw(PWException, error_msg);
     }
 }