[Python-modules-commits] r21476 - in packages/pyscard/trunk/debian (3 files)

[rousseau at users.alioth.debian.org]

    Date: Tuesday, May 1, 2012 @ 15:24:15
  Author: rousseau
Revision: 21476

debian/patches/SCardCancelTransaction.patch: removed since included
upstream

Modified:
  packages/pyscard/trunk/debian/changelog
  packages/pyscard/trunk/debian/patches/series
Deleted:
  packages/pyscard/trunk/debian/patches/SCardCancelTransaction.patch

Modified: packages/pyscard/trunk/debian/changelog
===================================================================
--- packages/pyscard/trunk/debian/changelog	2012-05-01 15:22:20 UTC (rev 21475)
+++ packages/pyscard/trunk/debian/changelog	2012-05-01 15:24:15 UTC (rev 21476)
@@ -4,8 +4,10 @@
   * Fix "Please drop alternative dependency on python-wxgtk2.6"
     Removed Suggests: python-wxgtk2.6 as the package is no more available in
     Debian (Closes: #645891)
+  * debian/patches/SCardCancelTransaction.patch: removed since included
+    upstream
 
- -- Ludovic Rousseau <rousseau at debian.org>  Tue, 01 May 2012 17:20:12 +0200
+ -- Ludovic Rousseau <rousseau at debian.org>  Tue, 01 May 2012 17:23:40 +0200
 
 pyscard (1.6.12-4) unstable; urgency=low
 

Deleted: packages/pyscard/trunk/debian/patches/SCardCancelTransaction.patch
===================================================================
--- packages/pyscard/trunk/debian/patches/SCardCancelTransaction.patch	2012-05-01 15:22:20 UTC (rev 21475)
+++ packages/pyscard/trunk/debian/patches/SCardCancelTransaction.patch	2012-05-01 15:24:15 UTC (rev 21476)
@@ -1,61 +0,0 @@
-Description: Remove support for SCardCancelTransaction(). It is not used
-on Windows and removed oin pcsc-lite >= 1.6.5
-
-This function was not exported at the Python interface. So no regression
-planned.  This change will just avoid a warning message on the console:
-Failed to load symbol for: SCardCancelTransaction,
-/usr/lib/libpcsclite.so.1: undefined symbol: SCardCancelTransaction!
-Origin: upstream, http://pyscard.svn.sourceforge.net/viewvc/pyscard?view=revision&revision=516
-Bug-Debian: http://bugs.debian.org/618841
---- a/smartcard/scard/winscarddll.c
-+++ b/smartcard/scard/winscarddll.c
-@@ -463,15 +463,6 @@
- }
- 
- static WINSCARDAPI SCARDRETCODE
--WINAPI _defaultSCARDCANCELTRANSACTION(
--    IN      SCARDHANDLE hCard)
--{
--	(void)hCard;
--
--    return SCARD_E_NO_SERVICE;
--}
--
--static WINSCARDAPI SCARDRETCODE
- WINAPI _defaultSCARDCONNECTA(
-     IN      SCARDCONTEXT hContext,
-     IN      LPCTSTR szReader,
-@@ -651,7 +642,6 @@
- 
- SCARDBEGINTRANSACTION           mySCardBeginTransaction             = _defaultSCARDBEGINTRANSACTION;
- SCARDCANCEL                     mySCardCancel                       = _defaultSCARDCANCEL;
--SCARDCANCELTRANSACTION          mySCardCancelTransaction            = _defaultSCARDCANCELTRANSACTION;
- SCARDCONNECTA                   mySCardConnectA                     = _defaultSCARDCONNECTA;
- SCARDCONTROL                    mySCardControl                      = _defaultSCARDCONTROL;
- SCARDDISCONNECT                 mySCardDisconnect                   = _defaultSCARDDISCONNECT;
-@@ -695,7 +685,6 @@
-                 GETPROCADDRESS( SCARDACCESSSTARTEDEVENT         , SCardAccessStartedEvent );
-                 GETPROCADDRESS( SCARDBEGINTRANSACTION           , SCardBeginTransaction );
-                 GETPROCADDRESS( SCARDCANCEL                     , SCardCancel );
--                GETPROCADDRESS( SCARDCANCELTRANSACTION          , SCardCancelTransaction );
-                 GETPROCADDRESS( SCARDCONNECTA                   , SCardConnectA );
-                 GETPROCADDRESS( SCARDCONTROL                    , SCardControl );
-                 GETPROCADDRESS( SCARDDISCONNECT                 , SCardDisconnect );
-@@ -769,7 +758,6 @@
-                 lRetCode=SCARD_S_SUCCESS;
-                 GETPROCADDRESS( SCARDBEGINTRANSACTION  , SCardBeginTransaction  , SCardBeginTransaction  );
-                 GETPROCADDRESS( SCARDCANCEL            , SCardCancel            , SCardCancel );
--                GETPROCADDRESS( SCARDCANCELTRANSACTION , SCardCancelTransaction , SCardCancelTransaction );
-                 GETPROCADDRESS( SCARDCONNECTA          , SCardConnectA          , SCardConnect           );
-                 GETPROCADDRESS( SCARDDISCONNECT        , SCardDisconnect        , SCardDisconnect        );
-                 GETPROCADDRESS( SCARDENDTRANSACTION    , SCardEndTransaction    , SCardEndTransaction    );
---- a/smartcard/scard/winscarddll.h
-+++ b/smartcard/scard/winscarddll.h
-@@ -348,7 +348,6 @@
- 
- extern SCARDBEGINTRANSACTION           mySCardBeginTransaction;
- extern SCARDCANCEL                     mySCardCancel;
--extern SCARDCANCELTRANSACTION          mySCardCancelTransaction;
- extern SCARDCONNECTA                   mySCardConnectA;
- extern SCARDCONTROL                    mySCardControl;
- extern SCARDDISCONNECT                 mySCardDisconnect;

Modified: packages/pyscard/trunk/debian/patches/series
===================================================================
--- packages/pyscard/trunk/debian/patches/series	2012-05-01 15:22:20 UTC (rev 21475)
+++ packages/pyscard/trunk/debian/patches/series	2012-05-01 15:24:15 UTC (rev 21476)
@@ -1 +0,0 @@
-SCardCancelTransaction.patch