Le Saturday 13 May 2006 à 00:42:37, Javier Fernández-Sanguino Peña a écrit:
> On Wed, Apr 26, 2006 at 06:33:12PM +0200, Ludovic Rousseau wrote:
> > Note that I am ready to NMU your package if you do not respond within one
> > week since the bug is RC.
>
> Please go ahead.
>
> > Your prerm script can be removed now since the file
> > /etc/reader.conf.d/libetoken will not be created now
>
> It might be necessary to remove the file if it exists from previous release
> too right?
It is removed by postinst now. You could remove the removal and the call
to /usr/sbin/update-reader.conf once Debian Etch is out.
I also modified the Info.plist file.
- Only the first reader was used by pcscd because only one
ifdFriendlyName was present.
- The file was not valid. I added the DTD URL and corrected an <array>
in </array>. You can check the validity using "xmllint --valid --noout
Info.plist"
Bye,
The complete patch is:
diff -ruN etoken-0.3.9/debian/changelog etoken-0.3.9.new/debian/changelog
--- etoken-0.3.9/debian/changelog 2006-05-21 18:34:05.000000000 +0200
+++ etoken-0.3.9.new/debian/changelog 2006-05-21 18:33:40.000000000 +0200
@@ -1,3 +1,13 @@
+etoken (0.3.9-5.1) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * Closes: #364920 "/etc/reader.conf.d/libetoken is wrong (DEVICENAME
+ incorrect)"
+ * update Info.plist file to make it compliant with the DTD and useful for
+ pcscd
+
+ -- Ludovic Rousseau <[EMAIL PROTECTED]> Sun, 21 May 2006 18:31:49 +0200
+
etoken (0.3.9-5) unstable; urgency=low
* Fixed build errors when compiling with gcc-4 in amd64 as suggested by
diff -ruN etoken-0.3.9/debian/postinst etoken-0.3.9.new/debian/postinst
--- etoken-0.3.9/debian/postinst 2006-05-21 18:34:05.000000000 +0200
+++ etoken-0.3.9.new/debian/postinst 2006-05-21 17:58:20.000000000 +0200
@@ -4,24 +4,11 @@
cfgdir=/etc/reader.conf.d
cfg=$cfgdir/libetoken
-lib=/usr/lib/pcsc/drivers/usb/libetoken.so
case "$1" in
configure|reconfigure)
- # First make sure the cfgdir exists
- if [ ! -d $cfgdir ]
- then
- mkdir -p $cfgdir
- fi
+ # remove any old configuration file. See #364920
rm -f $cfg
- echo >> $cfg
- echo "# Aladdin eToken" >> $cfg
-
- echo "# see /usr/share/doc/libetoken/README" >> $cfg
- echo "FRIENDLYNAME \"Aladdin eToken PRO\"" >>$cfg
- echo "DEVICENAME ALADDIN_ETOKEN" >>$cfg
- echo "LIBPATH $lib" >> $cfg
- echo "CHANNELID 0x0" >> $cfg
# regenerate /etc/reader.conf if update-reader.conf is available
if [ -x /usr/sbin/update-reader.conf ]
@@ -29,13 +16,6 @@
/usr/sbin/update-reader.conf || true
fi
- if [ ! -e /proc/bus/usb/devices ]
- then
- # warn
- echo "Make sure usbdevfs is mounted on /proc/bus/usb"
- echo "(run 'mount -t usbdevfs none /proc/bus/usb')"
- fi
-
# restart pcscd (PCSC daemon) if the package is installed
if [ -x /etc/init.d/pcscd ]
then
diff -ruN etoken-0.3.9/debian/prerm etoken-0.3.9.new/debian/prerm
--- etoken-0.3.9/debian/prerm 2006-05-21 18:34:05.000000000 +0200
+++ etoken-0.3.9.new/debian/prerm 1970-01-01 01:00:00.000000000 +0100
@@ -1,35 +0,0 @@
-#! /bin/sh
-
-set -e
-
-cfgdir=/etc/reader.conf.d
-cfg=$cfgdir/libetoken
-
-case "$1" in
- remove|upgrade|deconfigure)
- # remove reader.conf definition for eToken
- rm -f $cfg
- # remove cfgdir if it's not in use
- if [ -d $cfgdir ]
- then
- files=`ls $cfgdir`
- if [ -z "$files" ]
- then
- rmdir $cfgdir
- fi
- fi
- ;;
-
- failed-upgrade)
- ;;
- *)
- echo "prerm called with unknown argument \`$1'" >&2
- exit 0
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
-
-
diff -ruN etoken-0.3.9/Info.plist etoken-0.3.9.new/Info.plist
--- etoken-0.3.9/Info.plist 2006-05-21 18:34:05.000000000 +0200
+++ etoken-0.3.9.new/Info.plist 2006-05-21 18:23:20.000000000 +0200
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
"http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
@@ -25,24 +25,32 @@
<key>CFBundleExecutable</key>
<string>libetoken.so.VERSION</string>
- <key>ifdFriendlyName</key>
- <string>Aladdin Pro</string>
-
<key>ifdManufacturerString</key>
<string>AKS</string>
<key>ifdProductString</key>
<string>Aladdin Pro</string>
+ <key>ifdFriendlyName</key>
+ <array>
+ <string>Aladdin Pro</string>
+ <string>Aladdin Pro</string>
+ <string>Aladdin Pro</string>
+ </array>
+
<key>ifdVendorID</key>
+ <array>
<string>0x529</string>
+ <string>0x529</string>
+ <string>0x529</string>
+ </array>
<key>ifdProductID</key>
<array>
<string>0x514</string>
<string>0x50c</string>
<string>0x30b</string>
- <array>
+ </array>
<!-- Tokens can be eToken PRO 4151, 4156, or 4253 -->
--
Dr. Ludovic Rousseau [EMAIL PROTECTED]
-- Normaliser Unix c'est comme pasteuriser le camembert, L.R. --
