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,9 +1,29 @@
+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.
+
+ -- Ilya Barygin <barygin@gmail.com>  Mon, 01 Feb 2010 21:23:15 +0300
+
+libpam-slurm (1.6-2ubuntu1) lucid; urgency=low
+
+  * Build against libslurm21
+  * Pass -nostdlib for all gcc calls to hide from __stack_chk_fail_local
+
+ -- Emmet Hikory <persia@ubuntu.com>  Sat, 23 Jan 2010 23:35:03 +0900
+
 libpam-slurm (1.6-2) unstable; urgency=low
 
   * New release built against libslurm20 (Closes: #536920)
@@ -39,0 +60 @@
+
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
@@ -1,6 +1,7 @@
 Source: libpam-slurm
 Priority: extra
-Maintainer: Gennaro Oliva <oliva.g@na.icar.cnr.it>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+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.4
only in patch2:
unchanged:
--- libpam-slurm-1.6.orig/Makefile
+++ libpam-slurm-1.6/Makefile
@@ -11,7 +11,7 @@
 noinst_HEADERS=	hostlist.h
 
 CC=		gcc
-CFLAGS=		-Wall -O2
+CFLAGS=		-Wall -O2 -nostdlib
 CPPFLAGS=	
 DEFAULT_INCLUDES = -I.
 DEFS=