[Pcsclite-cvs-commit] Drivers/ccid/src Info.plist,1.9,1.10 create_Info_plist.pl,1.1,1.2

rousseau@haydn.debian.org rousseau@haydn.debian.org


Update of /cvsroot/pcsclite/Drivers/ccid/src
In directory haydn:/tmp/cvs-serv18361

Modified Files:
	Info.plist create_Info_plist.pl 
Log Message:
replace VENDOR pattern by MAGIC_VENDOR since we also have a VENDOR in
IOCTL_SMARTCARD_VENDOR_IFD_EXCHANGE and then a collision.

same change for PRODUCT and FRIENDLYNAME to be homogenous.


Index: Info.plist
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/Info.plist,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Info.plist	30 Jun 2004 09:34:19 -0000	1.9
+++ Info.plist	2 Jul 2004 14:12:36 -0000	1.10
@@ -62,17 +62,17 @@
 
 	<key>ifdVendorID</key>
 	<array>
-		VENDOR
+		MAGIC_VENDOR
 	</array>
 
 	<key>ifdProductID</key>
 	<array>
-		PRODUCT
+		MAGIC_PRODUCT
 	</array>
 
 	<key>ifdFriendlyName</key>
 	<array>
-		FRIENDLYNAME
+		MAGIC_FRIENDLYNAME
 	</array>
 
 	<key>Copyright</key>

Index: create_Info_plist.pl
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/create_Info_plist.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- create_Info_plist.pl	2 Feb 2004 10:05:34 -0000	1.1
+++ create_Info_plist.pl	2 Jul 2004 14:12:36 -0000	1.2
@@ -54,17 +54,17 @@
 
 while (<IN>)
 {
-	if (m/VENDOR/)
+	if (m/MAGIC_VENDOR/)
 	{
 		print @manuf;
 		next;
 	}
-	if (m/PRODUCT/)
+	if (m/MAGIC_PRODUCT/)
 	{
 		print @product;
 		next;
 	}
-	if (m/FRIENDLYNAME/)
+	if (m/MAGIC_FRIENDLYNAME/)
 	{
 		print @name;
 		next;