diff -u chrony-1.24/sys_linux.c chrony-1.24/sys_linux.c
--- chrony-1.24/sys_linux.c
+++ chrony-1.24/sys_linux.c
@@ -735,9 +735,7 @@
   if (uname(&uts) < 0) {
     LOG_FATAL(LOGF_SysLinux, "Cannot uname(2) to get kernel version, sorry.");
   }
-
-  patch = 0;
-  if (sscanf(uts.release, "%d.%d.%d", &major, &minor, &patch) < 2) {
+  if (sscanf(uts.release, "%d.%d.%d", &major, &minor, &patch) != 3) {
     LOG_FATAL(LOGF_SysLinux, "Cannot read information from uname, sorry");
   }
 
@@ -810,18 +808,24 @@
             break;
           }
-          /* fall through */
-        default:
+          /* Let's be optimistic that these will be the same until proven
+             otherwise :-) */
+        case 7:
+        case 8:
           /* These don't need scaling */
           freq_scale = 1.0;
           have_readonly_adjtime = 2;
           break;
+        default:
+          LOG_FATAL(LOGF_SysLinux, "Kernel version not supported yet, sorry.");
       }
       break;
-    default:
-      /* Let's be optimistic that these will be the same until proven
-         otherwise :-) */
+    case 3:
+      /* These don't need scaling (treat like 2.6.28 and later) */
       freq_scale = 1.0;
       have_readonly_adjtime = 2;
       break;
+    default:
+      LOG_FATAL(LOGF_SysLinux, "Kernel's major version not supported yet, sorry");
+      break;
   }
 
diff -u chrony-1.24/debian/changelog chrony-1.24/debian/changelog
--- chrony-1.24/debian/changelog
+++ chrony-1.24/debian/changelog
@@ -1,11 +1,20 @@
-chrony (1.24-3ubuntu1) oneiric; urgency=low
+chrony (1.24-3.1ubuntu1) precise; urgency=low
 
-  * Support Linux 3.0 and later (patch taken from upstream;
-    commit ec7d302a6ca9e7974a05d338267b40491a1d7abb)
-    (lp: #793387, closes: #628919)
-  * Drop libreadline5-dev from Build-Depends (use libreadline-dev).
+  * Fix -Werror=format-security issues
 
- -- Michael Bienia <geser@ubuntu.com>  Sun, 12 Jun 2011 15:41:48 +0200
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Sun, 23 Oct 2011 20:39:12 +0530
+
+chrony (1.24-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add patch (directly over the source...), to work with kernels > 3.0.0,
+    by Paul Martin at http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628919#15.
+    (Closes: #628919)
+  * Fix readline build-depends from "libreadline5-dev | libreadline-dev" to
+    libreadline-gplv2-dev because chrony is GPLv2 only.  (Closes: #634447)
+  * Update copyright file to say that chrony is GPLv2 only. (Closes: #637526)
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Fri, 12 Aug 2011 12:32:26 +0200
 
 chrony (1.24-3) unstable; urgency=high
 
diff -u chrony-1.24/debian/copyright chrony-1.24/debian/copyright
--- chrony-1.24/debian/copyright
+++ chrony-1.24/debian/copyright
@@ -4,7 +4,7 @@
 
 Author(s): Richard Curnow <rc@rc0.org.uk>
 
-License: GNU General Public License (GPL)
+License: GNU General Public License v2 (GPL)
 
 Program Copyright (C) 1998-2003 Richard Curnow
 Modifications for Debian Copyright (C) 2000-2003 John Hasler
@@ -13,8 +13,7 @@
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+the Free Software Foundation; version 2 of the License.
 
 This program is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -28,0 +28,4 @@
+
+On Debian systems, the complete text of the GNU General Public
+License, version 2, can be found in /usr/share/common-licenses/GPL-2.
+
diff -u chrony-1.24/debian/control chrony-1.24/debian/control
--- chrony-1.24/debian/control
+++ chrony-1.24/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: John G. Hasler <jhasler@debian.org>
 Standards-Version: 3.8.3
-Build-Depends: debhelper (>= 7), libreadline-dev, texinfo, bison
+Build-Depends: debhelper (>= 7), texinfo, libreadline-gplv2-dev, bison
 
 Package: chrony
 Architecture: any
only in patch2:
unchanged:
--- chrony-1.24.orig/client.c
+++ chrony-1.24/client.c
@@ -130,7 +130,7 @@
     }
     return( line );
 #else
-    printf(prompt);
+    printf("%s", prompt);
 #endif
   }
   if (fgets(line, sizeof(line), stdin)) {