Author: malat-guest Date: 2012-03-05 09:55:48 +0000 (Mon, 05 Mar 2012) New Revision: 9882
Modified: trunk/packages/dicom3tools/trunk/debian/changelog trunk/packages/dicom3tools/trunk/debian/patches/20_gcc4.3.patch trunk/packages/dicom3tools/trunk/debian/patches/configure.patch Log: Upstream started support for newer gcc version Modified: trunk/packages/dicom3tools/trunk/debian/changelog =================================================================== --- trunk/packages/dicom3tools/trunk/debian/changelog 2012-03-05 09:48:32 UTC (rev 9881) +++ trunk/packages/dicom3tools/trunk/debian/changelog 2012-03-05 09:55:48 UTC (rev 9882) @@ -1,8 +1,9 @@ -dicom3tools (1.0~20120224-2) UNRELEASED; urgency=low +dicom3tools (1.0~20120228-1) unstable; urgency=low + * New release. * Bump Standards-Version to 3.9.3. No changes needed - -- Mathieu Malaterre <[email protected]> Sun, 26 Feb 2012 21:49:06 +0100 + -- Mathieu Malaterre <[email protected]> Mon, 05 Mar 2012 10:52:19 +0100 dicom3tools (1.0~20120224-1) unstable; urgency=low Modified: trunk/packages/dicom3tools/trunk/debian/patches/20_gcc4.3.patch =================================================================== --- trunk/packages/dicom3tools/trunk/debian/patches/20_gcc4.3.patch 2012-03-05 09:48:32 UTC (rev 9881) +++ trunk/packages/dicom3tools/trunk/debian/patches/20_gcc4.3.patch 2012-03-05 09:55:48 UTC (rev 9882) @@ -8,408 +8,31 @@ the most complex part comes from the deprecation of ostrstream with a different ostringstream (allocation is not done at same level) -Index: dicom3tools-1.0~20110529/appsrc/acrnema/ancp.cc +Index: dicom3tools-1.0~20120228/appsrc/dcfile/dcdirmk.cc_sqlengths =================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/acrnema/ancp.cc 2011-02-02 13:14:43.000000000 +0100 -+++ dicom3tools-1.0~20110529/appsrc/acrnema/ancp.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,5 +1,7 @@ --#include <iostream.h> --#include <iomanip.h> -+#include <iostream> -+#include <stdio.h> -+using namespace std; -+#include <iomanip> - #include <string.h> - #include <ctype.h> - -Index: dicom3tools-1.0~20110529/appsrc/acrnema/ancreate.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/acrnema/ancreate.cc 2011-02-02 13:13:44.000000000 +0100 -+++ dicom3tools-1.0~20110529/appsrc/acrnema/ancreate.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,5 +1,6 @@ --#include <iostream.h> --#include <iomanip.h> -+#include <iostream> -+using namespace std; -+#include <iomanip> - #include <string.h> - #include <ctype.h> - -Index: dicom3tools-1.0~20110529/appsrc/acrnema/andump.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/acrnema/andump.cc 2008-05-21 14:02:24.000000000 +0200 -+++ dicom3tools-1.0~20110529/appsrc/acrnema/andump.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,5 +1,7 @@ --#include <iostream.h> --#include <iomanip.h> -+#include <iostream> -+#include <stdio.h> -+using namespace std; -+#include <iomanip> - #include <string.h> - #include <ctype.h> - -Index: dicom3tools-1.0~20110529/appsrc/dcfile/dcdirmk.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/dcfile/dcdirmk.cc 2010-01-30 19:00:45.000000000 +0100 -+++ dicom3tools-1.0~20110529/appsrc/dcfile/dcdirmk.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,5 @@ --#include <fstream.h> -+#include <fstream> -+#include <stdio.h> - #include <ctype.h> - - #include "attrmxls.h" -Index: dicom3tools-1.0~20110529/appsrc/dcfile/dcdirmk.cc_sqlengths -=================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/dcfile/dcdirmk.cc_sqlengths 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/appsrc/dcfile/dcdirmk.cc_sqlengths 2011-08-29 21:39:18.000000000 +0200 +--- dicom3tools-1.0~20120228.orig/appsrc/dcfile/dcdirmk.cc_sqlengths 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools-1.0~20120228/appsrc/dcfile/dcdirmk.cc_sqlengths 2012-03-05 10:54:02.000000000 +0100 @@ -1,4 +1,4 @@ -#include <fstream.h> +#include <fstream> #include "attrmxls.h" #include "attrtype.h" -Index: dicom3tools-1.0~20110529/appsrc/dcfile/dcdtchg.cc +Index: dicom3tools-1.0~20120228/appsrc/misc/jpegdump.cc.pre2000 =================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/dcfile/dcdtchg.cc 2007-11-10 17:06:29.000000000 +0100 -+++ dicom3tools-1.0~20110529/appsrc/dcfile/dcdtchg.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,4 @@ --#include <fstream.h> -+#include <fstream> - //#include <time.h> - - #include "attrmxls.h" -Index: dicom3tools-1.0~20110529/appsrc/dcfile/dcentvfy.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/dcfile/dcentvfy.cc 2009-12-22 15:06:58.000000000 +0100 -+++ dicom3tools-1.0~20110529/appsrc/dcfile/dcentvfy.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,4 @@ --#include <fstream.h> -+#include <fstream> - - #include "attrmxls.h" - #include "mesgtext.h" -Index: dicom3tools-1.0~20110529/appsrc/dcfile/dcmulti.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/dcfile/dcmulti.cc 2010-02-06 23:34:45.000000000 +0100 -+++ dicom3tools-1.0~20110529/appsrc/dcfile/dcmulti.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,4 @@ --#include <fstream.h> -+#include <fstream> - #include <ctype.h> - - #include "attrmxls.h" -Index: dicom3tools-1.0~20110529/appsrc/dcfile/dcpost.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/dcfile/dcpost.cc 2009-11-14 15:31:24.000000000 +0100 -+++ dicom3tools-1.0~20110529/appsrc/dcfile/dcpost.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,4 @@ --#include <fstream.h> -+#include <fstream> - - #include "attrmxls.h" - #include "attrtype.h" -Index: dicom3tools-1.0~20110529/appsrc/dcfile/dcrmmeta.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/dcfile/dcrmmeta.cc 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/appsrc/dcfile/dcrmmeta.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,5 +1,6 @@ --#include <iostream.h> --#include <iomanip.h> -+#include <iostream> -+using namespace std; -+#include <iomanip> - #include <string.h> - #include <ctype.h> - -Index: dicom3tools-1.0~20110529/appsrc/dcfile/dcsort.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/dcfile/dcsort.cc 2009-12-22 19:27:11.000000000 +0100 -+++ dicom3tools-1.0~20110529/appsrc/dcfile/dcsort.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,4 @@ --#include <fstream.h> -+#include <fstream> - - #include "attrmxls.h" - #include "attrtype.h" -Index: dicom3tools-1.0~20110529/appsrc/dcfile/dcsqextr.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/dcfile/dcsqextr.cc 2007-03-16 03:00:20.000000000 +0100 -+++ dicom3tools-1.0~20110529/appsrc/dcfile/dcsqextr.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,4 @@ --#include <fstream.h> -+#include <fstream> - - #include "transynu.h" - #include "attrmxls.h" -Index: dicom3tools-1.0~20110529/appsrc/dcfile/dcsrmrg.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/dcfile/dcsrmrg.cc 2006-09-17 19:24:08.000000000 +0200 -+++ dicom3tools-1.0~20110529/appsrc/dcfile/dcsrmrg.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,4 @@ --#include <fstream.h> -+#include <fstream> - - #include "attrmxls.h" - #include "attrtype.h" -Index: dicom3tools-1.0~20110529/appsrc/dcfile/dctable.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/dcfile/dctable.cc 2010-03-23 19:08:09.000000000 +0100 -+++ dicom3tools-1.0~20110529/appsrc/dcfile/dctable.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,4 @@ --#include <fstream.h> -+#include <fstream> - - #include "attrmxls.h" - #include "attrnew.h" -Index: dicom3tools-1.0~20110529/appsrc/dcfile/dcuidchg.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/dcfile/dcuidchg.cc 2007-03-16 03:00:21.000000000 +0100 -+++ dicom3tools-1.0~20110529/appsrc/dcfile/dcuidchg.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,4 @@ --#include <fstream.h> -+#include <fstream> - - #include "attrmxls.h" - #include "attrtype.h" -Index: dicom3tools-1.0~20110529/appsrc/dcfile/dcuncat.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/dcfile/dcuncat.cc 2010-01-31 12:46:41.000000000 +0100 -+++ dicom3tools-1.0~20110529/appsrc/dcfile/dcuncat.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,4 @@ --#include <fstream.h> -+#include <fstream> - - #include "attrmxls.h" - #include "attrtype.h" -Index: dicom3tools-1.0~20110529/appsrc/dconvert/pq/pqsplit.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/dconvert/pq/pqsplit.cc 2004-11-24 19:29:24.000000000 +0100 -+++ dicom3tools-1.0~20110529/appsrc/dconvert/pq/pqsplit.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,5 +1,6 @@ --#include <iostream.h> --#include <fstream.h> -+#include <iostream> -+using namespace std; -+#include <fstream> - #include <assert.h> - #include <string.h> - #include <stdlib.h> // for atoi() -Index: dicom3tools-1.0~20110529/appsrc/misc/binpatch.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/misc/binpatch.cc 2004-11-24 21:32:57.000000000 +0100 -+++ dicom3tools-1.0~20110529/appsrc/misc/binpatch.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,6 +1,7 @@ --#include <iostream.h> // for listsimp.h --#include <iomanip.h> // for listsimp.h --#include <fstream.h> -+#include <iostream> -+using namespace std; // for listsimp.h -+#include <iomanip> // for listsimp.h -+#include <fstream> - #include <stdlib.h> // for atoi() - #include <string.h> // for strlen() - #include <ctype.h> // for isdigit() -Index: dicom3tools-1.0~20110529/appsrc/misc/dcunmeta.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/misc/dcunmeta.cc 2001-11-11 15:57:49.000000000 +0100 -+++ dicom3tools-1.0~20110529/appsrc/misc/dcunmeta.cc 2011-08-29 21:39:18.000000000 +0200 +--- dicom3tools-1.0~20120228.orig/appsrc/misc/jpegdump.cc.pre2000 2001-11-11 15:57:49.000000000 +0100 ++++ dicom3tools-1.0~20120228/appsrc/misc/jpegdump.cc.pre2000 2012-03-05 10:54:02.000000000 +0100 @@ -1,4 +1,5 @@ -#include <iostream.h> +#include <iostream> +using namespace std; #include "basetype.h" - #include "mesgtext.h" -Index: dicom3tools-1.0~20110529/appsrc/misc/dumptiff.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/misc/dumptiff.cc 2001-11-11 15:57:49.000000000 +0100 -+++ dicom3tools-1.0~20110529/appsrc/misc/dumptiff.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,5 @@ --#include <iostream.h> -+#include <iostream> -+using namespace std; - #include "basetype.h" - #include "bnstream.h" -Index: dicom3tools-1.0~20110529/appsrc/misc/dumpwhat.cc +Index: dicom3tools-1.0~20120228/libsrc/include/dctool/uidgen.h =================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/misc/dumpwhat.cc 2006-09-17 19:24:08.000000000 +0200 -+++ dicom3tools-1.0~20110529/appsrc/misc/dumpwhat.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,5 +1,7 @@ --#include <fstream.h> --#include <iomanip.h> -+#include <fstream> -+#include <iomanip> -+#include <iostream> -+using namespace std; - #include <stdlib.h> // for atoi() - #include <ctype.h> - #include <string.h> -Index: dicom3tools-1.0~20110529/appsrc/misc/jpegdump.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/misc/jpegdump.cc 2011-05-10 18:19:51.000000000 +0200 -+++ dicom3tools-1.0~20110529/appsrc/misc/jpegdump.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,5 @@ --#include <iostream.h> -+#include <iostream> -+using namespace std; - - #include "basetype.h" - #include "txstream.h" -Index: dicom3tools-1.0~20110529/appsrc/misc/jpegdump.cc.pre2000 -=================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/misc/jpegdump.cc.pre2000 2001-11-11 15:57:49.000000000 +0100 -+++ dicom3tools-1.0~20110529/appsrc/misc/jpegdump.cc.pre2000 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,5 @@ --#include <iostream.h> -+#include <iostream> -+using namespace std; - - #include "basetype.h" - -Index: dicom3tools-1.0~20110529/appsrc/misc/jpegsplit.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/misc/jpegsplit.cc 2004-11-24 19:29:24.000000000 +0100 -+++ dicom3tools-1.0~20110529/appsrc/misc/jpegsplit.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,6 @@ --#include <fstream.h> -+#include <fstream> -+#include <iostream> -+using namespace std; - - #include "basetype.h" - #include "mesgtext.h" -Index: dicom3tools-1.0~20110529/appsrc/simple/ge9800/ge98id.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/simple/ge9800/ge98id.cc 2006-09-17 19:24:08.000000000 +0200 -+++ dicom3tools-1.0~20110529/appsrc/simple/ge9800/ge98id.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,5 @@ --#include <iostream.h> -+#include <iostream> -+using namespace std; - - #include "basetype.h" - -Index: dicom3tools-1.0~20110529/appsrc/simple/ge9800/ge98topgm.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/simple/ge9800/ge98topgm.cc 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/appsrc/simple/ge9800/ge98topgm.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,6 @@ --#include <iostream.h> -+#include <iostream> -+#include <stdio.h> -+using namespace std; - - #include "basetype.h" - -Index: dicom3tools-1.0~20110529/appsrc/simple/genesis/gentopgm.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/simple/genesis/gentopgm.cc 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/appsrc/simple/genesis/gentopgm.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,6 @@ --#include <iostream.h> -+#include <iostream> -+#include <stdio.h> -+using namespace std; - - #include "basetype.h" - -Index: dicom3tools-1.0~20110529/appsrc/simple/pace/pacetopgm.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/simple/pace/pacetopgm.cc 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/appsrc/simple/pace/pacetopgm.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,6 @@ --#include <iostream.h> -+#include <iostream> -+#include <stdio.h> -+using namespace std; - - #include "basetype.h" - -Index: dicom3tools-1.0~20110529/appsrc/simple/signa/sgntopgm.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/simple/signa/sgntopgm.cc 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/appsrc/simple/signa/sgntopgm.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,6 @@ --#include <iostream.h> -+#include <iostream> -+#include <stdio.h> -+using namespace std; - - #include "basetype.h" - -Index: dicom3tools-1.0~20110529/appsrc/simple/somatom/somtopgm.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/simple/somatom/somtopgm.cc 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/appsrc/simple/somatom/somtopgm.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,6 @@ --#include <iostream.h> -+#include <iostream> -+#include <stdio.h> -+using namespace std; - - #include "basetype.h" - -Index: dicom3tools-1.0~20110529/appsrc/simple/sytec/syttopgm.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/simple/sytec/syttopgm.cc 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/appsrc/simple/sytec/syttopgm.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,6 @@ --#include <iostream.h> -+#include <iostream> -+#include <stdio.h> -+using namespace std; - - #include "basetype.h" - -Index: dicom3tools-1.0~20110529/appsrc/simple/vision/vsntopgm.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/simple/vision/vsntopgm.cc 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/appsrc/simple/vision/vsntopgm.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,6 @@ --#include <iostream.h> -+#include <iostream> -+#include <stdio.h> -+using namespace std; - - #include "basetype.h" - -Index: dicom3tools-1.0~20110529/libsrc/include/dconvert/planev.h -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/include/dconvert/planev.h 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/include/dconvert/planev.h 2011-08-29 21:39:18.000000000 +0200 -@@ -4,8 +4,9 @@ - #define __Header_planev__ - - #ifdef DEBUGPLANE --#include <iostream.h> --#include <iomanip.h> -+#include <iostream> -+using namespace std; -+#include <iomanip> - #endif - - #include <math.h> -Index: dicom3tools-1.0~20110529/libsrc/include/dconvert/ptyhdr.h -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/include/dconvert/ptyhdr.h 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/include/dconvert/ptyhdr.h 2011-08-29 21:39:18.000000000 +0200 -@@ -1,7 +1,8 @@ - #ifndef __Header_ptyhdr__ - #define __Header_ptyhdr__ - --#include <iostream.h> -+#include <iostream> -+using namespace std; - - #include "basetype.h" - #include "convtype.h" -Index: dicom3tools-1.0~20110529/libsrc/include/dctool/uidgen.h -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/include/dctool/uidgen.h 2006-10-22 00:03:44.000000000 +0200 -+++ dicom3tools-1.0~20110529/libsrc/include/dctool/uidgen.h 2011-08-29 21:39:18.000000000 +0200 +--- dicom3tools-1.0~20120228.orig/libsrc/include/dctool/uidgen.h 2006-10-22 00:03:44.000000000 +0200 ++++ dicom3tools-1.0~20120228/libsrc/include/dctool/uidgen.h 2012-03-05 10:54:02.000000000 +0100 @@ -1,9 +1,12 @@ +#include <sstream> +using namespace std; @@ -425,61 +48,12 @@ const char *stamp; protected: void setSOPInstance(); -Index: dicom3tools-1.0~20110529/libsrc/include/generic/bnstream.h +Index: dicom3tools-1.0~20120228/libsrc/include/generic/errclass.h =================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/include/generic/bnstream.h 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/include/generic/bnstream.h 2011-08-29 21:39:18.000000000 +0200 -@@ -1,8 +1,9 @@ - #ifndef __Header_bnstream__ - #define __Header_bnstream__ +--- dicom3tools-1.0~20120228.orig/libsrc/include/generic/errclass.h 2012-02-26 12:17:47.000000000 +0100 ++++ dicom3tools-1.0~20120228/libsrc/include/generic/errclass.h 2012-03-05 10:54:02.000000000 +0100 +@@ -27,15 +27,16 @@ --#include <iostream.h> --//#include <iomanip.h> -+#include <iostream> -+using namespace std; -+//#include <iomanip> - - #include "basetype.h" - #include "endtype.h" -Index: dicom3tools-1.0~20110529/libsrc/include/generic/endtype.h -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/include/generic/endtype.h 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/include/generic/endtype.h 2011-08-29 21:39:18.000000000 +0200 -@@ -1,7 +1,8 @@ - #ifndef __Header_endtype__ - #define __Header_endtype__ - --#include <iostream.h> //for debugging only -+#include <iostream> -+using namespace std; //for debugging only - - typedef enum { NoEndian, LittleEndian, BigEndian, ByteEndian } Endian; - -Index: dicom3tools-1.0~20110529/libsrc/include/generic/errclass.h -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/include/generic/errclass.h 2008-09-04 16:39:41.000000000 +0200 -+++ dicom3tools-1.0~20110529/libsrc/include/generic/errclass.h 2011-08-29 21:39:18.000000000 +0200 -@@ -1,14 +1,16 @@ - #ifndef __Header_errclass__ - #define __Header_errclass__ - --#include <iomanip.h> -+#include <iomanip> -+#include <sstream> -+using namespace std; - - class ErrorsInClass { - private: - char * errorstring; - protected: - bool good_flag; -- ostrstream errorstream; -+ ostringstream errorstream; - public: - ErrorsInClass(void) - { -@@ -19,15 +21,16 @@ - ~ErrorsInClass() { - if (errorstring) delete[] errorstring; @@ -498,95 +72,21 @@ return errorstring ? errorstring : ""; } }; -Index: dicom3tools-1.0~20110529/libsrc/include/generic/ntstream.h +Index: dicom3tools-1.0~20120228/libsrc/src/dcdisp/rdgray.cc.postsignextend =================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/include/generic/ntstream.h 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/include/generic/ntstream.h 2011-08-29 21:39:18.000000000 +0200 -@@ -2,7 +2,8 @@ - #ifndef __Header_nstream__ - #define __Header_nstream__ - --#include <iostream.h> -+#include <iostream> -+using namespace std; - - class netbuf: public streambuf { - protected: -Index: dicom3tools-1.0~20110529/libsrc/include/generic/txstream.h -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/include/generic/txstream.h 2005-02-26 14:50:12.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/include/generic/txstream.h 2011-08-29 21:39:18.000000000 +0200 -@@ -1,8 +1,9 @@ - #ifndef __Header_txstream__ - #define __Header_txstream__ - --#include <iostream.h> --#include <iomanip.h> -+#include <iostream> -+using namespace std; -+#include <iomanip> - - class TextOutputStream : public ostream { - public: -Index: dicom3tools-1.0~20110529/libsrc/src/dcdisp/rdargb.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/dcdisp/rdargb.cc 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/dcdisp/rdargb.cc 2011-08-29 21:39:18.000000000 +0200 +--- dicom3tools-1.0~20120228.orig/libsrc/src/dcdisp/rdgray.cc.postsignextend 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools-1.0~20120228/libsrc/src/dcdisp/rdgray.cc.postsignextend 2012-03-05 10:54:02.000000000 +0100 @@ -1,4 +1,5 @@ -#include <iostream.h> +#include <iostream> +using namespace std; - #include "attr.h" - #include "srcsink.h" -Index: dicom3tools-1.0~20110529/libsrc/src/dcdisp/rdcmyk.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/dcdisp/rdcmyk.cc 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/dcdisp/rdcmyk.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,5 @@ --#include <iostream.h> -+#include <iostream> -+using namespace std; - #include "basetype.h" #include "srcsink.h" -Index: dicom3tools-1.0~20110529/libsrc/src/dcdisp/rdgray.cc +Index: dicom3tools-1.0~20120228/libsrc/src/dcdisp/rdimage.cc.postsignextend =================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/dcdisp/rdgray.cc 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/dcdisp/rdgray.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,5 @@ --#include <iostream.h> -+#include <iostream> -+using namespace std; - - #include "basetype.h" - #include "srcsink.h" -Index: dicom3tools-1.0~20110529/libsrc/src/dcdisp/rdgray.cc.postsignextend -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/dcdisp/rdgray.cc.postsignextend 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/dcdisp/rdgray.cc.postsignextend 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,5 @@ --#include <iostream.h> -+#include <iostream> -+using namespace std; - - #include "basetype.h" - #include "srcsink.h" -Index: dicom3tools-1.0~20110529/libsrc/src/dcdisp/rdhsv.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/dcdisp/rdhsv.cc 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/dcdisp/rdhsv.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,5 @@ --#include <iostream.h> -+#include <iostream> -+using namespace std; - - #include "basetype.h" - #include "srcsink.h" -Index: dicom3tools-1.0~20110529/libsrc/src/dcdisp/rdimage.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/dcdisp/rdimage.cc 2002-09-02 16:30:42.000000000 +0200 -+++ dicom3tools-1.0~20110529/libsrc/src/dcdisp/rdimage.cc 2011-08-29 21:39:18.000000000 +0200 +--- dicom3tools-1.0~20120228.orig/libsrc/src/dcdisp/rdimage.cc.postsignextend 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools-1.0~20120228/libsrc/src/dcdisp/rdimage.cc.postsignextend 2012-03-05 10:54:02.000000000 +0100 @@ -1,5 +1,6 @@ -#include <iostream.h> -#include <iomanip.h> @@ -596,46 +96,11 @@ #include "basetype.h" #include "srcsink.h" -Index: dicom3tools-1.0~20110529/libsrc/src/dcdisp/rdimage.cc.postsignextend +Index: dicom3tools-1.0~20120228/libsrc/src/dcdisp/usegray.cc.signedwork =================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/dcdisp/rdimage.cc.postsignextend 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/dcdisp/rdimage.cc.postsignextend 2011-08-29 21:39:18.000000000 +0200 +--- dicom3tools-1.0~20120228.orig/libsrc/src/dcdisp/usegray.cc.signedwork 2001-11-11 15:57:50.000000000 +0100 ++++ dicom3tools-1.0~20120228/libsrc/src/dcdisp/usegray.cc.signedwork 2012-03-05 10:54:02.000000000 +0100 @@ -1,5 +1,6 @@ --#include <iostream.h> --#include <iomanip.h> -+#include <iostream> -+using namespace std; -+#include <iomanip> - - #include "basetype.h" - #include "srcsink.h" -Index: dicom3tools-1.0~20110529/libsrc/src/dcdisp/rdindex.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/dcdisp/rdindex.cc 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/dcdisp/rdindex.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,5 @@ --#include <iostream.h> -+#include <iostream> -+using namespace std; - - #include "attr.h" - #include "srcsink.h" -Index: dicom3tools-1.0~20110529/libsrc/src/dcdisp/rdrgb.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/dcdisp/rdrgb.cc 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/dcdisp/rdrgb.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,5 @@ --#include <iostream.h> -+#include <iostream> -+using namespace std; - - #include "basetype.h" - #include "srcsink.h" -Index: dicom3tools-1.0~20110529/libsrc/src/dcdisp/usegray.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/dcdisp/usegray.cc 2007-10-02 15:10:45.000000000 +0200 -+++ dicom3tools-1.0~20110529/libsrc/src/dcdisp/usegray.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,5 +1,6 @@ -#include <iostream.h> // only for debugging -#include <iomanip.h> // only for debugging +#include <iostream> @@ -644,248 +109,12 @@ #include "basetype.h" #include "usegray.h" -Index: dicom3tools-1.0~20110529/libsrc/src/dcdisp/usegray.cc.signedwork +Index: dicom3tools-1.0~20120228/libsrc/src/dctool/uidgen.cc =================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/dcdisp/usegray.cc.signedwork 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/dcdisp/usegray.cc.signedwork 2011-08-29 21:39:18.000000000 +0200 -@@ -1,5 +1,6 @@ --#include <iostream.h> // only for debugging --#include <iomanip.h> // only for debugging -+#include <iostream> -+using namespace std; // only for debugging -+#include <iomanip> // only for debugging +--- dicom3tools-1.0~20120228.orig/libsrc/src/dctool/uidgen.cc 2012-02-26 13:01:26.000000000 +0100 ++++ dicom3tools-1.0~20120228/libsrc/src/dctool/uidgen.cc 2012-03-05 10:54:02.000000000 +0100 +@@ -107,7 +107,8 @@ - #include "basetype.h" - #include "usegray.h" -Index: dicom3tools-1.0~20110529/libsrc/src/dconvert/gaw/gawmpln.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/dconvert/gaw/gawmpln.cc 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/dconvert/gaw/gawmpln.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,5 +1,6 @@ --//#include <iostream.h> --//#include <iomanip.h> -+//#include <iostream> -+using namespace std; -+//#include <iomanip> - - #include "gawdc.h" - #include "elmconst.h" -Index: dicom3tools-1.0~20110529/libsrc/src/dconvert/gen/genmpln.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/dconvert/gen/genmpln.cc 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/dconvert/gen/genmpln.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,5 +1,6 @@ --//#include <iostream.h> --//#include <iomanip.h> -+//#include <iostream> -+using namespace std; -+//#include <iomanip> - - #include "gendc.h" - #include "elmconst.h" -Index: dicom3tools-1.0~20110529/libsrc/src/dconvert/himr/himrmpln.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/dconvert/himr/himrmpln.cc 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/dconvert/himr/himrmpln.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,5 +1,6 @@ --//#include <iostream.h> --//#include <iomanip.h> -+//#include <iostream> -+using namespace std; -+//#include <iomanip> - - #include "himrdc.h" - #include "elmconst.h" -Index: dicom3tools-1.0~20110529/libsrc/src/dconvert/imtn/imtnhdrc.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/dconvert/imtn/imtnhdrc.cc 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/dconvert/imtn/imtnhdrc.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,5 @@ --//#include <iostream.h> // for debugging only -+//#include <iostream> -+using namespace std; // for debugging only - - #include "ptyhdr.h" - #include "imtnptrs.h" -Index: dicom3tools-1.0~20110529/libsrc/src/dconvert/imtn/imtnmpln.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/dconvert/imtn/imtnmpln.cc 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/dconvert/imtn/imtnmpln.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,5 +1,6 @@ --//#include <iostream.h> --//#include <iomanip.h> -+//#include <iostream> -+using namespace std; -+//#include <iomanip> - - #include "imtndc.h" - #include "elmconst.h" -Index: dicom3tools-1.0~20110529/libsrc/src/dconvert/pace/pacempln.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/dconvert/pace/pacempln.cc 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/dconvert/pace/pacempln.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,5 +1,6 @@ --//#include <iostream.h> --//#include <iomanip.h> -+//#include <iostream> -+using namespace std; -+//#include <iomanip> - - #include "pacedc.h" - #include "elmconst.h" -Index: dicom3tools-1.0~20110529/libsrc/src/dconvert/pq/pqmpln.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/dconvert/pq/pqmpln.cc 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/dconvert/pq/pqmpln.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,5 +1,6 @@ --//#include <iostream.h> --//#include <iomanip.h> -+//#include <iostream> -+using namespace std; -+//#include <iomanip> - - #include "pqdc.h" - #include "elmconst.h" -Index: dicom3tools-1.0~20110529/libsrc/src/dconvert/shim/shimhdrc.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/dconvert/shim/shimhdrc.cc 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/dconvert/shim/shimhdrc.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,5 @@ --//#include <iostream.h> // for debugging only -+//#include <iostream> -+using namespace std; // for debugging only - - #include "ptyhdr.h" - #include "shimptrs.h" -Index: dicom3tools-1.0~20110529/libsrc/src/dconvert/shim/shimmpln.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/dconvert/shim/shimmpln.cc 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/dconvert/shim/shimmpln.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,5 +1,6 @@ --//#include <iostream.h> --//#include <iomanip.h> -+//#include <iostream> -+using namespace std; -+//#include <iomanip> - - #include "shimdc.h" - #include "elmconst.h" -Index: dicom3tools-1.0~20110529/libsrc/src/dconvert/signa/sgnmpln.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/dconvert/signa/sgnmpln.cc 2007-11-25 17:26:09.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/dconvert/signa/sgnmpln.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,5 +1,6 @@ --//#include <iostream.h> --//#include <iomanip.h> -+//#include <iostream> -+using namespace std; -+//#include <iomanip> - - #include "sgndc.h" - #include "elmconst.h" -Index: dicom3tools-1.0~20110529/libsrc/src/dconvert/somp/sompmpln.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/dconvert/somp/sompmpln.cc 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/dconvert/somp/sompmpln.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,5 +1,6 @@ --//#include <iostream.h> --//#include <iomanip.h> -+//#include <iostream> -+using namespace std; -+//#include <iomanip> - - #include "sompdc.h" - #include "elmconst.h" -Index: dicom3tools-1.0~20110529/libsrc/src/dconvert/xxxx/xxxxmpln.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/dconvert/xxxx/xxxxmpln.cc 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/dconvert/xxxx/xxxxmpln.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,5 +1,6 @@ --//#include <iostream.h> --//#include <iomanip.h> -+//#include <iostream> -+using namespace std; -+//#include <iomanip> - - #include "xxxxdc.h" - #include "elmconst.h" -Index: dicom3tools-1.0~20110529/libsrc/src/dctool/binval.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/dctool/binval.cc 2004-11-24 19:29:25.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/dctool/binval.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,4 @@ --#include <iomanip.h> -+#include <iomanip> - - #include "basetype.h" - #include "binvalc.h" -Index: dicom3tools-1.0~20110529/libsrc/src/dctool/charset.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/dctool/charset.cc 2008-09-08 20:58:40.000000000 +0200 -+++ dicom3tools-1.0~20110529/libsrc/src/dctool/charset.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,6 +1,7 @@ - #include <string.h> --//#include <iostream.h> // for cerr --//#include <iomanip.h> // for cerr -+//#include <iostream> -+using namespace std; // for cerr -+//#include <iomanip> // for cerr - - #include "charset.h" - #include "attr.h" -Index: dicom3tools-1.0~20110529/libsrc/src/dctool/dcopti.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/dctool/dcopti.cc 2007-03-16 03:00:21.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/dctool/dcopti.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,4 @@ --#include <fstream.h> -+#include <fstream> - - #include "basetype.h" - #include "dcopt.h" -Index: dicom3tools-1.0~20110529/libsrc/src/dctool/dcopto.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/dctool/dcopto.cc 2010-03-10 15:06:36.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/dctool/dcopto.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,4 @@ --#include <fstream.h> -+#include <fstream> - - #include "attr.h" - #include "attrlist.h" -Index: dicom3tools-1.0~20110529/libsrc/src/dctool/tagval.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/dctool/tagval.cc 2004-11-24 19:29:25.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/dctool/tagval.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,4 @@ --#include <iomanip.h> -+#include <iomanip> - - #include "basetype.h" - #include "tagvalc.h" -Index: dicom3tools-1.0~20110529/libsrc/src/dctool/transyn.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/dctool/transyn.cc 2009-02-10 02:53:36.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/dctool/transyn.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,5 @@ --#include <iostream.h> -+#include <iostream> -+using namespace std; - - #include "transyn.h" - #include "transynd.h" -Index: dicom3tools-1.0~20110529/libsrc/src/dctool/uidgen.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/dctool/uidgen.cc 2006-10-22 00:03:44.000000000 +0200 -+++ dicom3tools-1.0~20110529/libsrc/src/dctool/uidgen.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,4 @@ --#include <iomanip.h> -+#include <iomanip> - - #ifdef CRAP - #include <time.h> -@@ -117,7 +117,8 @@ - GeneratedUID::~GeneratedUID() { - if (string) delete[] string; @@ -894,7 +123,7 @@ } GeneratedUID::operator char *(void) -@@ -129,8 +130,9 @@ +@@ -119,8 +120,9 @@ ost << stamp; else ost << (unsigned long)time(0) << "." << (unsigned long)getpid () << "." << (unsigned long)gethostid(); @@ -906,73 +135,11 @@ + return string; } -Index: dicom3tools-1.0~20110529/libsrc/src/generic/bnopti.cc +Index: dicom3tools-1.0~20120228/libsrc/src/generic/ioopto.cc =================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/generic/bnopti.cc 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/generic/bnopti.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,4 @@ --#include <fstream.h> -+#include <fstream> - - #include "basetype.h" - #include "endtype.h" -Index: dicom3tools-1.0~20110529/libsrc/src/generic/bnopto.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/generic/bnopto.cc 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/generic/bnopto.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,4 @@ --#include <fstream.h> -+#include <fstream> - - #include "basetype.h" - #include "endtype.h" -Index: dicom3tools-1.0~20110529/libsrc/src/generic/datetype.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/generic/datetype.cc 2006-10-10 23:09:22.000000000 +0200 -+++ dicom3tools-1.0~20110529/libsrc/src/generic/datetype.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,5 +1,6 @@ - #include <ctype.h> --//#include <iostream.h> // For debugging only -+//#include <iostream> -+using namespace std; // For debugging only - - #include "basetype.h" - #include "datetype.h" -Index: dicom3tools-1.0~20110529/libsrc/src/generic/getoptns.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/generic/getoptns.cc 2007-11-10 15:29:41.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/generic/getoptns.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,5 @@ --#include <iomanip.h> -+#include <iomanip> -+using namespace std; - #include <ctype.h> - #include <string.h> - -Index: dicom3tools-1.0~20110529/libsrc/src/generic/ioopti.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/generic/ioopti.cc 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/generic/ioopti.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,5 @@ --#include <fstream.h> -+#include <fstream> -+using namespace std; - - #include "basetype.h" - #include "ioopt.h" -Index: dicom3tools-1.0~20110529/libsrc/src/generic/ioopto.cc -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/generic/ioopto.cc 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/generic/ioopto.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,4 +1,6 @@ --#include <fstream.h> -+#include <fstream> -+#include <sstream> -+using namespace std; - - #include "basetype.h" - #include "ioopt.h" -@@ -24,7 +26,7 @@ +--- dicom3tools-1.0~20120228.orig/libsrc/src/generic/ioopto.cc 2012-02-26 12:29:33.000000000 +0100 ++++ dicom3tools-1.0~20120228/libsrc/src/generic/ioopto.cc 2012-03-05 10:54:02.000000000 +0100 +@@ -32,7 +32,7 @@ char * OutputOptions::usage(void) { @@ -981,7 +148,7 @@ const char **ptr; const char *lead; -@@ -33,10 +35,10 @@ +@@ -41,10 +41,10 @@ ostr << lead << "-" << *ptr; ostr << " " << MMsgDC(OutputFile) << "]"; @@ -994,20 +161,11 @@ } void -Index: dicom3tools-1.0~20110529/libsrc/src/locale/mesgtext.cc +Index: dicom3tools-1.0~20120228/libsrc/src/locale/mesgtext.cc =================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/locale/mesgtext.cc 2004-11-24 19:29:25.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/locale/mesgtext.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,5 +1,7 @@ - #include <string.h> --#include <iomanip.h> -+#include <iomanip> -+#include <sstream> -+using namespace std; - - #include "basetype.h" - #include "mesgtext.h" -@@ -35,28 +37,28 @@ +--- dicom3tools-1.0~20120228.orig/libsrc/src/locale/mesgtext.cc 2012-02-26 12:56:24.000000000 +0100 ++++ dicom3tools-1.0~20120228/libsrc/src/locale/mesgtext.cc 2012-03-05 10:54:02.000000000 +0100 +@@ -43,28 +43,28 @@ char * EMSGDC_Class::error(const char *index) { @@ -1045,23 +203,10 @@ } const char * -Index: dicom3tools-1.0~20110529/libsrc/src/ourdisp/ourdisp.cc +Index: dicom3tools-1.0~20120228/libsrc/support/binval.awk =================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/ourdisp/ourdisp.cc 2004-11-24 19:29:25.000000000 +0100 -+++ dicom3tools-1.0~20110529/libsrc/src/ourdisp/ourdisp.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,5 +1,6 @@ --#include <iostream.h> --#include <iomanip.h> -+#include <iostream> -+using namespace std; -+#include <iomanip> - - #include "basetype.h" - #include "errclass.h" -Index: dicom3tools-1.0~20110529/libsrc/support/binval.awk -=================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/support/binval.awk 2002-06-20 17:23:25.000000000 +0200 -+++ dicom3tools-1.0~20110529/libsrc/support/binval.awk 2011-08-29 21:39:18.000000000 +0200 +--- dicom3tools-1.0~20120228.orig/libsrc/support/binval.awk 2002-06-20 17:23:25.000000000 +0200 ++++ dicom3tools-1.0~20120228/libsrc/support/binval.awk 2012-03-05 10:54:02.000000000 +0100 @@ -13,6 +13,8 @@ print "" @@ -1118,10 +263,10 @@ print "}" print "" } -Index: dicom3tools-1.0~20110529/libsrc/support/tagval.awk +Index: dicom3tools-1.0~20120228/libsrc/support/tagval.awk =================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/support/tagval.awk 2002-06-20 17:23:25.000000000 +0200 -+++ dicom3tools-1.0~20110529/libsrc/support/tagval.awk 2011-08-29 21:39:18.000000000 +0200 +--- dicom3tools-1.0~20120228.orig/libsrc/support/tagval.awk 2002-06-20 17:23:25.000000000 +0200 ++++ dicom3tools-1.0~20120228/libsrc/support/tagval.awk 2012-03-05 10:54:02.000000000 +0100 @@ -11,6 +11,8 @@ print "" @@ -1151,22 +296,24 @@ } } -Index: dicom3tools-1.0~20110529/support/mktime.cc +Index: dicom3tools-1.0~20120228/support/mktime.cc =================================================================== ---- dicom3tools-1.0~20110529.orig/support/mktime.cc 2001-11-11 15:57:50.000000000 +0100 -+++ dicom3tools-1.0~20110529/support/mktime.cc 2011-08-29 21:39:18.000000000 +0200 -@@ -1,5 +1,6 @@ +--- dicom3tools-1.0~20120228.orig/support/mktime.cc 2012-02-26 12:27:31.000000000 +0100 ++++ dicom3tools-1.0~20120228/support/mktime.cc 2012-03-05 10:54:02.000000000 +0100 +@@ -5,7 +5,8 @@ + #include <cstdlib> + #else #include <time.h> -#include <iostream.h> +#include <iostream> +using namespace std; #include <assert.h> #include <stdlib.h> - -Index: dicom3tools-1.0~20110529/libsrc/src/dctool/attrmxrd.cc + #endif +Index: dicom3tools-1.0~20120228/libsrc/src/dctool/attrmxrd.cc =================================================================== ---- dicom3tools-1.0~20110529.orig/libsrc/src/dctool/attrmxrd.cc 2011-05-06 13:45:46.000000000 +0200 -+++ dicom3tools-1.0~20110529/libsrc/src/dctool/attrmxrd.cc 2011-08-29 21:39:18.000000000 +0200 +--- dicom3tools-1.0~20120228.orig/libsrc/src/dctool/attrmxrd.cc 2012-02-26 01:44:47.000000000 +0100 ++++ dicom3tools-1.0~20120228/libsrc/src/dctool/attrmxrd.cc 2012-03-05 10:54:02.000000000 +0100 @@ -6,6 +6,7 @@ #include "attrothr.h" #include "attrval.h" @@ -1175,10 +322,10 @@ // This may be defined in attrtype.h previously ... -Index: dicom3tools-1.0~20110529/appsrc/dcfile/dcfile.cc +Index: dicom3tools-1.0~20120228/appsrc/dcfile/dcfile.cc =================================================================== ---- dicom3tools-1.0~20110529.orig/appsrc/dcfile/dcfile.cc 2007-03-06 20:20:19.000000000 +0100 -+++ dicom3tools-1.0~20110529/appsrc/dcfile/dcfile.cc 2011-08-29 21:39:18.000000000 +0200 +--- dicom3tools-1.0~20120228.orig/appsrc/dcfile/dcfile.cc 2012-02-26 03:05:55.000000000 +0100 ++++ dicom3tools-1.0~20120228/appsrc/dcfile/dcfile.cc 2012-03-05 10:54:02.000000000 +0100 @@ -7,6 +7,7 @@ #include "attrval.h" #include "elmconst.h" Modified: trunk/packages/dicom3tools/trunk/debian/patches/configure.patch =================================================================== --- trunk/packages/dicom3tools/trunk/debian/patches/configure.patch 2012-03-05 09:48:32 UTC (rev 9881) +++ trunk/packages/dicom3tools/trunk/debian/patches/configure.patch 2012-03-05 09:55:48 UTC (rev 9882) @@ -1,10 +1,10 @@ Add support for kFreeBSD and GNU Hurd -Index: dicom3tools-1.0~20110529/config/Configure +Index: dicom3tools-1.0~20120228/config/Configure =================================================================== ---- dicom3tools-1.0~20110529.orig/config/Configure 2008-09-02 19:18:15.000000000 +0200 -+++ dicom3tools-1.0~20110529/config/Configure 2011-08-29 21:39:22.000000000 +0200 -@@ -681,7 +681,7 @@ +--- dicom3tools-1.0~20120228.orig/config/Configure 2012-02-28 16:11:35.000000000 +0100 ++++ dicom3tools-1.0~20120228/config/Configure 2012-03-05 10:54:39.000000000 +0100 +@@ -691,7 +691,7 @@ fi fi _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
