[Pkg-coolkey-commits] r43 - in /coolkey/trunk/debian: changelog patches/coolkey-pcsc-lite patches/series

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Wed Feb 23 20:30:40 2011
New Revision: 43

URL: http://svn.debian.org/wsvn/pkg-coolkey/?sc=1&rev=43
Log:
Fix "FTBFS: cky_card.h:44: error: expected ')' before '*' token"
patch in coolkey-pcsc-lite (Closes: #614437)

Added:
    coolkey/trunk/debian/patches/coolkey-pcsc-lite
Modified:
    coolkey/trunk/debian/changelog
    coolkey/trunk/debian/patches/series

Modified: coolkey/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-coolkey/coolkey/trunk/debian/changelog?rev=43&op=diff
==============================================================================
--- coolkey/trunk/debian/changelog (original)
+++ coolkey/trunk/debian/changelog Wed Feb 23 20:30:40 2011
@@ -1,5 +1,6 @@
 coolkey (1.1.0-7) experimental; urgency=low
 
+  [ A. Maitland Bottoms ]
   * Update packaging using dh and dpkg-source 3.0 (quilt) format
   * upstream coolkey-coolkey-cache-dir-move.patch
   * upstream coolkey-gcc43.patch
@@ -9,7 +10,11 @@
   * upstream coolkey-cac.patch
   * upstream coolkey-cac-1.patch
 
- -- A. Maitland Bottoms <bottoms at debian.org>  Wed, 22 Dec 2010 19:12:07 -0500
+  [ Ludovic Rousseau ]
+  * Fix "FTBFS: cky_card.h:44: error: expected ')' before '*' token"
+    patch in coolkey-pcsc-lite (Closes: #614437)
+
+ -- Ludovic Rousseau <rousseau at debian.org>  Wed, 23 Feb 2011 21:29:42 +0100
 
 coolkey (1.1.0-6) unstable; urgency=low
 

Added: coolkey/trunk/debian/patches/coolkey-pcsc-lite
URL: http://svn.debian.org/wsvn/pkg-coolkey/coolkey/trunk/debian/patches/coolkey-pcsc-lite?rev=43&op=file
==============================================================================
--- coolkey/trunk/debian/patches/coolkey-pcsc-lite (added)
+++ coolkey/trunk/debian/patches/coolkey-pcsc-lite Wed Feb 23 20:30:40 2011
@@ -1,0 +1,59 @@
+Description: fix compiler errors using recent pcsc-lite
+Author: Ludovic Rousseau <rousseau at debian.org>
+Last-Update: 2011-02-23
+--- a/src/libckyapplet/cky_card.h
++++ b/src/libckyapplet/cky_card.h
+@@ -41,23 +41,23 @@
+ CKYLIST_DECLARE(CKYCardConnection, CKYCardConnection *)
+ 
+ CKY_BEGIN_PROTOS
+-void CKYReader_Init(SCARD_READERSTATE_A *reader);
+-void CKYReader_FreeData(SCARD_READERSTATE_A *reader);
++void CKYReader_Init(SCARD_READERSTATE *reader);
++void CKYReader_FreeData(SCARD_READERSTATE *reader);
+ 
+ /*
+- * "Accessors": for SCARD_READERSTATE_A structure as a class.
+- * These functions take an SCARD_READERSTATE_A which can also be referenced
++ * "Accessors": for SCARD_READERSTATE structure as a class.
++ * These functions take an SCARD_READERSTATE which can also be referenced
+  * directly.
+  */
+-CKYStatus CKYReader_SetReaderName(SCARD_READERSTATE_A *reader, const char *name);
+-const char *CKYReader_GetReaderName(const SCARD_READERSTATE_A *reader);
+-CKYStatus CKYReader_SetKnownState(SCARD_READERSTATE_A *reader, 
++CKYStatus CKYReader_SetReaderName(SCARD_READERSTATE *reader, const char *name);
++const char *CKYReader_GetReaderName(const SCARD_READERSTATE *reader);
++CKYStatus CKYReader_SetKnownState(SCARD_READERSTATE *reader, 
+ 						unsigned long state);
+-unsigned long CKYReader_GetKnownState(const SCARD_READERSTATE_A *reader);
+-unsigned long CKYReader_GetEventState(const SCARD_READERSTATE_A *reader);
+-CKYStatus CKYReader_GetATR(const SCARD_READERSTATE_A *reader, CKYBuffer *buf);
++unsigned long CKYReader_GetKnownState(const SCARD_READERSTATE *reader);
++unsigned long CKYReader_GetEventState(const SCARD_READERSTATE *reader);
++CKYStatus CKYReader_GetATR(const SCARD_READERSTATE *reader, CKYBuffer *buf);
+ /* create an array of READERSTATEs from a LIST of Readers */
+-SCARD_READERSTATE_A *CKYReader_CreateArray(const CKYReaderNameList readerNames, 
++SCARD_READERSTATE *CKYReader_CreateArray(const CKYReaderNameList readerNames, 
+ 					  unsigned long *readerCount);
+ /* frees the reader, then the full array */
+ void CKYReader_DestroyArray(SCARD_READERSTATE *reader, unsigned long count);
+@@ -88,7 +88,7 @@
+ 				const CKYBuffer *targetATR);
+ /* return if any of the readers in our array has changed in status */
+ CKYStatus CKYCardContext_WaitForStatusChange(CKYCardContext *context,
+-				SCARD_READERSTATE_A *readers,
++				SCARD_READERSTATE *readers,
+ 				unsigned long readerCount,
+ 				unsigned long timeout);
+ /* cancel any current operation (such as wait for status change) on this
+--- a/src/libckyapplet/cky_card.c
++++ b/src/libckyapplet/cky_card.c
+@@ -27,7 +27,6 @@
+ 
+ #ifndef WINAPI
+ #define WINAPI
+-typedef SCARD_READERSTATE *LPSCARD_READERSTATE;
+ #endif
+ 
+ #ifndef SCARD_E_NO_READERS_AVAILABLE

Modified: coolkey/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-coolkey/coolkey/trunk/debian/patches/series?rev=43&op=diff
==============================================================================
--- coolkey/trunk/debian/patches/series (original)
+++ coolkey/trunk/debian/patches/series Wed Feb 23 20:30:40 2011
@@ -1,3 +1,4 @@
+coolkey-pcsc-lite
 coolkey-cache-dir-move.patch 
 coolkey-gcc43.patch 
 coolkey-latest.patch