[med-svn] r7590 - trunk/packages/dicom3tools/trunk/debian/patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Mon Aug 29 19:43:49 UTC 2011
Author: malat-guest
Date: 2011-08-29 19:43:49 +0000 (Mon, 29 Aug 2011)
New Revision: 7590
Modified:
trunk/packages/dicom3tools/trunk/debian/patches/20_gcc4.3.patch
trunk/packages/dicom3tools/trunk/debian/patches/bmpdump.man.patch
trunk/packages/dicom3tools/trunk/debian/patches/configure.patch
trunk/packages/dicom3tools/trunk/debian/patches/jpegdump.man.patch
trunk/packages/dicom3tools/trunk/debian/patches/project.tmpl.patch
trunk/packages/dicom3tools/trunk/debian/patches/pvrg_naming.patch
trunk/packages/dicom3tools/trunk/debian/patches/strip.patch
Log:
Fix a typo in bmptopgm man page. Use quilt to refresh patch
Modified: trunk/packages/dicom3tools/trunk/debian/patches/20_gcc4.3.patch
===================================================================
--- trunk/packages/dicom3tools/trunk/debian/patches/20_gcc4.3.patch 2011-08-29 17:39:44 UTC (rev 7589)
+++ trunk/packages/dicom3tools/trunk/debian/patches/20_gcc4.3.patch 2011-08-29 19:43:49 UTC (rev 7590)
@@ -8,9 +8,10 @@
the most complex part comes from the deprecation of ostrstream with a different ostringstream (allocation is not done at same level)
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/acrnema/ancp.cc dicom3tools_1.00.snapshot.20081122/appsrc/acrnema/ancp.cc
---- dicom3tools_1.00.snapshot.20081122.orig/appsrc/acrnema/ancp.cc 2007-11-24 23:30:27.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/appsrc/acrnema/ancp.cc 2008-12-16 10:43:34.433266000 +0100
+Index: dicom3tools-1.0~20110529/appsrc/acrnema/ancp.cc
+===================================================================
+--- 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>
@@ -21,9 +22,10 @@
#include <string.h>
#include <ctype.h>
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/acrnema/ancreate.cc dicom3tools_1.00.snapshot.20081122/appsrc/acrnema/ancreate.cc
---- dicom3tools_1.00.snapshot.20081122.orig/appsrc/acrnema/ancreate.cc 2007-01-20 17:18:28.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/appsrc/acrnema/ancreate.cc 2008-12-16 10:43:34.441258000 +0100
+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>
@@ -33,9 +35,10 @@
#include <string.h>
#include <ctype.h>
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/acrnema/andump.cc dicom3tools_1.00.snapshot.20081122/appsrc/acrnema/andump.cc
---- dicom3tools_1.00.snapshot.20081122.orig/appsrc/acrnema/andump.cc 2008-05-21 14:02:24.000000000 +0200
-+++ dicom3tools_1.00.snapshot.20081122/appsrc/acrnema/andump.cc 2008-12-16 10:43:34.457250000 +0100
+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>
@@ -46,9 +49,10 @@
#include <string.h>
#include <ctype.h>
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcdirmk.cc dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcdirmk.cc
---- dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcdirmk.cc 2008-09-08 21:45:41.000000000 +0200
-+++ dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcdirmk.cc 2008-12-16 10:43:34.677250000 +0100
+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>
@@ -56,54 +60,60 @@
#include <ctype.h>
#include "attrmxls.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcdirmk.cc_sqlengths dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcdirmk.cc_sqlengths
---- dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcdirmk.cc_sqlengths 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcdirmk.cc_sqlengths 2008-12-16 10:43:34.684250000 +0100
+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
@@ -1,4 +1,4 @@
-#include <fstream.h>
+#include <fstream>
#include "attrmxls.h"
#include "attrtype.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcdtchg.cc dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcdtchg.cc
---- dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcdtchg.cc 2007-11-10 17:06:29.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcdtchg.cc 2008-12-16 10:43:34.694250000 +0100
+Index: dicom3tools-1.0~20110529/appsrc/dcfile/dcdtchg.cc
+===================================================================
+--- 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"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcentvfy.cc dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcentvfy.cc
---- dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcentvfy.cc 2008-09-29 10:28:23.000000000 +0200
-+++ dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcentvfy.cc 2008-12-16 10:43:34.720250000 +0100
+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"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcmulti.cc dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcmulti.cc
---- dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcmulti.cc 2008-01-12 17:59:44.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcmulti.cc 2008-12-16 10:43:34.853167000 +0100
+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"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcpost.cc dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcpost.cc
---- dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcpost.cc 2006-09-17 19:24:08.000000000 +0200
-+++ dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcpost.cc 2008-12-16 10:43:34.932088000 +0100
+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"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcrmmeta.cc dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcrmmeta.cc
---- dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcrmmeta.cc 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcrmmeta.cc 2008-12-16 10:43:34.947072000 +0100
+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>
@@ -113,63 +123,70 @@
#include <string.h>
#include <ctype.h>
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcsort.cc dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcsort.cc
---- dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcsort.cc 2007-03-16 03:00:20.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcsort.cc 2008-12-16 10:43:34.969051000 +0100
+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"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcsqextr.cc dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcsqextr.cc
---- dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcsqextr.cc 2007-03-16 03:00:20.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcsqextr.cc 2008-12-16 10:43:34.977043000 +0100
+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"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcsrmrg.cc dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcsrmrg.cc
---- dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcsrmrg.cc 2006-09-17 19:24:08.000000000 +0200
-+++ dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcsrmrg.cc 2008-12-16 10:43:34.991029000 +0100
+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"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dctable.cc dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dctable.cc
---- dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dctable.cc 2008-11-19 23:35:06.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dctable.cc 2008-12-16 10:43:35.019001000 +0100
+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"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcuidchg.cc dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcuidchg.cc
---- dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcuidchg.cc 2007-03-16 03:00:21.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcuidchg.cc 2008-12-16 10:43:35.070949000 +0100
+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"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcuncat.cc dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcuncat.cc
---- dicom3tools_1.00.snapshot.20081122.orig/appsrc/dcfile/dcuncat.cc 2008-09-04 17:20:37.000000000 +0200
-+++ dicom3tools_1.00.snapshot.20081122/appsrc/dcfile/dcuncat.cc 2008-12-16 10:43:35.085934000 +0100
+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"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/dconvert/pq/pqsplit.cc dicom3tools_1.00.snapshot.20081122/appsrc/dconvert/pq/pqsplit.cc
---- dicom3tools_1.00.snapshot.20081122.orig/appsrc/dconvert/pq/pqsplit.cc 2004-11-24 19:29:24.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/appsrc/dconvert/pq/pqsplit.cc 2008-12-16 10:43:35.491570000 +0100
+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>
@@ -179,9 +196,10 @@
#include <assert.h>
#include <string.h>
#include <stdlib.h> // for atoi()
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/misc/binpatch.cc dicom3tools_1.00.snapshot.20081122/appsrc/misc/binpatch.cc
---- dicom3tools_1.00.snapshot.20081122.orig/appsrc/misc/binpatch.cc 2004-11-24 21:32:57.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/appsrc/misc/binpatch.cc 2008-12-16 10:43:35.669570000 +0100
+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
@@ -193,9 +211,10 @@
#include <stdlib.h> // for atoi()
#include <string.h> // for strlen()
#include <ctype.h> // for isdigit()
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/misc/dcunmeta.cc dicom3tools_1.00.snapshot.20081122/appsrc/misc/dcunmeta.cc
---- dicom3tools_1.00.snapshot.20081122.orig/appsrc/misc/dcunmeta.cc 2001-11-11 15:57:49.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/appsrc/misc/dcunmeta.cc 2008-12-16 10:43:35.686570000 +0100
+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
@@ -1,4 +1,5 @@
-#include <iostream.h>
+#include <iostream>
@@ -203,9 +222,10 @@
#include "basetype.h"
#include "mesgtext.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/misc/dumptiff.cc dicom3tools_1.00.snapshot.20081122/appsrc/misc/dumptiff.cc
---- dicom3tools_1.00.snapshot.20081122.orig/appsrc/misc/dumptiff.cc 2001-11-11 15:57:49.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/appsrc/misc/dumptiff.cc 2008-12-16 10:43:35.693571000 +0100
+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>
@@ -213,9 +233,10 @@
#include "basetype.h"
#include "bnstream.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/misc/dumpwhat.cc dicom3tools_1.00.snapshot.20081122/appsrc/misc/dumpwhat.cc
---- dicom3tools_1.00.snapshot.20081122.orig/appsrc/misc/dumpwhat.cc 2006-09-17 19:24:08.000000000 +0200
-+++ dicom3tools_1.00.snapshot.20081122/appsrc/misc/dumpwhat.cc 2008-12-16 10:58:24.042730000 +0100
+Index: dicom3tools-1.0~20110529/appsrc/misc/dumpwhat.cc
+===================================================================
+--- 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>
@@ -226,9 +247,10 @@
#include <stdlib.h> // for atoi()
#include <ctype.h>
#include <string.h>
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/misc/jpegdump.cc dicom3tools_1.00.snapshot.20081122/appsrc/misc/jpegdump.cc
---- dicom3tools_1.00.snapshot.20081122.orig/appsrc/misc/jpegdump.cc 2004-07-23 20:15:58.000000000 +0200
-+++ dicom3tools_1.00.snapshot.20081122/appsrc/misc/jpegdump.cc 2008-12-16 10:43:35.725570000 +0100
+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>
@@ -236,9 +258,10 @@
#include "basetype.h"
#include "txstream.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/misc/jpegdump.cc.pre2000 dicom3tools_1.00.snapshot.20081122/appsrc/misc/jpegdump.cc.pre2000
---- dicom3tools_1.00.snapshot.20081122.orig/appsrc/misc/jpegdump.cc.pre2000 2001-11-11 15:57:49.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/appsrc/misc/jpegdump.cc.pre2000 2008-12-16 10:43:35.731570000 +0100
+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>
@@ -246,9 +269,10 @@
#include "basetype.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/misc/jpegsplit.cc dicom3tools_1.00.snapshot.20081122/appsrc/misc/jpegsplit.cc
---- dicom3tools_1.00.snapshot.20081122.orig/appsrc/misc/jpegsplit.cc 2004-11-24 19:29:24.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/appsrc/misc/jpegsplit.cc 2008-12-16 10:58:53.105967000 +0100
+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>
@@ -257,9 +281,10 @@
#include "basetype.h"
#include "mesgtext.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/simple/ge9800/ge98id.cc dicom3tools_1.00.snapshot.20081122/appsrc/simple/ge9800/ge98id.cc
---- dicom3tools_1.00.snapshot.20081122.orig/appsrc/simple/ge9800/ge98id.cc 2006-09-17 19:24:08.000000000 +0200
-+++ dicom3tools_1.00.snapshot.20081122/appsrc/simple/ge9800/ge98id.cc 2008-12-16 10:43:35.839501000 +0100
+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>
@@ -267,9 +292,10 @@
#include "basetype.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/simple/ge9800/ge98topgm.cc dicom3tools_1.00.snapshot.20081122/appsrc/simple/ge9800/ge98topgm.cc
---- dicom3tools_1.00.snapshot.20081122.orig/appsrc/simple/ge9800/ge98topgm.cc 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/appsrc/simple/ge9800/ge98topgm.cc 2008-12-16 10:43:35.846494000 +0100
+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>
@@ -278,9 +304,10 @@
#include "basetype.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/simple/genesis/gentopgm.cc dicom3tools_1.00.snapshot.20081122/appsrc/simple/genesis/gentopgm.cc
---- dicom3tools_1.00.snapshot.20081122.orig/appsrc/simple/genesis/gentopgm.cc 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/appsrc/simple/genesis/gentopgm.cc 2008-12-16 10:43:35.881460000 +0100
+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>
@@ -289,9 +316,10 @@
#include "basetype.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/simple/pace/pacetopgm.cc dicom3tools_1.00.snapshot.20081122/appsrc/simple/pace/pacetopgm.cc
---- dicom3tools_1.00.snapshot.20081122.orig/appsrc/simple/pace/pacetopgm.cc 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/appsrc/simple/pace/pacetopgm.cc 2008-12-16 10:43:35.919422000 +0100
+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>
@@ -300,9 +328,10 @@
#include "basetype.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/simple/signa/sgntopgm.cc dicom3tools_1.00.snapshot.20081122/appsrc/simple/signa/sgntopgm.cc
---- dicom3tools_1.00.snapshot.20081122.orig/appsrc/simple/signa/sgntopgm.cc 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/appsrc/simple/signa/sgntopgm.cc 2008-12-16 10:43:35.950390000 +0100
+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>
@@ -311,9 +340,10 @@
#include "basetype.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/simple/somatom/somtopgm.cc dicom3tools_1.00.snapshot.20081122/appsrc/simple/somatom/somtopgm.cc
---- dicom3tools_1.00.snapshot.20081122.orig/appsrc/simple/somatom/somtopgm.cc 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/appsrc/simple/somatom/somtopgm.cc 2008-12-16 10:43:35.976364000 +0100
+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>
@@ -322,9 +352,10 @@
#include "basetype.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/simple/sytec/syttopgm.cc dicom3tools_1.00.snapshot.20081122/appsrc/simple/sytec/syttopgm.cc
---- dicom3tools_1.00.snapshot.20081122.orig/appsrc/simple/sytec/syttopgm.cc 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/appsrc/simple/sytec/syttopgm.cc 2008-12-16 10:43:36.006334000 +0100
+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>
@@ -333,9 +364,10 @@
#include "basetype.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/appsrc/simple/vision/vsntopgm.cc dicom3tools_1.00.snapshot.20081122/appsrc/simple/vision/vsntopgm.cc
---- dicom3tools_1.00.snapshot.20081122.orig/appsrc/simple/vision/vsntopgm.cc 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/appsrc/simple/vision/vsntopgm.cc 2008-12-16 10:43:36.037303000 +0100
+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>
@@ -344,9 +376,10 @@
#include "basetype.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/include/dconvert/planev.h dicom3tools_1.00.snapshot.20081122/libsrc/include/dconvert/planev.h
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/include/dconvert/planev.h 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/include/dconvert/planev.h 2008-12-16 10:43:36.215125000 +0100
+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__
@@ -359,9 +392,10 @@
#endif
#include <math.h>
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/include/dconvert/ptyhdr.h dicom3tools_1.00.snapshot.20081122/libsrc/include/dconvert/ptyhdr.h
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/include/dconvert/ptyhdr.h 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/include/dconvert/ptyhdr.h 2008-12-16 10:43:36.218125000 +0100
+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__
@@ -372,9 +406,10 @@
#include "basetype.h"
#include "convtype.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/include/dctool/uidgen.h dicom3tools_1.00.snapshot.20081122/libsrc/include/dctool/uidgen.h
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/include/dctool/uidgen.h 2006-10-22 00:03:44.000000000 +0200
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/include/dctool/uidgen.h 2008-12-16 10:59:40.066050000 +0100
+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
@@ -1,9 +1,12 @@
+#include <sstream>
+using namespace std;
@@ -390,9 +425,10 @@
const char *stamp;
protected:
void setSOPInstance();
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/include/generic/bnstream.h dicom3tools_1.00.snapshot.20081122/libsrc/include/generic/bnstream.h
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/include/generic/bnstream.h 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/include/generic/bnstream.h 2008-12-16 10:43:36.528890000 +0100
+Index: dicom3tools-1.0~20110529/libsrc/include/generic/bnstream.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__
@@ -405,9 +441,10 @@
#include "basetype.h"
#include "endtype.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/include/generic/endtype.h dicom3tools_1.00.snapshot.20081122/libsrc/include/generic/endtype.h
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/include/generic/endtype.h 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/include/generic/endtype.h 2008-12-16 10:43:36.538891000 +0100
+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__
@@ -418,9 +455,10 @@
typedef enum { NoEndian, LittleEndian, BigEndian, ByteEndian } Endian;
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/include/generic/errclass.h dicom3tools_1.00.snapshot.20081122/libsrc/include/generic/errclass.h
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/include/generic/errclass.h 2008-09-04 16:39:41.000000000 +0200
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/include/generic/errclass.h 2008-12-16 11:01:13.596258000 +0100
+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__
@@ -460,9 +498,10 @@
return errorstring ? errorstring : "";
}
};
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/include/generic/ntstream.h dicom3tools_1.00.snapshot.20081122/libsrc/include/generic/ntstream.h
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/include/generic/ntstream.h 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/include/generic/ntstream.h 2008-12-16 10:43:36.569891000 +0100
+Index: dicom3tools-1.0~20110529/libsrc/include/generic/ntstream.h
+===================================================================
+--- 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__
@@ -473,9 +512,10 @@
class netbuf: public streambuf {
protected:
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/include/generic/txstream.h dicom3tools_1.00.snapshot.20081122/libsrc/include/generic/txstream.h
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/include/generic/txstream.h 2005-02-26 14:50:12.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/include/generic/txstream.h 2008-12-16 10:43:36.576893000 +0100
+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__
@@ -488,9 +528,10 @@
class TextOutputStream : public ostream {
public:
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdargb.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdargb.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdargb.cc 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdargb.cc 2008-12-16 10:43:36.915745000 +0100
+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
@@ -1,4 +1,5 @@
-#include <iostream.h>
+#include <iostream>
@@ -498,9 +539,10 @@
#include "attr.h"
#include "srcsink.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdcmyk.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdcmyk.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdcmyk.cc 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdcmyk.cc 2008-12-16 10:43:36.918745000 +0100
+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>
@@ -508,9 +550,10 @@
#include "basetype.h"
#include "srcsink.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdgray.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdgray.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdgray.cc 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdgray.cc 2008-12-16 10:43:36.922738000 +0100
+Index: dicom3tools-1.0~20110529/libsrc/src/dcdisp/rdgray.cc
+===================================================================
+--- 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>
@@ -518,9 +561,10 @@
#include "basetype.h"
#include "srcsink.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdgray.cc.postsignextend dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdgray.cc.postsignextend
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdgray.cc.postsignextend 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdgray.cc.postsignextend 2008-12-16 10:43:36.926734000 +0100
+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>
@@ -528,9 +572,10 @@
#include "basetype.h"
#include "srcsink.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdhsv.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdhsv.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdhsv.cc 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdhsv.cc 2008-12-16 10:43:36.929733000 +0100
+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>
@@ -538,9 +583,10 @@
#include "basetype.h"
#include "srcsink.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdimage.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdimage.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdimage.cc 2002-09-02 16:30:42.000000000 +0200
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdimage.cc 2008-12-16 10:43:36.934726000 +0100
+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
@@ -1,5 +1,6 @@
-#include <iostream.h>
-#include <iomanip.h>
@@ -550,9 +596,10 @@
#include "basetype.h"
#include "srcsink.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdimage.cc.postsignextend dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdimage.cc.postsignextend
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdimage.cc.postsignextend 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdimage.cc.postsignextend 2008-12-16 10:43:36.939721000 +0100
+Index: dicom3tools-1.0~20110529/libsrc/src/dcdisp/rdimage.cc.postsignextend
+===================================================================
+--- 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
@@ -1,5 +1,6 @@
-#include <iostream.h>
-#include <iomanip.h>
@@ -562,9 +609,10 @@
#include "basetype.h"
#include "srcsink.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdindex.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdindex.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdindex.cc 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdindex.cc 2008-12-16 10:43:36.943718000 +0100
+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>
@@ -572,9 +620,10 @@
#include "attr.h"
#include "srcsink.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdrgb.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdrgb.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/rdrgb.cc 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/rdrgb.cc 2008-12-16 10:43:36.947713000 +0100
+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>
@@ -582,9 +631,10 @@
#include "basetype.h"
#include "srcsink.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/usegray.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/usegray.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/usegray.cc 2007-10-02 15:10:45.000000000 +0200
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/usegray.cc 2008-12-16 10:43:36.951709000 +0100
+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
@@ -594,9 +644,10 @@
#include "basetype.h"
#include "usegray.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/usegray.cc.signedwork dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/usegray.cc.signedwork
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dcdisp/usegray.cc.signedwork 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dcdisp/usegray.cc.signedwork 2008-12-16 10:43:36.955705000 +0100
+Index: dicom3tools-1.0~20110529/libsrc/src/dcdisp/usegray.cc.signedwork
+===================================================================
+--- 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
@@ -606,9 +657,10 @@
#include "basetype.h"
#include "usegray.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/gaw/gawmpln.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/gaw/gawmpln.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/gaw/gawmpln.cc 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/gaw/gawmpln.cc 2008-12-16 10:43:37.100560000 +0100
+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>
@@ -618,9 +670,10 @@
#include "gawdc.h"
#include "elmconst.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/gen/genmpln.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/gen/genmpln.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/gen/genmpln.cc 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/gen/genmpln.cc 2008-12-16 10:43:37.275385000 +0100
+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>
@@ -630,9 +683,10 @@
#include "gendc.h"
#include "elmconst.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/himr/himrmpln.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/himr/himrmpln.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/himr/himrmpln.cc 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/himr/himrmpln.cc 2008-12-16 10:43:37.454210000 +0100
+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>
@@ -642,9 +696,10 @@
#include "himrdc.h"
#include "elmconst.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/imtn/imtnhdrc.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/imtn/imtnhdrc.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/imtn/imtnhdrc.cc 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/imtn/imtnhdrc.cc 2008-12-16 10:43:37.653211000 +0100
+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>
@@ -652,9 +707,10 @@
#include "ptyhdr.h"
#include "imtnptrs.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/imtn/imtnmpln.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/imtn/imtnmpln.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/imtn/imtnmpln.cc 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/imtn/imtnmpln.cc 2008-12-16 10:43:37.668210000 +0100
+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>
@@ -664,9 +720,10 @@
#include "imtndc.h"
#include "elmconst.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/pace/pacempln.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/pace/pacempln.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/pace/pacempln.cc 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/pace/pacempln.cc 2008-12-16 10:43:37.823158000 +0100
+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>
@@ -676,9 +733,10 @@
#include "pacedc.h"
#include "elmconst.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/pq/pqmpln.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/pq/pqmpln.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/pq/pqmpln.cc 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/pq/pqmpln.cc 2008-12-16 10:43:37.976005000 +0100
+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>
@@ -688,9 +746,10 @@
#include "pqdc.h"
#include "elmconst.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/shim/shimhdrc.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/shim/shimhdrc.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/shim/shimhdrc.cc 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/shim/shimhdrc.cc 2008-12-16 10:43:38.082898000 +0100
+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>
@@ -698,9 +757,10 @@
#include "ptyhdr.h"
#include "shimptrs.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/shim/shimmpln.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/shim/shimmpln.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/shim/shimmpln.cc 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/shim/shimmpln.cc 2008-12-16 10:43:38.097883000 +0100
+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>
@@ -710,9 +770,10 @@
#include "shimdc.h"
#include "elmconst.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/signa/sgnmpln.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/signa/sgnmpln.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/signa/sgnmpln.cc 2007-11-25 17:26:09.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/signa/sgnmpln.cc 2008-12-16 10:43:38.228752000 +0100
+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>
@@ -722,9 +783,10 @@
#include "sgndc.h"
#include "elmconst.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/somp/sompmpln.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/somp/sompmpln.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/somp/sompmpln.cc 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/somp/sompmpln.cc 2008-12-16 10:43:38.386594000 +0100
+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>
@@ -734,9 +796,10 @@
#include "sompdc.h"
#include "elmconst.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/xxxx/xxxxmpln.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/xxxx/xxxxmpln.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dconvert/xxxx/xxxxmpln.cc 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dconvert/xxxx/xxxxmpln.cc 2008-12-16 10:43:38.617530000 +0100
+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>
@@ -746,18 +809,20 @@
#include "xxxxdc.h"
#include "elmconst.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dctool/binval.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dctool/binval.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dctool/binval.cc 2004-11-24 19:29:25.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dctool/binval.cc 2008-12-16 10:43:38.708534000 +0100
+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"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dctool/charset.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dctool/charset.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dctool/charset.cc 2008-09-08 20:58:40.000000000 +0200
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dctool/charset.cc 2008-12-16 10:43:38.712530000 +0100
+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
@@ -768,36 +833,40 @@
#include "charset.h"
#include "attr.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dctool/dcopti.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dctool/dcopti.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dctool/dcopti.cc 2007-03-16 03:00:21.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dctool/dcopti.cc 2008-12-16 10:43:38.724530000 +0100
+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"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dctool/dcopto.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dctool/dcopto.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dctool/dcopto.cc 2007-03-06 20:20:20.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dctool/dcopto.cc 2008-12-16 10:43:38.728530000 +0100
+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"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dctool/tagval.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dctool/tagval.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dctool/tagval.cc 2004-11-24 19:29:25.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dctool/tagval.cc 2008-12-16 10:43:38.810492000 +0100
+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"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dctool/transyn.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dctool/transyn.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dctool/transyn.cc 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dctool/transyn.cc 2008-12-16 10:43:38.813491000 +0100
+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>
@@ -805,9 +874,10 @@
#include "transyn.h"
#include "transynd.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dctool/uidgen.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/dctool/uidgen.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/dctool/uidgen.cc 2006-10-22 00:03:44.000000000 +0200
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/dctool/uidgen.cc 2008-12-16 11:00:07.251460000 +0100
+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>
@@ -836,27 +906,30 @@
+ return string;
}
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/generic/bnopti.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/generic/bnopti.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/generic/bnopti.cc 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/generic/bnopti.cc 2008-12-16 10:43:39.508851000 +0100
+Index: dicom3tools-1.0~20110529/libsrc/src/generic/bnopti.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"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/generic/bnopto.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/generic/bnopto.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/generic/bnopto.cc 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/generic/bnopto.cc 2008-12-16 10:43:39.512850000 +0100
+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"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/generic/datetype.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/generic/datetype.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/generic/datetype.cc 2006-10-10 23:09:22.000000000 +0200
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/generic/datetype.cc 2008-12-16 10:43:39.517850000 +0100
+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
@@ -865,9 +938,10 @@
#include "basetype.h"
#include "datetype.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/generic/getoptns.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/generic/getoptns.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/generic/getoptns.cc 2007-11-10 15:29:41.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/generic/getoptns.cc 2008-12-16 10:56:15.435028000 +0100
+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>
@@ -875,9 +949,10 @@
#include <ctype.h>
#include <string.h>
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/generic/ioopti.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/generic/ioopti.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/generic/ioopti.cc 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/generic/ioopti.cc 2008-12-16 10:56:39.768453000 +0100
+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>
@@ -885,9 +960,10 @@
#include "basetype.h"
#include "ioopt.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/generic/ioopto.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/generic/ioopto.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/generic/ioopto.cc 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/generic/ioopto.cc 2008-12-16 10:57:40.353338000 +0100
+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>
@@ -918,9 +994,10 @@
}
void
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/locale/mesgtext.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/locale/mesgtext.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/locale/mesgtext.cc 2004-11-24 19:29:25.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/locale/mesgtext.cc 2008-12-16 10:55:51.298479000 +0100
+Index: dicom3tools-1.0~20110529/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>
@@ -968,9 +1045,10 @@
}
const char *
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/ourdisp/ourdisp.cc dicom3tools_1.00.snapshot.20081122/libsrc/src/ourdisp/ourdisp.cc
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/src/ourdisp/ourdisp.cc 2004-11-24 19:29:25.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/src/ourdisp/ourdisp.cc 2008-12-16 10:43:39.635850000 +0100
+Index: dicom3tools-1.0~20110529/libsrc/src/ourdisp/ourdisp.cc
+===================================================================
+--- 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>
@@ -980,9 +1058,10 @@
#include "basetype.h"
#include "errclass.h"
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/support/binval.awk dicom3tools_1.00.snapshot.20081122/libsrc/support/binval.awk
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/support/binval.awk 2002-06-20 17:23:25.000000000 +0200
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/support/binval.awk 2008-12-16 11:07:57.427834000 +0100
+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
@@ -13,6 +13,8 @@
print ""
@@ -1039,9 +1118,10 @@
print "}"
print ""
}
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/libsrc/support/tagval.awk dicom3tools_1.00.snapshot.20081122/libsrc/support/tagval.awk
---- dicom3tools_1.00.snapshot.20081122.orig/libsrc/support/tagval.awk 2002-06-20 17:23:25.000000000 +0200
-+++ dicom3tools_1.00.snapshot.20081122/libsrc/support/tagval.awk 2008-12-16 11:08:53.226942000 +0100
+Index: dicom3tools-1.0~20110529/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
@@ -11,6 +11,8 @@
print ""
@@ -1071,9 +1151,10 @@
}
}
-diff -u -r dicom3tools_1.00.snapshot.20081122.orig/support/mktime.cc dicom3tools_1.00.snapshot.20081122/support/mktime.cc
---- dicom3tools_1.00.snapshot.20081122.orig/support/mktime.cc 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools_1.00.snapshot.20081122/support/mktime.cc 2008-12-16 10:43:40.335288000 +0100
+Index: dicom3tools-1.0~20110529/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 @@
#include <time.h>
-#include <iostream.h>
@@ -1082,9 +1163,10 @@
#include <assert.h>
#include <stdlib.h>
-diff -ru orig/dicom3tools-1.0~20091217/libsrc/src/dctool/attrmxrd.cc patch/dicom3tools-1.0~20091217/libsrc/src/dctool/attrmxrd.cc
---- dicom3tools-1.0~20091217.orig/libsrc/src/dctool/attrmxrd.cc 2009-07-10 01:38:20.000000000 +0200
-+++ dicom3tools-1.0~20091217/libsrc/src/dctool/attrmxrd.cc 2009-12-28 14:39:36.000000000 +0100
+Index: dicom3tools-1.0~20110529/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
@@ -6,6 +6,7 @@
#include "attrothr.h"
#include "attrval.h"
@@ -1093,9 +1175,10 @@
// This may be defined in attrtype.h previously ...
-diff -ru orig/dicom3tools-1.0~20091217/appsrc/dcfile/dcfile.cc patch/dicom3tools-1.0~20091217/appsrc/dcfile/dcfile.cc
---- dicom3tools-1.0~20091217.orig/appsrc/dcfile/dcfile.cc 2007-03-06 20:20:19.000000000 +0100
-+++ dicom3tools-1.0~20091217/appsrc/dcfile/dcfile.cc 2009-12-28 15:48:14.000000000 +0100
+Index: dicom3tools-1.0~20110529/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
@@ -7,6 +7,7 @@
#include "attrval.h"
#include "elmconst.h"
Modified: trunk/packages/dicom3tools/trunk/debian/patches/bmpdump.man.patch
===================================================================
--- trunk/packages/dicom3tools/trunk/debian/patches/bmpdump.man.patch 2011-08-29 17:39:44 UTC (rev 7589)
+++ trunk/packages/dicom3tools/trunk/debian/patches/bmpdump.man.patch 2011-08-29 19:43:49 UTC (rev 7590)
@@ -1,7 +1,9 @@
the bmpdump.man file was empty. We need to provide a minimal one instead.
---- dicom3tools-1.0~20100206/appsrc/misc/bmpdump.man 2001-11-11 15:57:49.000000000 +0100
-+++ copy/appsrc/misc/bmpdump.man 2010-05-03 17:49:28.000000000 +0200
+Index: dicom3tools-1.0~20110529/appsrc/misc/bmpdump.man
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ dicom3tools-1.0~20110529/appsrc/misc/bmpdump.man 2011-08-29 21:39:24.000000000 +0200
@@ -0,0 +1,14 @@
+.TH bmpdump: "1" "May 2010" "bmpdump" "User Commands"
+.SH NAME
@@ -12,7 +14,7 @@
+.SH DESCRIPTION
+bmpdump
+.PP
-+dumps aBMPG file, it will display the structure and values contained in the specified BMP file
++dumps a BMP file, it will display the structure and values contained in the specified BMP file
+
+This manual page was written by Mathieu Malaterre
+<mathieu.malaterre at gmail.com> for the Debian GNU/Linux system (but may be used by others).
Modified: trunk/packages/dicom3tools/trunk/debian/patches/configure.patch
===================================================================
--- trunk/packages/dicom3tools/trunk/debian/patches/configure.patch 2011-08-29 17:39:44 UTC (rev 7589)
+++ trunk/packages/dicom3tools/trunk/debian/patches/configure.patch 2011-08-29 19:43:49 UTC (rev 7590)
@@ -1,7 +1,9 @@
Add support for kFreeBSD and GNU Hurd
---- dicom3tools_1.00.snapshot.20081122.orig/config/Configure 2008-09-02 19:18:15.000000000 +0200
-+++ dicom3tools_1.00.snapshot.20081122/config/Configure 2009-09-09 17:24:55.000000000 +0200
+Index: dicom3tools-1.0~20110529/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 @@
fi
fi
Modified: trunk/packages/dicom3tools/trunk/debian/patches/jpegdump.man.patch
===================================================================
--- trunk/packages/dicom3tools/trunk/debian/patches/jpegdump.man.patch 2011-08-29 17:39:44 UTC (rev 7589)
+++ trunk/packages/dicom3tools/trunk/debian/patches/jpegdump.man.patch 2011-08-29 19:43:49 UTC (rev 7590)
@@ -1,7 +1,9 @@
the jpegdump.man file was empty. We need to provide a minimal one instead.
---- dicom3tools-1.0~20100206/appsrc/misc/jpegdump.man 2001-11-11 15:57:49.000000000 +0100
-+++ copy/appsrc/misc/jpegdump.man 2010-05-03 17:49:28.000000000 +0200
+Index: dicom3tools-1.0~20110529/appsrc/misc/jpegdump.man
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ dicom3tools-1.0~20110529/appsrc/misc/jpegdump.man 2011-08-29 21:39:23.000000000 +0200
@@ -0,0 +1,14 @@
+.TH JPEGDUMP: "1" "May 2010" "jpegdump" "User Commands"
+.SH NAME
Modified: trunk/packages/dicom3tools/trunk/debian/patches/project.tmpl.patch
===================================================================
--- trunk/packages/dicom3tools/trunk/debian/patches/project.tmpl.patch 2011-08-29 17:39:44 UTC (rev 7589)
+++ trunk/packages/dicom3tools/trunk/debian/patches/project.tmpl.patch 2011-08-29 19:43:49 UTC (rev 7590)
@@ -1,7 +1,9 @@
This is a patch to install in /usr/bin instead of /local
---- dicom3tools-1.0~20081122.orig/config/Project.tmpl 2001-11-11 15:57:50.000000000 +0100
-+++ dicom3tools-1.0~20081122/config/Project.tmpl 2008-12-15 14:38:11.000000000 +0100
+Index: dicom3tools-1.0~20110529/config/Project.tmpl
+===================================================================
+--- dicom3tools-1.0~20110529.orig/config/Project.tmpl 2001-11-11 15:57:50.000000000 +0100
++++ dicom3tools-1.0~20110529/config/Project.tmpl 2011-08-29 21:39:12.000000000 +0200
@@ -18,16 +18,16 @@
PRIVCONFIGDIR = PrivConfigDir
Modified: trunk/packages/dicom3tools/trunk/debian/patches/pvrg_naming.patch
===================================================================
--- trunk/packages/dicom3tools/trunk/debian/patches/pvrg_naming.patch 2011-08-29 17:39:44 UTC (rev 7589)
+++ trunk/packages/dicom3tools/trunk/debian/patches/pvrg_naming.patch 2011-08-29 19:43:49 UTC (rev 7590)
@@ -1,7 +1,7 @@
-Index: dicom3tools-1.0~20110522/appsrc/dcfile/dcjpeg.script
+Index: dicom3tools-1.0~20110529/appsrc/dcfile/dcjpeg.script
===================================================================
---- dicom3tools-1.0~20110522.orig/appsrc/dcfile/dcjpeg.script 2003-06-11 16:33:57.000000000 +0200
-+++ dicom3tools-1.0~20110522/appsrc/dcfile/dcjpeg.script 2011-05-28 18:00:48.000000000 +0200
+--- dicom3tools-1.0~20110529.orig/appsrc/dcfile/dcjpeg.script 2003-06-11 16:33:57.000000000 +0200
++++ dicom3tools-1.0~20110529/appsrc/dcfile/dcjpeg.script 2011-08-29 21:39:25.000000000 +0200
@@ -13,7 +13,7 @@
DCTORAW=dctoraw
DCKEY=dckey
@@ -11,10 +11,10 @@
infile="$1"
shift
-Index: dicom3tools-1.0~20110522/appsrc/dcfile/dcunjpeg.script
+Index: dicom3tools-1.0~20110529/appsrc/dcfile/dcunjpeg.script
===================================================================
---- dicom3tools-1.0~20110522.orig/appsrc/dcfile/dcunjpeg.script 2010-11-15 18:13:41.000000000 +0100
-+++ dicom3tools-1.0~20110522/appsrc/dcfile/dcunjpeg.script 2011-05-28 18:00:48.000000000 +0200
+--- dicom3tools-1.0~20110529.orig/appsrc/dcfile/dcunjpeg.script 2010-11-15 18:13:41.000000000 +0100
++++ dicom3tools-1.0~20110529/appsrc/dcfile/dcunjpeg.script 2011-08-29 21:39:25.000000000 +0200
@@ -11,7 +11,7 @@
DCTORAW=dctoraw
DCKEY=dckey
Modified: trunk/packages/dicom3tools/trunk/debian/patches/strip.patch
===================================================================
--- trunk/packages/dicom3tools/trunk/debian/patches/strip.patch 2011-08-29 17:39:44 UTC (rev 7589)
+++ trunk/packages/dicom3tools/trunk/debian/patches/strip.patch 2011-08-29 19:43:49 UTC (rev 7590)
@@ -2,8 +2,10 @@
so that we respect DEB_BUILD_OPTION=nostrip
We also need to remove the -s from the 'install' command (InstPgmFlags)
---- dicom3tools_1.00.snapshot.20081122.orig/config/Imake.p-rules 2009-08-04 16:30:21.000000000 +0200
-+++ dicom3tools_1.00.snapshot.20081122/config/Imake.p-rules 2009-08-04 16:30:30.000000000 +0200
+Index: dicom3tools-1.0~20110529/config/Imake.p-rules
+===================================================================
+--- dicom3tools-1.0~20110529.orig/config/Imake.p-rules 2006-10-05 18:08:27.000000000 +0200
++++ dicom3tools-1.0~20110529/config/Imake.p-rules 2011-08-29 21:39:21.000000000 +0200
@@ -72,7 +72,6 @@
$(CCC) -o $@ objects $(CPLUSPLUS_LDOPTIONS) locallibs \ @@\
$(CPLUSPLUS_LDLIBS) syslibs \ @@\
@@ -12,8 +14,10 @@
@@\
clean:: @@\
$(RM) program$(EXECUTABLESUFFIX)
---- dicom3tools_1.00.snapshot.20081122.orig/config/Imake.rules 2009-08-04 16:18:47.000000000 +0200
-+++ dicom3tools_1.00.snapshot.20081122/config/Imake.rules 2009-08-04 16:18:52.000000000 +0200
+Index: dicom3tools-1.0~20110529/config/Imake.rules
+===================================================================
+--- dicom3tools-1.0~20110529.orig/config/Imake.rules 2001-11-11 15:57:50.000000000 +0100
++++ dicom3tools-1.0~20110529/config/Imake.rules 2011-08-29 21:39:21.000000000 +0200
@@ -110,7 +110,6 @@
$(CCC) -o $@ objects $(CPLUSPLUS_LDOPTIONS) locallibs \ @@\
$(CPLUSPLUS_LDLIBS) syslibs \ @@\
@@ -22,8 +26,10 @@
@@\
clean:: @@\
$(RM) program
---- old/config/Imake.tmpl 2006-09-17 19:12:12.000000000 +0200
-+++ dicom3tools-1.0~20091113/config/Imake.tmpl 2009-12-03 16:41:35.000000000 +0100
+Index: dicom3tools-1.0~20110529/config/Imake.tmpl
+===================================================================
+--- dicom3tools-1.0~20110529.orig/config/Imake.tmpl 2006-09-17 19:12:12.000000000 +0200
++++ dicom3tools-1.0~20110529/config/Imake.tmpl 2011-08-29 21:39:21.000000000 +0200
@@ -203,7 +203,7 @@
#endif
More information about the debian-med-commit
mailing list