Merge /tmp/libpam-csc

Conflicts:
	debian/changelog

Makefile

@@ -1,11 +1,11 @@
 CC=gcc
 CFLAGS=-std=c99 -g -O2 -fPIC -Wall -DLDAP_DEPRECATED
-LDFLAGS=-g -shared -lpam -lldap
+LDFLAGS=-g -shared
 
 all: pam_csc.so
 
 pam_csc.so: pam_csc.o
-	$(CC) -o $@ $(LDFLAGS) $<
+	$(CC) -o $@ $(LDFLAGS) $< -lpam -lldap
 
 clean:
 	rm -f pam_csc.so pam_csc.o

debian/changelog

@@ -1,3 +1,15 @@
+libpam-csc (1.9ubuntu3) precise; urgency=low
+
+  * Build for precise.
+
+ -- Jeremy Roman <jbroman@csclub.uwaterloo.ca>  Fri, 16 Mar 2012 18:04:21 -0400
+
+libpam-csc (1.9ubuntu2) oneiric; urgency=low
+
+  * Build for oneiric.
+
+ -- Jeremy Roman <jbroman@csclub.uwaterloo.ca>  Wed, 18 Jan 2012 17:32:15 -0500
+
 libpam-csc (1.9ubuntu1) maverick; urgency=low
 
   * Build for maverick.

debian/control

@@ -4,7 +4,8 @@ Priority: optional
 Maintainer: Systems Commmittee <syscom@csclub.uwaterloo.ca>
 Uploaders:
  David Bartley <dtbartle@csclub.uwaterloo.ca>,
- Michael Spang <mspang@csclub.uwaterloo.ca>
+ Michael Spang <mspang@csclub.uwaterloo.ca>,
+ Jeremy Roman <jbroman@csclub.uwaterloo.ca>
 Build-Depends: debhelper (>= 7), libldap2-dev, libpam0g-dev, libsasl2-dev
 Standards-Version: 3.9.1