diff -u openct-0.6.9/etc/init-script.in openct-0.6.9/etc/init-script.in
--- openct-0.6.9/etc/init-script.in
+++ openct-0.6.9/etc/init-script.in
@@ -30,8 +30,8 @@
 	# this example would assign the directory to a group "scard"
 	# and set permissions so only users in that group can access
 	# smart card readers via openct.
-	#chown root:scard /var/run/openct
-	#chmod 0750 /var/run/openct
+	chown root:scard /var/run/openct
+	chmod 0750 /var/run/openct
 fi
 
 set -e
diff -u openct-0.6.9/debian/changelog openct-0.6.9/debian/changelog
--- openct-0.6.9/debian/changelog
+++ openct-0.6.9/debian/changelog
@@ -1,3 +1,13 @@
+openct (0.6.9-1ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable. Remaining changes:
+    - etc/init-script.in: enable setting owner and permissions on
+      /var/run/openct
+  * src/ifd/utils.c: add missing string.h include (patch taken from
+    Debian bug #393554)
+
+ -- Michael Bienia <geser@ubuntu.com>  Sat, 11 Nov 2006 13:46:22 +0100
+
 openct (0.6.9-1) unstable; urgency=medium
 
   * New upstream release.
@@ -13,6 +23,13 @@
 
  -- Eric Dorland <eric@debian.org>  Sat, 14 Oct 2006 21:25:44 -0400
 
+openct (0.6.8-1ubuntu1) edgy; urgency=low
+
+  * etc/init-script.in: enable setting owner and permissions on
+    /var/run/openct
+
+ -- Michael Bienia <michael@vorlon.ping.de>  Mon, 25 Sep 2006 17:10:51 +0200
+
 openct (0.6.8-1) unstable; urgency=low
 
   * New upstream release.
only in patch2:
unchanged:
--- openct-0.6.9.orig/src/ifd/utils.c
+++ openct-0.6.9/src/ifd/utils.c
@@ -12,6 +12,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
+#include <string.h>
 
 #ifndef __GNUC__
 void ifd_debug(int level, const char *fmt, ...)