Author: malat-guest Date: 2012-03-05 10:57:59 +0000 (Mon, 05 Mar 2012) New Revision: 9883
Modified: trunk/packages/dicom3tools/trunk/debian/changelog 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/series trunk/packages/dicom3tools/trunk/debian/patches/strip.patch trunk/packages/dicom3tools/trunk/debian/rules Log: Update for next release Modified: trunk/packages/dicom3tools/trunk/debian/changelog =================================================================== --- trunk/packages/dicom3tools/trunk/debian/changelog 2012-03-05 09:55:48 UTC (rev 9882) +++ trunk/packages/dicom3tools/trunk/debian/changelog 2012-03-05 10:57:59 UTC (rev 9883) @@ -1,7 +1,9 @@ dicom3tools (1.0~20120228-1) unstable; urgency=low - * New release. + * New release + - remove 20_gcc4.3.patch applied upstream (partially) * Bump Standards-Version to 3.9.3. No changes needed + * Use DEP-3 for patches -- Mathieu Malaterre <[email protected]> Mon, 05 Mar 2012 10:52:19 +0100 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:55:48 UTC (rev 9882) +++ trunk/packages/dicom3tools/trunk/debian/patches/20_gcc4.3.patch 2012-03-05 10:57:59 UTC (rev 9883) @@ -1,13 +1,17 @@ -Porting to gcc 4.3 -http://gcc.gnu.org/gcc-4.3/porting_to.html +Description: Porting to gcc 4.3 + http://gcc.gnu.org/gcc-4.3/porting_to.html + Most can be automated with: + find . -type f -exec sed -i -e 's/#include <iostream.h>/#include <iostream>\nusing namespace std;/g' {} \; + find . -type f -exec sed -i -e 's/#include <iomanip.h>/#include <iomanip>/g' {} \; + find . -type f -exec sed -i -e 's/#include <fstream.h>/#include <fstream>/g' {} \; + the most complex part comes from the deprecation of ostrstream with a + different ostringstream (allocation is not done at same level) + This patch is kept around as code still uses ostrstream, which has been deprecated. It will be used + when default c++ compiler for debian will not accept it anymore. +Author: Mathieu Malaterre <[email protected]> +Forwarded: [email protected] +Last-Update: 2012-03-05 -Most can be automated with: -find . -type f -exec sed -i -e 's/#include <iostream.h>/#include <iostream>\nusing namespace std;/g' {} \; -find . -type f -exec sed -i -e 's/#include <iomanip.h>/#include <iomanip>/g' {} \; -find . -type f -exec sed -i -e 's/#include <fstream.h>/#include <fstream>/g' {} \; - -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~20120228/appsrc/dcfile/dcdirmk.cc_sqlengths =================================================================== --- dicom3tools-1.0~20120228.orig/appsrc/dcfile/dcdirmk.cc_sqlengths 2001-11-11 15:57:50.000000000 +0100 Modified: trunk/packages/dicom3tools/trunk/debian/patches/bmpdump.man.patch =================================================================== --- trunk/packages/dicom3tools/trunk/debian/patches/bmpdump.man.patch 2012-03-05 09:55:48 UTC (rev 9882) +++ trunk/packages/dicom3tools/trunk/debian/patches/bmpdump.man.patch 2012-03-05 10:57:59 UTC (rev 9883) @@ -1,4 +1,7 @@ -the bmpdump.man file was empty. We need to provide a minimal one instead. +Description: the bmpdump.man file was empty. We need to provide a minimal one instead. +Author: Mathieu Malaterre <[email protected]> +Forwarded: not-needed +Last-Update: 2012-03-05 Index: dicom3tools-1.0~20110529/appsrc/misc/bmpdump.man =================================================================== Modified: trunk/packages/dicom3tools/trunk/debian/patches/configure.patch =================================================================== --- trunk/packages/dicom3tools/trunk/debian/patches/configure.patch 2012-03-05 09:55:48 UTC (rev 9882) +++ trunk/packages/dicom3tools/trunk/debian/patches/configure.patch 2012-03-05 10:57:59 UTC (rev 9883) @@ -1,4 +1,7 @@ -Add support for kFreeBSD and GNU Hurd +Description: Add support for kFreeBSD and GNU Hurd +Author: Mathieu Malaterre <[email protected]> +Forwarded: not-needed +Last-Update: 2012-03-05 Index: dicom3tools-1.0~20120228/config/Configure =================================================================== Modified: trunk/packages/dicom3tools/trunk/debian/patches/jpegdump.man.patch =================================================================== --- trunk/packages/dicom3tools/trunk/debian/patches/jpegdump.man.patch 2012-03-05 09:55:48 UTC (rev 9882) +++ trunk/packages/dicom3tools/trunk/debian/patches/jpegdump.man.patch 2012-03-05 10:57:59 UTC (rev 9883) @@ -1,4 +1,7 @@ -the jpegdump.man file was empty. We need to provide a minimal one instead. +Description: the jpegdump.man file was empty. We need to provide a minimal one instead. +Author: Mathieu Malaterre <[email protected]> +Forwarded: not-needed +Last-Update: 2012-03-05 Index: dicom3tools-1.0~20110529/appsrc/misc/jpegdump.man =================================================================== Modified: trunk/packages/dicom3tools/trunk/debian/patches/project.tmpl.patch =================================================================== --- trunk/packages/dicom3tools/trunk/debian/patches/project.tmpl.patch 2012-03-05 09:55:48 UTC (rev 9882) +++ trunk/packages/dicom3tools/trunk/debian/patches/project.tmpl.patch 2012-03-05 10:57:59 UTC (rev 9883) @@ -1,4 +1,7 @@ -This is a patch to install in /usr/bin instead of /local +Description: This is a patch to install in /usr/bin instead of /local +Author: Mathieu Malaterre <[email protected]> +Forwarded: not-needed +Last-Update: 2012-03-05 Index: dicom3tools-1.0~20110529/config/Project.tmpl =================================================================== Modified: trunk/packages/dicom3tools/trunk/debian/patches/pvrg_naming.patch =================================================================== --- trunk/packages/dicom3tools/trunk/debian/patches/pvrg_naming.patch 2012-03-05 09:55:48 UTC (rev 9882) +++ trunk/packages/dicom3tools/trunk/debian/patches/pvrg_naming.patch 2012-03-05 10:57:59 UTC (rev 9883) @@ -1,3 +1,8 @@ +Description: Use debian convention for pvrg naming +Author: Mathieu Malaterre <[email protected]> +Forwarded: not-needed +Last-Update: 2012-03-05 + Index: dicom3tools-1.0~20110529/appsrc/dcfile/dcjpeg.script =================================================================== --- dicom3tools-1.0~20110529.orig/appsrc/dcfile/dcjpeg.script 2003-06-11 16:33:57.000000000 +0200 Modified: trunk/packages/dicom3tools/trunk/debian/patches/series =================================================================== --- trunk/packages/dicom3tools/trunk/debian/patches/series 2012-03-05 09:55:48 UTC (rev 9882) +++ trunk/packages/dicom3tools/trunk/debian/patches/series 2012-03-05 10:57:59 UTC (rev 9883) @@ -1,5 +1,5 @@ project.tmpl.patch -20_gcc4.3.patch +#20_gcc4.3.patch strip.patch configure.patch jpegdump.man.patch Modified: trunk/packages/dicom3tools/trunk/debian/patches/strip.patch =================================================================== --- trunk/packages/dicom3tools/trunk/debian/patches/strip.patch 2012-03-05 09:55:48 UTC (rev 9882) +++ trunk/packages/dicom3tools/trunk/debian/patches/strip.patch 2012-03-05 10:57:59 UTC (rev 9883) @@ -1,6 +1,9 @@ -Remove hard-coded strip call, instead rely on dh_strip to do the work -so that we respect DEB_BUILD_OPTION=nostrip -We also need to remove the -s from the 'install' command (InstPgmFlags) +Description: Remove hard-coded strip call, instead rely on dh_strip to do the work + so that we respect DEB_BUILD_OPTION=nostrip + We also need to remove the -s from the 'install' command (InstPgmFlags) +Author: Mathieu Malaterre <[email protected]> +Forwarded: not-needed +Last-Update: 2012-03-05 Index: dicom3tools-1.0~20110529/config/Imake.p-rules =================================================================== Modified: trunk/packages/dicom3tools/trunk/debian/rules =================================================================== --- trunk/packages/dicom3tools/trunk/debian/rules 2012-03-05 09:55:48 UTC (rev 9882) +++ trunk/packages/dicom3tools/trunk/debian/rules 2012-03-05 10:57:59 UTC (rev 9883) @@ -14,7 +14,7 @@ DEBIAN_SRC_TAR = dicom3tools_$(VER_FULL).orig.tar.gz ifneq (,$(findstring regression_testing_dicom,$(MM_BUILD_OPTIONS))) -DCLIST = -name andump\* -o -name dccp\* -o -name dcintro\* -o -name rawtodc\* -o -name pdftodc\* -o -name rawnjl2\* -o -name ancreate\* -o -name dcencap\* -o -name dccp\* -o -name dctoraw\* -o -name dcjpeg\* -o -name dcmulti\* -o -name dcuncat\* -o -name pnmtodc\* -o -name dcjls\* -o -name dcj2k\* -o -name dcunjpeg\* -o -name dcunjls\* -o -name bmpdump\* -o -name jpegdump\* -o -name dcdirdmp\* -o -name dcdump\* -o -name dcentvfy\* -o -name dcfile\* -o -name dchist\* -o -name dciodvfy\* -o -name dckey\* -o -name dcsort\* -o -name dcsrdump\* -o -name dcstats\* -o -name dctable\* -o -name dctopgm8\* -o -name dcposn\* -o -name dctopgx\* -o -name dctopnm\* -o -name pgxtodc\* -o -name pnmtodc\* -o -name rawftodc\* -o -name rawtodc\* +DCLIST = -name andump\* -o -name dcsmpte\* -o -name dccp\* -o -name dcintro\* -o -name pdftodc\* -o -name rawnjl2\* -o -name ancreate\* -o -name dcencap\* -o -name dctoraw\* -o -name dcjpeg\* -o -name dcmulti\* -o -name dcuncat\* -o -name pnmtodc\* -o -name dcjls\* -o -name dcj2k\* -o -name dcunjpeg\* -o -name dcunjls\* -o -name bmpdump\* -o -name jpegdump\* -o -name dcdirdmp\* -o -name dcdump\* -o -name dcentvfy\* -o -name dcfile\* -o -name dchist\* -o -name dciodvfy\* -o -name dckey\* -o -name dcsort\* -o -name dcsrdump\* -o -name dcstats\* -o -name dctable\* -o -name dctopgm8\* -o -name dcposn\* -o -name dctopgx\* -o -name dctopnm\* -o -name pgxtodc\* -o -name rawftodc\* -o -name rawtodc\* ifneq (,$(filter default_uid_root=%,$(MM_BUILD_OPTIONS))) DEFAULTUIDROOT = $(patsubst default_uid_root=%,%,$(filter default_uid_root=%,$(MM_BUILD_OPTIONS))) IMAKEFLAGS = -DDefaultUIDRoot=$(DEFAULTUIDROOT) _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
