diff -u gnupg-1.4.3/debian/control gnupg-1.4.3/debian/control
--- gnupg-1.4.3/debian/control
+++ gnupg-1.4.3/debian/control
@@ -8,6 +8,7 @@
 Package: gnupg
 Architecture: any
 Depends: ${shlibs:Depends}, makedev (>= 2.3.1-13) | devfsd | hurd
+Recommends: udev
 Suggests: gnupg-doc, xloadimage
 Conflicts: gpg-rsa, gpg-rsaref, suidmanager (<< 0.50), gpg-idea (<= 2.2)
 Replaces: gpg-rsa, gpg-rsaref
diff -u gnupg-1.4.3/debian/rules gnupg-1.4.3/debian/rules
--- gnupg-1.4.3/debian/rules
+++ gnupg-1.4.3/debian/rules
@@ -65,7 +65,8 @@
 	$(checkdir)
 	-rm -rf debian/tmp
 	$(install_dir) debian/tmp/DEBIAN/
-	$(install_script) debian/preinst debian/tmp/DEBIAN/
+	$(install_script) debian/preinst debian/postinst debian/postrm debian/tmp/DEBIAN/
+	$(install_file) debian/conffiles debian/tmp/DEBIAN/
 	$(MAKE) -C build-deb prefix=`pwd`/debian/tmp/usr mandir=`pwd`/debian/tmp/usr/share/man libexecdir=`pwd`/debian/tmp/usr/lib/ mkinstalldirs=`pwd`/scripts/mkinstalldirs install
 	: # copies of the manpage which can't be grokked by install-info
 	rm debian/tmp/usr/info/*
@@ -74,6 +75,8 @@
 	sed -e "s#../g10/gpg#gpg#" < tools/lspgpot > debian/tmp/usr/bin/lspgpot
 	sed -e "s#../g10/gpg#gpg#" < tools/convert-from-106 > debian/tmp/usr/bin/gpg-convert-from-106
 	chmod 755 debian/tmp/usr/bin/lspgpot debian/tmp/usr/bin/gpg-convert-from-106
+	$(install_dir) debian/tmp/etc/udev/rules.d/
+	$(install_file) debian/gnupg-ccid.udev.rules debian/tmp/etc/udev/rules.d/45-gnupg-ccid.rules
 	sed -e "s#/usr/local/#/usr/#" < debian/tmp/usr/share/man/man1/gpg.1 \
 	    > debian/tmp/usr/share/man/man1/gpg.1.new
 	mv debian/tmp/usr/share/man/man1/gpg.1.new debian/tmp/usr/share/man/man1/gpg.1
diff -u gnupg-1.4.3/debian/changelog gnupg-1.4.3/debian/changelog
--- gnupg-1.4.3/debian/changelog
+++ gnupg-1.4.3/debian/changelog
@@ -1,3 +1,17 @@
+gnupg (1.4.3-2ubuntu4) edgy; urgency=low
+
+  * Support SmartCard readers out-of-the-box (add necessary udev rules)
+    - debian/control: Add Recommends: udev (gnupg)
+    - debian/rules: Install udev rules and new dpkg control files/scripts
+    - Add debian/gnupg-ccid.udev.rules: Contains udev rules for most
+      popular smart card readers
+    - Add debian/conffiles
+    - Add debian/postinst: creates scard group on install/upgrade, every
+      user that wants to use smartcard readers needs to be in this group
+    - Add debian/postrm: removes scard group on purge
+
+ -- Lukas Fittl <lfittl@fsfe.org>  Mon, 21 Aug 2006 22:37:43 +0200
+
 gnupg (1.4.3-2ubuntu3) edgy; urgency=low
 
   * SECURITY UPDATE: Local arbitrary code execution.
only in patch2:
unchanged:
--- gnupg-1.4.3.orig/debian/postinst
+++ gnupg-1.4.3/debian/postinst
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    configure)
+        echo "Creating scard group..."
+        addgroup --system --quiet scard
+    ;;
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+esac
only in patch2:
unchanged:
--- gnupg-1.4.3.orig/debian/gnupg-ccid.udev.rules
+++ gnupg-1.4.3/debian/gnupg-ccid.udev.rules
@@ -0,0 +1,13 @@
+ACTION!="add", GOTO="gnupg-ccid_rules_end"
+
+# USB SmartCard Readers
+## SCM readers (SCR335, SPR532, & Co)
+SUBSYSTEM=="usb_device", SYSFS{idVendor}=="04e6", SYSFS{idProduct}=="e001", GROUP="scard", MODE="0660"
+SUBSYSTEM=="usb_device", SYSFS{idVendor}=="04e6", SYSFS{idProduct}=="e003", GROUP="scard", MODE="0660"
+SUBSYSTEM=="usb_device", SYSFS{idVendor}=="04e6", SYSFS{idProduct}=="5115", GROUP="scard", MODE="0660"
+
+# PCMCIA SmartCard Readers
+## Omnikey CardMan 4040
+SUBSYSTEM=="cardman_4040", GROUP="scard", MODE="0660"
+
+LABEL="gnupg-ccid_rules_end"
only in patch2:
unchanged:
--- gnupg-1.4.3.orig/debian/postrm
+++ gnupg-1.4.3/debian/postrm
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+	purge)
+		getent group scard >/dev/null && delgroup --system --only-if-empty scard
+	;;
+	failed-upgrade|abort-install|abort-upgrade|upgrade|remove|disappear)
+	;;
+esac
only in patch2:
unchanged:
--- gnupg-1.4.3.orig/debian/conffiles
+++ gnupg-1.4.3/debian/conffiles
@@ -0,0 +1 @@
+/etc/udev/rules.d/45-gnupg-ccid.rules