[Pcsclite-cvs-commit] r3024 - in /trunk/Drivers/ccid/src: Info.plist.src Makefile.am ifdhandler.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Thu Jun 26 13:20:43 2008
New Revision: 3024

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=3024
Log:
do not include the release number in the Info.plist to avoid a diff of a
configuration file when upgrading the package.

Thanks to Benoit Gonzalvo for the bug report

Modified:
    trunk/Drivers/ccid/src/Info.plist.src
    trunk/Drivers/ccid/src/Makefile.am
    trunk/Drivers/ccid/src/ifdhandler.c

Modified: trunk/Drivers/ccid/src/Info.plist.src
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/Info.plist.src?rev=3024&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/Info.plist.src (original)
+++ trunk/Drivers/ccid/src/Info.plist.src Thu Jun 26 13:20:43 2008
@@ -86,13 +86,13 @@
 	-->
 
 	<key>CFBundleExecutable</key>
-	<string>TARGET.VERSION</string>
+	<string>TARGET</string>
 
 	<key>ifdManufacturerString</key>
 	<string>Ludovic Rousseau (ludovic.rousseau at free.fr)</string>
 
 	<key>ifdProductString</key>
-	<string>Generic CCID driver vVERSION</string>
+	<string>Generic CCID driver</string>
 
 	<key>ifdVendorID</key>
 	<array>

Modified: trunk/Drivers/ccid/src/Makefile.am
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/Makefile.am?rev=3024&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/Makefile.am (original)
+++ trunk/Drivers/ccid/src/Makefile.am Thu Jun 26 13:20:43 2008
@@ -82,7 +82,7 @@
 endif
 
 Info.plist: Info.plist.src $(srcdir)/../readers/supported_readers.txt
-	$(srcdir)/create_Info_plist.pl $(srcdir)/../readers/supported_readers.txt $(srcdir)/Info.plist.src $(ifdCapabilities) | sed s/VERSION/$(VERSION)/ | sed s/TARGET/$(CCID_LIB)/ > Info.plist
+	$(srcdir)/create_Info_plist.pl $(srcdir)/../readers/supported_readers.txt $(srcdir)/Info.plist.src $(ifdCapabilities) | sed s/TARGET/$(CCID_LIB)/ > Info.plist
 	
 DISTCLEANFILES = Info.plist
 
@@ -90,6 +90,7 @@
 	$(mkinstalldirs) $(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/$(BUNDLE_HOST)/
 	cp Info.plist $(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/
 	cp .libs/$(CCID_LIB) $(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/$(BUNDLE_HOST)/$(CCID_LIB).$(VERSION)
+	ln -fs $(CCID_LIB).$(VERSION) $(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/$(BUNDLE_HOST)/$(CCID_LIB)
 	$(INSTALL_UDEV_RULE_FILE)
 
 install_ccidtwin: libccidtwin.la

Modified: trunk/Drivers/ccid/src/ifdhandler.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/ifdhandler.c?rev=3024&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/ifdhandler.c (original)
+++ trunk/Drivers/ccid/src/ifdhandler.c Thu Jun 26 13:20:43 2008
@@ -1317,6 +1317,8 @@
 	char infofile[FILENAME_MAX];
 	char *e;
 
+	DEBUG_INFO("Driver version: " VERSION);
+
 	/* Info.plist full patch filename */
 	snprintf(infofile, sizeof(infofile), "%s/%s/Contents/Info.plist",
 		PCSCLITE_HP_DROPDIR, BUNDLE);