Bug#455286: belpic: diff for NMU version 2.6.0-3.1

2008-04-05 Thread madcoder
tags 455286 + patch
thanks

Hi,

The following is the diff for my belpic 2.6.0-3.1 NMU.

diff -u belpic-2.6.0/src/beidcommon/TLVBuffer.cpp 
belpic-2.6.0/src/beidcommon/TLVBuffer.cpp
--- belpic-2.6.0/src/beidcommon/TLVBuffer.cpp
+++ belpic-2.6.0/src/beidcommon/TLVBuffer.cpp
@@ -5,6 +5,7 @@
 #include TLVBuffer.h
 
 #include cstdlib
+#include cstring
 
 namespace eidcommon
 {
diff -u belpic-2.6.0/src/beidcommon/datafile.cpp 
belpic-2.6.0/src/beidcommon/datafile.cpp
--- belpic-2.6.0/src/beidcommon/datafile.cpp
+++ belpic-2.6.0/src/beidcommon/datafile.cpp
@@ -43,6 +43,8 @@
 #include windows.h
 #endif
 
+#include cstring
+
 
 // Compatibility Defines 

 
/
diff -u belpic-2.6.0/debian/changelog belpic-2.6.0/debian/changelog
--- belpic-2.6.0/debian/changelog
+++ belpic-2.6.0/debian/changelog
@@ -1,3 +1,10 @@
+belpic (2.6.0-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix g++-4.3 FTBFS thanks to Cyril Brulebois. Closes: #455286.
+
+ -- Pierre Habouzit [EMAIL PROTECTED]  Sat, 05 Apr 2008 22:05:18 +
+
 belpic (2.6.0-3) unstable; urgency=low
 
   * Apply patch to fix library usage. Closes: #413666
only in patch2:
unchanged:
--- belpic-2.6.0.orig/src/eidlib/OpenSCReader.cpp
+++ belpic-2.6.0/src/eidlib/OpenSCReader.cpp
@@ -11,6 +11,8 @@
 #include opensc/pkcs15.h
 #include string.h
 
+#include cstdlib
+
 
 struct pcsc_slot_data {unsigned long pcsc_card; }; /* comes from 
reader-pcsc.c */
 #define GET_SLOT_DATA(r) ((struct pcsc_slot_data *) (r)-drv_data)
only in patch2:
unchanged:
--- belpic-2.6.0.orig/src/eidlib/eiderrors.h
+++ belpic-2.6.0/src/eidlib/eiderrors.h
@@ -21,6 +21,8 @@
 #define SCARD_E_NO_ACCESS   0x80100027
 #endif
 
+#include cstring
+
 typedef struct
 {
 int iOpenSC;



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#455286: belpic: diff for NMU version 2.6.0-3.1

2008-04-05 Thread Steve McIntyre
tags 455286 + patch
thanks

Hi,

Attached is the diff for my belpic 2.6.0-3.1 NMU.
-- 
Steve McIntyre, Cambridge, UK.[EMAIL PROTECTED]
You lock the door
And throw away the key
There's someone in my head but it's not me 
diff -u belpic-2.6.0/src/beidcommon/TLVBuffer.cpp belpic-2.6.0/src/beidcommon/TLVBuffer.cpp
--- belpic-2.6.0/src/beidcommon/TLVBuffer.cpp
+++ belpic-2.6.0/src/beidcommon/TLVBuffer.cpp
@@ -5,6 +5,7 @@
 #include TLVBuffer.h
 
 #include cstdlib
+#include cstring
 
 namespace eidcommon
 {
diff -u belpic-2.6.0/src/beidcommon/datafile.cpp belpic-2.6.0/src/beidcommon/datafile.cpp
--- belpic-2.6.0/src/beidcommon/datafile.cpp
+++ belpic-2.6.0/src/beidcommon/datafile.cpp
@@ -43,6 +43,8 @@
 #include windows.h
 #endif
 
+#include cstring
+
 
 // Compatibility Defines 
 /
diff -u belpic-2.6.0/debian/changelog belpic-2.6.0/debian/changelog
--- belpic-2.6.0/debian/changelog
+++ belpic-2.6.0/debian/changelog
@@ -1,3 +1,11 @@
+belpic (2.6.0-3.1) unstable; urgency=low
+
+  * NMU from the Cambridge BSP
+  * Apply patch from Cyril Brulebois to fix FTBFS with g++-4.3.
+Closes: #455286
+
+ -- Steve McIntyre [EMAIL PROTECTED]  Sat, 05 Apr 2008 23:13:05 +0100
+
 belpic (2.6.0-3) unstable; urgency=low
 
   * Apply patch to fix library usage. Closes: #413666
only in patch2:
unchanged:
--- belpic-2.6.0.orig/src/eidlib/eiderrors.h
+++ belpic-2.6.0/src/eidlib/eiderrors.h
@@ -21,6 +21,8 @@
 #define SCARD_E_NO_ACCESS   0x80100027
 #endif
 
+#include cstring
+
 typedef struct
 {
 int iOpenSC;
only in patch2:
unchanged:
--- belpic-2.6.0.orig/src/eidlib/OpenSCReader.cpp
+++ belpic-2.6.0/src/eidlib/OpenSCReader.cpp
@@ -11,6 +11,8 @@
 #include opensc/pkcs15.h
 #include string.h
 
+#include cstdlib
+
 
 struct pcsc_slot_data {	unsigned long pcsc_card; }; /* comes from reader-pcsc.c */
 #define GET_SLOT_DATA(r) ((struct pcsc_slot_data *) (r)-drv_data)


signature.asc
Description: Digital signature