diff -u libpam-slurm-1.6/debian/control libpam-slurm-1.6/debian/control
--- libpam-slurm-1.6/debian/control
+++ libpam-slurm-1.6/debian/control
@@ -4,7 +4,7 @@
 XSBC-Original-Maintainer: Gennaro Oliva <oliva.g@na.icar.cnr.it>
 Uploaders: Dirk Eddelbuettel <edd@debian.org>
 Build-Depends: debhelper (>= 5), libslurm21-dev, libpam0g-dev
-Standards-Version: 3.8.2
+Standards-Version: 3.8.4
 Section: admin
 
 Package: libpam-slurm
diff -u libpam-slurm-1.6/debian/changelog libpam-slurm-1.6/debian/changelog
--- libpam-slurm-1.6/debian/changelog
+++ libpam-slurm-1.6/debian/changelog
@@ -1,3 +1,16 @@
+libpam-slurm (1.6-3ubuntu1) maverick; urgency=low
+
+  * Merge from debian testing.  Remaining changes:
+    - Pass -nostdlib for all gcc calls to hide from __stack_chk_fail_local
+
+ -- Roy Jamison <xteejyx@googlemail.com>  Thu, 17 Jun 2010 19:18:31 +0100
+
+libpam-slurm (1.6-3) unstable; urgency=low
+
+  * New release built against libslurm21 (Closes: #569453)
+
+ -- Gennaro Oliva <oliva.g@na.icar.cnr.it>  Sun, 14 Feb 2010 20:26:18 +0100
+
 libpam-slurm (1.6-2ubuntu2) lucid; urgency=low
 
   * Manually change dependency to libslurm21.
@@ -46,0 +60 @@
+