[pkg-opensc-commit] [SCM] OpenCT packaging branch, master, updated. 186c303f450e13a7dd1f2c060b38552890bdfe57

[Eric Dorland]

The following commit has been merged in the master branch:
commit 186c303f450e13a7dd1f2c060b38552890bdfe57
Author: Eric Dorland <eric at debian.org>
Date:   Sun Feb 28 04:49:23 2010 -0500

    debian/rules, debian/openct.install: Patch from Andreas Jellinghaus to fixup udev rules and add bundle file for pcscd. (Closes: #563755, #528123)

diff --git a/debian/changelog b/debian/changelog
index cb7570c..b279c83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ openct (0.6.20-1) unstable; urgency=low
 
   * New upstream release. (Closes: #570105, #569132)
   * libtool.m4: Remove libtool file that snuck in here at some point.
+  * debian/rules, debian/openct.install: Patch from Andreas Jellinghaus to
+    fixup udev rules and add bundle file for pcscd. (Closes: #563755,
+    #528123)
 
- --
+ -- Eric Dorland <eric at debian.org>  Sun, 28 Feb 2010 04:48:31 -0500
 
 openct (0.6.19-1) unstable; urgency=low
 
diff --git a/debian/openct.install b/debian/openct.install
index 36bce35..b7184ff 100644
--- a/debian/openct.install
+++ b/debian/openct.install
@@ -6,17 +6,12 @@ debian/tmp/usr/lib/libopenctapi.a
 debian/tmp/usr/lib/openct-ifd.so
 debian/tmp/usr/lib/openct-ifd.la
 debian/tmp/usr/lib/openct-ifd.a
-
-debian/10-usb-openct.fdi usr/share/hal/fdi/information/10freedesktop
-debian/10-usb-openct-policy.fdi usr/share/hal/fdi/policy/10osvendor
-debian/hald-addon-openct usr/lib/hal
-
+debian/tmp/usr/lib/pcsc/drivers/*
 etc/openct.conf etc/
-
 debian/openct.reader.conf etc/reader.conf.d
-
 debian/tmp/usr/share/man
-etc/openct-disable.fdi usr/share/doc/examples
 doc/nonpersistent/wiki.out/*.html usr/share/doc/openct/html
 doc/nonpersistent/wiki.out/*.css usr/share/doc/openct/html
 doc/api.out/html/* usr/share/doc/openct/html/api
+debian/60-openct.rules lib/udev/rules.d
+debian/tmp/lib/udev/*
diff --git a/debian/rules b/debian/rules
index 0d516c2..c1cc9f6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,16 +3,14 @@
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS = --enable-pcsc
+DEB_CONFIGURE_EXTRA_FLAGS = --enable-pcsc --with-udev=/lib/udev \
+	--with-bundle=/usr/lib/pcsc/drivers
 
 DEB_INSTALL_DOCS_ALL := NEWS TODO
 
 install/openct::
 	cp -f etc/init-script debian/openct.init
-	cp -f etc/openct.fdi debian/10-usb-openct.fdi
-	cp -f etc/openct-policy.fdi debian/10-usb-openct-policy.fdi
-	cp -f etc/openct.hald debian/hald-addon-openct
-	chmod 0755 debian/hald-addon-openct
+	cp -f etc/openct.udev debian/60-openct.rules
 
 binary-post-install/openct::
 # Rename some stuff 
@@ -20,5 +18,4 @@ binary-post-install/openct::
 		$(CURDIR)/debian/openct/etc/reader.conf.d/openct
 
 clean::
-	rm -f debian/openct.init debian/10-usb-openct.fdi \
-		  debian/10-usb-openct-policy.fdi debian/hald-addon-openct
+	rm -f debian/openct.init debian/60-openct.rules

-- 
OpenCT packaging