Author: malat Date: 2014-06-03 19:07:19 +0000 (Tue, 03 Jun 2014) New Revision: 17037
Removed: trunk/packages/dicom3tools/trunk/debian/patches/fixkdu.patch trunk/packages/dicom3tools/trunk/debian/patches/fixupdict.patch Modified: trunk/packages/dicom3tools/trunk/debian/changelog trunk/packages/dicom3tools/trunk/debian/patches/bmpdump.man.patch trunk/packages/dicom3tools/trunk/debian/patches/codeblockstylefix.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/series trunk/packages/dicom3tools/trunk/debian/patches/strip.patch Log: new dicom3tools Modified: trunk/packages/dicom3tools/trunk/debian/changelog =================================================================== --- trunk/packages/dicom3tools/trunk/debian/changelog 2014-06-03 19:02:11 UTC (rev 17036) +++ trunk/packages/dicom3tools/trunk/debian/changelog 2014-06-03 19:07:19 UTC (rev 17037) @@ -1,3 +1,12 @@ +dicom3tools (1.00~20140527121828-1) unstable; urgency=low + + * New upstream, use new numbering convention + * Remove patch applied upstream: + - fixkdu.patch + - fixupdict.patch + + -- Mathieu Malaterre <[email protected]> Tue, 03 Jun 2014 21:03:52 +0200 + dicom3tools (1.00~20140306-1) unstable; urgency=low * New upstream Modified: trunk/packages/dicom3tools/trunk/debian/patches/bmpdump.man.patch =================================================================== --- trunk/packages/dicom3tools/trunk/debian/patches/bmpdump.man.patch 2014-06-03 19:02:11 UTC (rev 17036) +++ trunk/packages/dicom3tools/trunk/debian/patches/bmpdump.man.patch 2014-06-03 19:07:19 UTC (rev 17037) @@ -3,10 +3,10 @@ Forwarded: not-needed Last-Update: 2012-03-05 -Index: dicom3tools-1.0~20110529/appsrc/misc/bmpdump.man +Index: dicom3tools_1.00.snapshot.20140527121828/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 ++++ dicom3tools_1.00.snapshot.20140527121828/appsrc/misc/bmpdump.man 2014-06-03 21:03:07.682127423 +0200 @@ -0,0 +1,14 @@ +.TH bmpdump: "1" "May 2010" "bmpdump" "User Commands" +.SH NAME Modified: trunk/packages/dicom3tools/trunk/debian/patches/codeblockstylefix.patch =================================================================== --- trunk/packages/dicom3tools/trunk/debian/patches/codeblockstylefix.patch 2014-06-03 19:02:11 UTC (rev 17036) +++ trunk/packages/dicom3tools/trunk/debian/patches/codeblockstylefix.patch 2014-06-03 19:07:19 UTC (rev 17037) @@ -2,11 +2,11 @@ Author: Mathieu Malaterre <[email protected]> Bug-Debian: http://bugs.debian.org/668629 -Index: dicom3tools-1.0~20120505/appsrc/misc/jpegdump.cc +Index: dicom3tools_1.00.snapshot.20140527121828/appsrc/misc/jpegdump.cc =================================================================== ---- dicom3tools-1.0~20120505.orig/appsrc/misc/jpegdump.cc 2012-05-20 19:00:02.000000000 +0200 -+++ dicom3tools-1.0~20120505/appsrc/misc/jpegdump.cc 2012-05-20 19:00:32.000000000 +0200 -@@ -819,12 +819,12 @@ +--- dicom3tools_1.00.snapshot.20140527121828.orig/appsrc/misc/jpegdump.cc 2014-06-03 20:56:34.978127685 +0200 ++++ dicom3tools_1.00.snapshot.20140527121828/appsrc/misc/jpegdump.cc 2014-06-03 21:03:09.026127422 +0200 +@@ -820,12 +820,12 @@ CodeBlockStyle = buffer[8]; // Table A.19 - Code-block style for the SPcod and SPcoc parameters Deleted: trunk/packages/dicom3tools/trunk/debian/patches/fixkdu.patch =================================================================== --- trunk/packages/dicom3tools/trunk/debian/patches/fixkdu.patch 2014-06-03 19:02:11 UTC (rev 17036) +++ trunk/packages/dicom3tools/trunk/debian/patches/fixkdu.patch 2014-06-03 19:07:19 UTC (rev 17037) @@ -1,35 +0,0 @@ -Description: dcj2k would not compress losslessly (as-advertized) - since kdu_compress is lossy by default (no option) -Author: Mathieu Malaterre <[email protected]> -Forwarded: not-needed -Last-Update: 2013-01-09 - -Index: dicom3tools_1.00.snapshot.20121227/appsrc/dcfile/dcj2k.script -=================================================================== ---- dicom3tools_1.00.snapshot.20121227.orig/appsrc/dcfile/dcj2k.script 2013-01-09 11:53:47.551006855 +0100 -+++ dicom3tools_1.00.snapshot.20121227/appsrc/dcfile/dcj2k.script 2013-01-09 12:04:52.751010805 +0100 -@@ -13,6 +13,7 @@ - DCKEY=dckey - DCENCAP=dcencap - J2KCOMPRESS=kdu_compress -+j2kcompress_rev=yes - - infile="$1" - shift -@@ -30,6 +31,7 @@ - transfersyntax="1.2.840.10008.1.2.4.91" - compressionattributes="-r LossyImageCompression 01 -r LossyImageCompressionMethod ISO_15444_1" - addcompressionratio="yes" -+ j2kcompress_rev=no - else - transfersyntax="1.2.840.10008.1.2.4.90" - fi -@@ -61,7 +63,7 @@ - $DCCP "${infile}" "${TMPROOT}.big.dcm" -endian big -vr explicit - $DCTORAW -quiet "${TMPROOT}.big.dcm" "${TMPROOT}.big.raw" - rm "${TMPROOT}.big.dcm" --$J2KCOMPRESS -i "${TMPROOT}.big.raw" -o "${TMPROOT}.j2c" Sdims=\{"${height}","${width}"\} Sprecision="${precision}" Ssigned="${signed}" $* # creates $TMPROOT.big.raw.jpg -+$J2KCOMPRESS Creversible=${j2kcompress_rev} -i "${TMPROOT}.big.raw" -o "${TMPROOT}.j2c" Sdims=\{"${height}","${width}"\} Sprecision="${precision}" Ssigned="${signed}" $* # creates $TMPROOT.big.raw.jpg - if [ "${addcompressionratio}" = "yes" ] - then - uncompressedfilesize=`ls -l "${TMPROOT}.big.raw" | awk '{print $5}'` Deleted: trunk/packages/dicom3tools/trunk/debian/patches/fixupdict.patch =================================================================== --- trunk/packages/dicom3tools/trunk/debian/patches/fixupdict.patch 2014-06-03 19:02:11 UTC (rev 17036) +++ trunk/packages/dicom3tools/trunk/debian/patches/fixupdict.patch 2014-06-03 19:07:19 UTC (rev 17037) @@ -1,19 +0,0 @@ -Description: Remove trailing strings -Author: Mathieu Malaterre <[email protected]> -Forwarded: no - -Index: dicom3tools-1.00~20130623/libsrc/standard/elmdict/other.tpl -=================================================================== ---- dicom3tools-1.00~20130623.orig/libsrc/standard/elmdict/other.tpl 2013-07-05 09:27:46.918121158 +0200 -+++ dicom3tools-1.00~20130623/libsrc/standard/elmdict/other.tpl 2013-07-05 09:27:49.634121127 +0200 -@@ -1716,8 +1716,8 @@ - (1001,00BB) VERS="ONC" VR="SL" VM="1" Owner="PRIVATE_CODE_STRING_1001" Keyword="ThreeDDoseGridSize" Name="3D Dose Grid Size" - (1001,00BC) VERS="ONC" VR="FD" VM="3" Owner="PRIVATE_CODE_STRING_1001" Keyword="DoseGridCorner1" Name="Dose Grid Corner 1" - (1001,00BD) VERS="ONC" VR="FD" VM="3" Owner="PRIVATE_CODE_STRING_1001" Keyword="DoseGridCorner2" Name="Dose Grid Corner 2" --(1001,00BE) VERS="ONC" VR="FD" VM="1" Owner="PRIVATE_CODE_STRING_1001" Keyword="PatientDataConversion" Name="Patient Data Conversion"6 --(1001,00BF) VERS="ONC" VR="FD" VM="1" Owner="PRIVATE_CODE_STRING_1001" Keyword="VolumeDataConversion" Name="Volume Data Conversion"6 -+(1001,00BE) VERS="ONC" VR="FD" VM="1" Owner="PRIVATE_CODE_STRING_1001" Keyword="PatientDataConversion" Name="Patient Data Conversion" -+(1001,00BF) VERS="ONC" VR="FD" VM="1" Owner="PRIVATE_CODE_STRING_1001" Keyword="VolumeDataConversion" Name="Volume Data Conversion" - (1001,00C0) VERS="ONC" VR="FD" VM="3" Owner="PRIVATE_CODE_STRING_1001" Keyword="VolumeDataVector" Name="Volume Data Vector" - (1001,00C1) VERS="ONC" VR="SL" VM="1" Owner="PRIVATE_CODE_STRING_1001" Keyword="OptimizationMethod" Name="Optimization Method" - (1001,00C2) VERS="ONC" VR="SL" VM="1" Owner="PRIVATE_CODE_STRING_1001" Keyword="DisplayMethod" Name="Display Method" Modified: trunk/packages/dicom3tools/trunk/debian/patches/jpegdump.man.patch =================================================================== --- trunk/packages/dicom3tools/trunk/debian/patches/jpegdump.man.patch 2014-06-03 19:02:11 UTC (rev 17036) +++ trunk/packages/dicom3tools/trunk/debian/patches/jpegdump.man.patch 2014-06-03 19:07:19 UTC (rev 17037) @@ -3,10 +3,10 @@ Forwarded: not-needed Last-Update: 2012-03-05 -Index: dicom3tools-1.0~20110529/appsrc/misc/jpegdump.man +Index: dicom3tools_1.00.snapshot.20140527121828/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 ++++ dicom3tools_1.00.snapshot.20140527121828/appsrc/misc/jpegdump.man 2014-06-03 21:03:07.014127425 +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 2014-06-03 19:02:11 UTC (rev 17036) +++ trunk/packages/dicom3tools/trunk/debian/patches/project.tmpl.patch 2014-06-03 19:07:19 UTC (rev 17037) @@ -3,10 +3,10 @@ Forwarded: not-needed Last-Update: 2012-03-05 -Index: dicom3tools-1.0~20110529/config/Project.tmpl +Index: dicom3tools_1.00.snapshot.20140527121828/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 +--- dicom3tools_1.00.snapshot.20140527121828.orig/config/Project.tmpl 2014-06-03 20:56:35.106127685 +0200 ++++ dicom3tools_1.00.snapshot.20140527121828/config/Project.tmpl 2014-06-03 21:03:05.422127425 +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 2014-06-03 19:02:11 UTC (rev 17036) +++ trunk/packages/dicom3tools/trunk/debian/patches/pvrg_naming.patch 2014-06-03 19:07:19 UTC (rev 17037) @@ -3,10 +3,10 @@ Forwarded: not-needed Last-Update: 2012-03-05 -Index: dicom3tools-1.0~20110529/appsrc/dcfile/dcjpeg.script +Index: dicom3tools_1.00.snapshot.20140527121828/appsrc/dcfile/dcjpeg.script =================================================================== ---- 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 +--- dicom3tools_1.00.snapshot.20140527121828.orig/appsrc/dcfile/dcjpeg.script 2014-06-03 20:56:35.002127685 +0200 ++++ dicom3tools_1.00.snapshot.20140527121828/appsrc/dcfile/dcjpeg.script 2014-06-03 21:03:08.362127423 +0200 @@ -13,7 +13,7 @@ DCTORAW=dctoraw DCKEY=dckey @@ -16,10 +16,10 @@ infile="$1" shift -Index: dicom3tools-1.0~20110529/appsrc/dcfile/dcunjpeg.script +Index: dicom3tools_1.00.snapshot.20140527121828/appsrc/dcfile/dcunjpeg.script =================================================================== ---- 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 +--- dicom3tools_1.00.snapshot.20140527121828.orig/appsrc/dcfile/dcunjpeg.script 2014-06-03 20:56:35.002127685 +0200 ++++ dicom3tools_1.00.snapshot.20140527121828/appsrc/dcfile/dcunjpeg.script 2014-06-03 21:03:08.362127423 +0200 @@ -11,7 +11,7 @@ DCTORAW=dctoraw DCKEY=dckey Modified: trunk/packages/dicom3tools/trunk/debian/patches/series =================================================================== --- trunk/packages/dicom3tools/trunk/debian/patches/series 2014-06-03 19:02:11 UTC (rev 17036) +++ trunk/packages/dicom3tools/trunk/debian/patches/series 2014-06-03 19:07:19 UTC (rev 17037) @@ -1,9 +1,6 @@ -fixkdu.patch project.tmpl.patch -#20_gcc4.3.patch strip.patch jpegdump.man.patch bmpdump.man.patch pvrg_naming.patch codeblockstylefix.patch -fixupdict.patch Modified: trunk/packages/dicom3tools/trunk/debian/patches/strip.patch =================================================================== --- trunk/packages/dicom3tools/trunk/debian/patches/strip.patch 2014-06-03 19:02:11 UTC (rev 17036) +++ trunk/packages/dicom3tools/trunk/debian/patches/strip.patch 2014-06-03 19:07:19 UTC (rev 17037) @@ -5,10 +5,10 @@ Forwarded: not-needed Last-Update: 2012-03-05 -Index: dicom3tools-1.0~20110529/config/Imake.p-rules +Index: dicom3tools_1.00.snapshot.20140527121828/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 +--- dicom3tools_1.00.snapshot.20140527121828.orig/config/Imake.p-rules 2014-06-03 20:56:35.078127685 +0200 ++++ dicom3tools_1.00.snapshot.20140527121828/config/Imake.p-rules 2014-06-03 21:03:06.226127424 +0200 @@ -72,7 +72,6 @@ $(CCC) -o $@ objects $(CPLUSPLUS_LDOPTIONS) locallibs \ @@\ $(CPLUSPLUS_LDLIBS) syslibs \ @@\ @@ -17,10 +17,10 @@ @@\ clean:: @@\ $(RM) program$(EXECUTABLESUFFIX) -Index: dicom3tools-1.0~20110529/config/Imake.rules +Index: dicom3tools_1.00.snapshot.20140527121828/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 +--- dicom3tools_1.00.snapshot.20140527121828.orig/config/Imake.rules 2014-06-03 20:56:35.078127685 +0200 ++++ dicom3tools_1.00.snapshot.20140527121828/config/Imake.rules 2014-06-03 21:03:06.226127424 +0200 @@ -110,7 +110,6 @@ $(CCC) -o $@ objects $(CPLUSPLUS_LDOPTIONS) locallibs \ @@\ $(CPLUSPLUS_LDLIBS) syslibs \ @@\ @@ -29,10 +29,10 @@ @@\ clean:: @@\ $(RM) program -Index: dicom3tools-1.0~20110529/config/Imake.tmpl +Index: dicom3tools_1.00.snapshot.20140527121828/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 +--- dicom3tools_1.00.snapshot.20140527121828.orig/config/Imake.tmpl 2014-06-03 20:56:35.078127685 +0200 ++++ dicom3tools_1.00.snapshot.20140527121828/config/Imake.tmpl 2014-06-03 21:03:06.226127424 +0200 @@ -203,7 +203,7 @@ #endif _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
