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

[Eric Dorland]

The following commit has been merged in the master branch:
commit e502e83f9daf03f1d5863a4825b9cc7c3c432952
Author: Eric Dorland <eric at debian.org>
Date:   Mon Jun 15 00:53:57 2009 -0400

    debian/rules, debian/control, openct.install: Use hal instead of udev. Copy in the correct hal files and don't compile with udev, recommend hal instead of udev. (Closes: #442300)

diff --git a/debian/changelog b/debian/changelog
index 4e337d9..450b1fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ openct (0.6.16-2) unstable; urgency=low
   * debian/openct.install: Install documentation again.
   * debian/openct.doc-base.manual: Change author to OpenCT Development Team.
   * debian/openct.doc-base.api: Add doc-base for api documentation.
+  * debian/rules, debian/control, openct.install: Use hal instead of
+    udev. Copy in the correct hal files and don't compile with
+    udev, recommend hal instead of udev. (Closes: #442300)
 
  --
 
diff --git a/debian/control b/debian/control
index f4e0635..07ee0ac 100644
--- a/debian/control
+++ b/debian/control
@@ -53,7 +53,7 @@ Package: openct
 Architecture: any
 Provides: pcsc-ifd-handler
 Depends: ${shlibs:Depends}, dpkg (>= 1.7.0), adduser, ${misc:Depends}
-Recommends: udev
+Recommends: hal
 Enhances: pcscd
 Description: middleware framework for smart card terminals
  OpenCT is an open source implementation providing card terminal
diff --git a/debian/openct.install b/debian/openct.install
index 1b96d29..6f0090f 100644
--- a/debian/openct.install
+++ b/debian/openct.install
@@ -7,8 +7,11 @@ 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
+
 etc/openct.conf etc/
-debian/tmp/lib/udev lib/
 
 debian/openct.reader.conf etc/reader.conf.d
 
diff --git a/debian/rules b/debian/rules
index 5e222bb..0d516c2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,13 +3,16 @@
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS = --enable-pcsc --with-udev=/lib/udev
+DEB_CONFIGURE_EXTRA_FLAGS = --enable-pcsc
 
 DEB_INSTALL_DOCS_ALL := NEWS TODO
 
 install/openct::
 	cp -f etc/init-script debian/openct.init
-	cp -f etc/openct.udev debian/openct.udev
+	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
 
 binary-post-install/openct::
 # Rename some stuff 
@@ -17,4 +20,5 @@ binary-post-install/openct::
 		$(CURDIR)/debian/openct/etc/reader.conf.d/openct
 
 clean::
-	rm -f debian/openct.init debian/openct.udev
+	rm -f debian/openct.init debian/10-usb-openct.fdi \
+		  debian/10-usb-openct-policy.fdi debian/hald-addon-openct

-- 
OpenCT packaging