[Pkg-coolkey-commits] r20 - in /coolkey/trunk/debian: changelog patches/00list patches/01_coolkey_cpp.dpatch patches/02_log_cpp.dpatch patches/03_machdep_cpp.dpatch patches/04_object_cpp.dpatch patches/05_slot_cpp.dpatch

rousseau at users.alioth.debian.org rousseau at users.alioth.debian.org
Sun Jan 6 13:36:26 UTC 2008


Author: rousseau
Date: Sun Jan  6 13:36:26 2008
New Revision: 20

URL: http://svn.debian.org/wsvn/pkg-coolkey/?sc=1&rev=20
Log:
fixes for g++ 4.3.  Closes: #455658 "FTBFS with GCC 4.3: #define
redefined"

Added:
    coolkey/trunk/debian/patches/00list
    coolkey/trunk/debian/patches/01_coolkey_cpp.dpatch   (with props)
    coolkey/trunk/debian/patches/02_log_cpp.dpatch   (with props)
    coolkey/trunk/debian/patches/03_machdep_cpp.dpatch   (with props)
    coolkey/trunk/debian/patches/04_object_cpp.dpatch   (with props)
    coolkey/trunk/debian/patches/05_slot_cpp.dpatch   (with props)
Modified:
    coolkey/trunk/debian/changelog

Modified: coolkey/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-coolkey/coolkey/trunk/debian/changelog?rev=20&op=diff
==============================================================================
--- coolkey/trunk/debian/changelog (original)
+++ coolkey/trunk/debian/changelog Sun Jan  6 13:36:26 2008
@@ -13,8 +13,11 @@
    - set libckyapplet1-dev in Section: libdevel instead of devel
    - change coolkey Depends: from libccid, pcscd to libpcsclite1
      Closes: #445164 "coolkey: Update libccid depends for pcsc-omnikey"
+  * debian/patches/{01_coolkey_cpp.dpatch, 02_log_cpp.dpatch,
+    03_machdep_cpp.dpatch, 04_object_cpp.dpatch, 05_slot_cpp.dpatch}: fixes
+    for g++ 4.3.  Closes: #455658 "FTBFS with GCC 4.3: #define redefined"
 
- -- Ludovic Rousseau <rousseau at debian.org>  Sun, 06 Jan 2008 14:04:14 +0100
+ -- Ludovic Rousseau <rousseau at debian.org>  Sun, 06 Jan 2008 14:34:22 +0100
 
 coolkey (1.1.0-2) unstable; urgency=low
 

Added: coolkey/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-coolkey/coolkey/trunk/debian/patches/00list?rev=20&op=file
==============================================================================
--- coolkey/trunk/debian/patches/00list (added)
+++ coolkey/trunk/debian/patches/00list Sun Jan  6 13:36:26 2008
@@ -1,0 +1,5 @@
+01_coolkey_cpp.dpatch
+02_log_cpp.dpatch
+03_machdep_cpp.dpatch
+04_object_cpp.dpatch
+05_slot_cpp.dpatch

Added: coolkey/trunk/debian/patches/01_coolkey_cpp.dpatch
URL: http://svn.debian.org/wsvn/pkg-coolkey/coolkey/trunk/debian/patches/01_coolkey_cpp.dpatch?rev=20&op=file
==============================================================================
--- coolkey/trunk/debian/patches/01_coolkey_cpp.dpatch (added)
+++ coolkey/trunk/debian/patches/01_coolkey_cpp.dpatch Sun Jan  6 13:36:26 2008
@@ -1,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_coolkey_cpp.dpatch by  <rousseau at imac.maison.bogus>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Closes: #455658 FTBFS with GCC 4.3: #define redefined
+
+ at DPATCH@
+diff -urNad coolkey-1.1.0~/src/coolkey/coolkey.cpp coolkey-1.1.0/src/coolkey/coolkey.cpp
+--- coolkey-1.1.0~/src/coolkey/coolkey.cpp	2007-02-14 20:54:01.000000000 +0100
++++ coolkey-1.1.0/src/coolkey/coolkey.cpp	2008-01-06 14:12:35.000000000 +0100
+@@ -34,7 +34,9 @@
+ #include "cky_base.h"
+ #include "params.h"
+ 
++#ifndef NULL
+ #define NULL 0
++#endif
+ 
+ /* static module data --------------------------------  */
+ 

Propchange: coolkey/trunk/debian/patches/01_coolkey_cpp.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: coolkey/trunk/debian/patches/02_log_cpp.dpatch
URL: http://svn.debian.org/wsvn/pkg-coolkey/coolkey/trunk/debian/patches/02_log_cpp.dpatch?rev=20&op=file
==============================================================================
--- coolkey/trunk/debian/patches/02_log_cpp.dpatch (added)
+++ coolkey/trunk/debian/patches/02_log_cpp.dpatch Sun Jan  6 13:36:26 2008
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_log_cpp.dpatch by  <rousseau at imac.maison.bogus>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix for g++ 4.3
+
+ at DPATCH@
+diff -urNad coolkey-1.1.0~/src/coolkey/log.cpp coolkey-1.1.0/src/coolkey/log.cpp
+--- coolkey-1.1.0~/src/coolkey/log.cpp	2007-02-14 20:54:01.000000000 +0100
++++ coolkey-1.1.0/src/coolkey/log.cpp	2008-01-06 14:18:11.000000000 +0100
+@@ -17,6 +17,8 @@
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  * ***** END COPYRIGHT BLOCK *****/
+ 
++#include <stdlib.h>
++#include <string.h>
+ #include <string>
+ #include "mypkcs11.h"
+ #include <assert.h>

Propchange: coolkey/trunk/debian/patches/02_log_cpp.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: coolkey/trunk/debian/patches/03_machdep_cpp.dpatch
URL: http://svn.debian.org/wsvn/pkg-coolkey/coolkey/trunk/debian/patches/03_machdep_cpp.dpatch?rev=20&op=file
==============================================================================
--- coolkey/trunk/debian/patches/03_machdep_cpp.dpatch (added)
+++ coolkey/trunk/debian/patches/03_machdep_cpp.dpatch Sun Jan  6 13:36:26 2008
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_machdep_cpp.dpatch by  <rousseau at imac.maison.bogus>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix for g++ 4.3
+
+ at DPATCH@
+diff -urNad coolkey-1.1.0~/src/coolkey/machdep.cpp coolkey-1.1.0/src/coolkey/machdep.cpp
+--- coolkey-1.1.0~/src/coolkey/machdep.cpp	2007-02-14 01:46:28.000000000 +0100
++++ coolkey-1.1.0/src/coolkey/machdep.cpp	2008-01-06 14:19:04.000000000 +0100
+@@ -17,6 +17,8 @@
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  * ***** END COPYRIGHT BLOCK *****/
+ 
++#include <stdlib.h>
++#include <string.h>
+ #include "machdep.h"
+ #include "mypkcs11.h"
+ #include "PKCS11Exception.h"

Propchange: coolkey/trunk/debian/patches/03_machdep_cpp.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: coolkey/trunk/debian/patches/04_object_cpp.dpatch
URL: http://svn.debian.org/wsvn/pkg-coolkey/coolkey/trunk/debian/patches/04_object_cpp.dpatch?rev=20&op=file
==============================================================================
--- coolkey/trunk/debian/patches/04_object_cpp.dpatch (added)
+++ coolkey/trunk/debian/patches/04_object_cpp.dpatch Sun Jan  6 13:36:26 2008
@@ -1,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_object_cpp.dpatch by  <rousseau at imac.maison.bogus>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix for g++ 4.3
+
+ at DPATCH@
+diff -urNad coolkey-1.1.0~/src/coolkey/object.cpp coolkey-1.1.0/src/coolkey/object.cpp
+--- coolkey-1.1.0~/src/coolkey/object.cpp	2007-02-09 19:53:21.000000000 +0100
++++ coolkey-1.1.0/src/coolkey/object.cpp	2008-01-06 14:22:42.000000000 +0100
+@@ -17,6 +17,7 @@
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  * ***** END COPYRIGHT BLOCK *****/
+ 
++#include <string.h>
+ #include "mypkcs11.h"
+ #include "PKCS11Exception.h"
+ #include "object.h"

Propchange: coolkey/trunk/debian/patches/04_object_cpp.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: coolkey/trunk/debian/patches/05_slot_cpp.dpatch
URL: http://svn.debian.org/wsvn/pkg-coolkey/coolkey/trunk/debian/patches/05_slot_cpp.dpatch?rev=20&op=file
==============================================================================
--- coolkey/trunk/debian/patches/05_slot_cpp.dpatch (added)
+++ coolkey/trunk/debian/patches/05_slot_cpp.dpatch Sun Jan  6 13:36:26 2008
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_slot_cpp.dpatch by  <rousseau at imac.maison.bogus>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix for g++ 4.3
+
+ at DPATCH@
+diff -urNad coolkey-1.1.0.obsolete.0.590099710113467~/src/coolkey/slot.cpp coolkey-1.1.0.obsolete.0.590099710113467/src/coolkey/slot.cpp
+--- coolkey-1.1.0.obsolete.0.590099710113467~/src/coolkey/slot.cpp	2008-01-06 14:27:32.000000000 +0100
++++ coolkey-1.1.0.obsolete.0.590099710113467/src/coolkey/slot.cpp	2008-01-06 14:27:58.000000000 +0100
+@@ -33,7 +33,7 @@
+ 
+ #define MIN(x, y) ((x) < (y) ? (x) : (y))
+ 
+-using std::auto_ptr;
++//using std::auto_ptr;
+ 
+ 
+ #ifdef DEBUG

Propchange: coolkey/trunk/debian/patches/05_slot_cpp.dpatch
------------------------------------------------------------------------------
    svn:executable = *




More information about the Pkg-coolkey-commits mailing list