[med-svn] r5975 - in trunk/packages/aeskulap/trunk/debian: . patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Mon Feb 14 13:33:45 UTC 2011
Author: malat-guest
Date: 2011-02-14 13:33:34 +0000 (Mon, 14 Feb 2011)
New Revision: 5975
Added:
trunk/packages/aeskulap/trunk/debian/patches/DcmElement_has_no_member_error.patch
trunk/packages/aeskulap/trunk/debian/patches/dcmdata_debug.patch
trunk/packages/aeskulap/trunk/debian/patches/findAndCopyElement.patch
trunk/packages/aeskulap/trunk/debian/patches/oflog.patch
trunk/packages/aeskulap/trunk/debian/patches/patientsname.patch
Modified:
trunk/packages/aeskulap/trunk/debian/changelog
trunk/packages/aeskulap/trunk/debian/control
trunk/packages/aeskulap/trunk/debian/get-orig-source_patch
trunk/packages/aeskulap/trunk/debian/patches/series
Log:
Trying to get aeskulap to compile against dcmtk 3.6.0
Modified: trunk/packages/aeskulap/trunk/debian/changelog
===================================================================
--- trunk/packages/aeskulap/trunk/debian/changelog 2011-02-14 13:15:50 UTC (rev 5974)
+++ trunk/packages/aeskulap/trunk/debian/changelog 2011-02-14 13:33:34 UTC (rev 5975)
@@ -1,3 +1,9 @@
+aeskulap (0.2.2b1-7) experimental; urgency=low
+
+ * Make it compiles against DCMTK 3.6.0
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Mon, 14 Feb 2011 14:32:30 +0100
+
aeskulap (0.2.2b1-6) unstable; urgency=low
* Team upload.
Modified: trunk/packages/aeskulap/trunk/debian/control
===================================================================
--- trunk/packages/aeskulap/trunk/debian/control 2011-02-14 13:15:50 UTC (rev 5974)
+++ trunk/packages/aeskulap/trunk/debian/control 2011-02-14 13:33:34 UTC (rev 5975)
@@ -3,11 +3,12 @@
Priority: optional
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
DM-Upload-Allowed: yes
-Uploaders: Andreas Tille <tille at debian.org>
+Uploaders: Andreas Tille <tille at debian.org>,
+ Mathieu Malaterre <mathieu.malaterre at gmail.com>
Build-Depends: cdbs, debhelper (>= 7.1), autotools-dev, libssl-dev, libgtkmm-2.4-dev,
- libglademm-2.4-dev, libgconfmm-2.6-dev, libwrap0-dev, intltool, libdcmtk1-dev,
+ libglademm-2.4-dev, libgconfmm-2.6-dev, libwrap0-dev, intltool, libdcmtk2-dev,
libtiff4-dev, quilt
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Homepage: http://aeskulap.nongnu.org
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/aeskulap/trunk/?rev=0&sc=0
Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/aeskulap/trunk/
Modified: trunk/packages/aeskulap/trunk/debian/get-orig-source_patch
===================================================================
--- trunk/packages/aeskulap/trunk/debian/get-orig-source_patch 2011-02-14 13:15:50 UTC (rev 5974)
+++ trunk/packages/aeskulap/trunk/debian/get-orig-source_patch 2011-02-14 13:33:34 UTC (rev 5975)
@@ -51,7 +51,7 @@
AC_SUBST(DCMTK_LIBS)
+DCMTK_CFLAGS="-DHAVE_CONFIG_H -I\$(prefix)/include"
-+DCMTK_LIBS="-L\$(prefix)/lib -ldcmjpeg -lijg8 -lijg12 -lijg16 -ldcmimage -ldcmimgle -ldcmnet -ldcmdata -lofstd -lwrap"
++DCMTK_LIBS="-L\$(prefix)/lib -ldcmjpeg -lijg8 -lijg12 -lijg16 -ldcmimage -ldcmimgle -ldcmnet -ldcmdata -lofstd -loflog -lwrap"
+
dnl set PREFIX
if test "x${prefix}" = "xNONE"; then
Added: trunk/packages/aeskulap/trunk/debian/patches/DcmElement_has_no_member_error.patch
===================================================================
--- trunk/packages/aeskulap/trunk/debian/patches/DcmElement_has_no_member_error.patch (rev 0)
+++ trunk/packages/aeskulap/trunk/debian/patches/DcmElement_has_no_member_error.patch 2011-02-14 13:33:34 UTC (rev 5975)
@@ -0,0 +1,15 @@
+Index: aeskulap-0.2.2b1/imagepool/poolassociation.h
+===================================================================
+--- aeskulap-0.2.2b1.orig/imagepool/poolassociation.h 2011-02-14 11:00:36.000000000 +0100
++++ aeskulap-0.2.2b1/imagepool/poolassociation.h 2011-02-14 11:00:52.000000000 +0100
+@@ -115,9 +115,7 @@
+
+ if(value != NULL) {
+ if (strlen(value) > 0) {
+- elem->putString(value);
+-
+- if (elem->error() != EC_Normal) {
++ if( elem->putString(value) != EC_Normal) {
+ printf("cannot put tag value: (%04x,%04x)=\"%s\"", g, e, value);
+ return false;
+ }
Added: trunk/packages/aeskulap/trunk/debian/patches/dcmdata_debug.patch
===================================================================
--- trunk/packages/aeskulap/trunk/debian/patches/dcmdata_debug.patch (rev 0)
+++ trunk/packages/aeskulap/trunk/debian/patches/dcmdata_debug.patch 2011-02-14 13:33:34 UTC (rev 5975)
@@ -0,0 +1,25 @@
+Index: aeskulap-0.2.2b1/imagepool/poolfindassociation.cpp
+===================================================================
+--- aeskulap-0.2.2b1.orig/imagepool/poolfindassociation.cpp 2011-02-14 12:20:49.000000000 +0100
++++ aeskulap-0.2.2b1/imagepool/poolfindassociation.cpp 2011-02-14 12:20:52.000000000 +0100
+@@ -26,7 +26,7 @@
+ Status: $State$
+ */
+
+-#include "dcmtk/dcmdata/dcdebug.h"
++//#include "dcmtk/dcmdata/dcdebug.h"
+ #include "poolfindassociation.h"
+
+
+Index: aeskulap-0.2.2b1/imagepool/poolmoveassociation.cpp
+===================================================================
+--- aeskulap-0.2.2b1.orig/imagepool/poolmoveassociation.cpp 2011-02-14 13:27:51.000000000 +0100
++++ aeskulap-0.2.2b1/imagepool/poolmoveassociation.cpp 2011-02-14 13:27:59.000000000 +0100
+@@ -34,7 +34,6 @@
+ #include "dcmtk/dcmnet/dimse.h"
+ #include "dcmtk/dcmnet/diutil.h"
+ #include "dcmtk/dcmdata/dcfilefo.h"
+-#include "dcmtk/dcmdata/dcdebug.h"
+ #include "dcmtk/dcmdata/dcuid.h"
+ #include "dcmtk/dcmdata/dcdict.h"
+ #include "dcmtk/dcmdata/cmdlnarg.h"
Added: trunk/packages/aeskulap/trunk/debian/patches/findAndCopyElement.patch
===================================================================
--- trunk/packages/aeskulap/trunk/debian/patches/findAndCopyElement.patch (rev 0)
+++ trunk/packages/aeskulap/trunk/debian/patches/findAndCopyElement.patch 2011-02-14 13:33:34 UTC (rev 5975)
@@ -0,0 +1,69 @@
+This change is related to:
+
+http://git.dcmtk.org/web?p=dcmtk.git;a=commitdiff;h=1d751592ff858b1dcb0f82647c06de779b8e7c32
+
+It allows compilation against DCMTK 3.6.0
+Index: aeskulap-0.2.2b1/imagepool/dicomdir.cpp
+===================================================================
+--- aeskulap-0.2.2b1.orig/imagepool/dicomdir.cpp 2011-02-14 10:27:07.000000000 +0100
++++ aeskulap-0.2.2b1/imagepool/dicomdir.cpp 2011-02-14 10:27:10.000000000 +0100
+@@ -151,21 +151,21 @@
+ DcmDataset study;
+ DcmElement *el;
+
+- if ( studyRec->findAndCopyElement(DCM_SpecificCharacterSet, el) == ECC_Normal )
++ if ( studyRec->findAndGetElement(DCM_SpecificCharacterSet, el, OFFalse, OFTrue) == ECC_Normal )
+ study.insert(el);
+- if ( studyRec->findAndCopyElement(DCM_StudyInstanceUID, el) == ECC_Normal )
++ if ( studyRec->findAndGetElement(DCM_StudyInstanceUID, el, OFFalse, OFTrue) == ECC_Normal )
+ study.insert(el);
+- if ( studyRec->findAndCopyElement(DCM_StudyDate, el) == ECC_Normal )
++ if ( studyRec->findAndGetElement(DCM_StudyDate, el, OFFalse, OFTrue) == ECC_Normal )
+ study.insert(el);
+- if ( studyRec->findAndCopyElement(DCM_StudyTime, el) == ECC_Normal )
++ if ( studyRec->findAndGetElement(DCM_StudyTime, el, OFFalse, OFTrue) == ECC_Normal )
+ study.insert(el);
+- if ( studyRec->findAndCopyElement(DCM_StudyDescription, el) == ECC_Normal )
++ if ( studyRec->findAndGetElement(DCM_StudyDescription, el, OFFalse, OFTrue) == ECC_Normal )
+ study.insert(el);
+- if ( patRec->findAndCopyElement(DCM_PatientsName, el) == ECC_Normal )
++ if ( patRec->findAndGetElement(DCM_PatientName, el, OFFalse, OFTrue) == ECC_Normal )
+ study.insert(el);
+- if ( patRec->findAndCopyElement(DCM_PatientsBirthDate, el) == ECC_Normal )
++ if ( patRec->findAndGetElement(DCM_PatientBirthDate, el, OFFalse, OFTrue) == ECC_Normal )
+ study.insert(el);
+- if ( patRec->findAndCopyElement(DCM_PatientsSex, el) == ECC_Normal )
++ if ( patRec->findAndGetElement(DCM_PatientSex, el, OFFalse, OFTrue) == ECC_Normal )
+ study.insert(el);
+ resultslot(create_query_study(&study, std::string("DICOMDIR:") + dicomdir));
+ }
+@@ -221,21 +221,21 @@
+ DcmDataset series;
+ DcmElement *el;
+
+- if ( seriesRec->findAndCopyElement(DCM_SpecificCharacterSet, el) == ECC_Normal )
++ if ( seriesRec->findAndGetElement(DCM_SpecificCharacterSet, el, OFFalse, OFTrue) == ECC_Normal )
+ series.insert(el);
+- if ( seriesRec->findAndCopyElement(DCM_SeriesDescription, el) == ECC_Normal )
++ if ( seriesRec->findAndGetElement(DCM_SeriesDescription, el, OFFalse, OFTrue) == ECC_Normal )
+ series.insert(el);
+- if ( seriesRec->findAndCopyElement(DCM_SeriesInstanceUID, el) == ECC_Normal )
++ if ( seriesRec->findAndGetElement(DCM_SeriesInstanceUID, el, OFFalse, OFTrue) == ECC_Normal )
+ series.insert(el);
+- if ( seriesRec->findAndCopyElement(DCM_Modality, el) == ECC_Normal )
++ if ( seriesRec->findAndGetElement(DCM_Modality, el, OFFalse, OFTrue) == ECC_Normal )
+ series.insert(el);
+- if ( seriesRec->findAndCopyElement(DCM_SeriesDate, el) == ECC_Normal )
++ if ( seriesRec->findAndGetElement(DCM_SeriesDate, el, OFFalse, OFTrue) == ECC_Normal )
+ series.insert(el);
+- if ( seriesRec->findAndCopyElement(DCM_SeriesTime, el) == ECC_Normal )
++ if ( seriesRec->findAndGetElement(DCM_SeriesTime, el, OFFalse, OFTrue) == ECC_Normal )
+ series.insert(el);
+- if ( studyRec->findAndCopyElement(DCM_StudyDescription, el) == ECC_Normal )
++ if ( studyRec->findAndGetElement(DCM_StudyDescription, el, OFFalse, OFTrue) == ECC_Normal )
+ series.insert(el);
+- if ( studyRec->findAndCopyElement(DCM_StationName, el) == ECC_Normal )
++ if ( studyRec->findAndGetElement(DCM_StationName, el, OFFalse, OFTrue) == ECC_Normal )
+ series.insert(el);
+
+ // Count Related SOP Instances
Added: trunk/packages/aeskulap/trunk/debian/patches/oflog.patch
===================================================================
--- trunk/packages/aeskulap/trunk/debian/patches/oflog.patch (rev 0)
+++ trunk/packages/aeskulap/trunk/debian/patches/oflog.patch 2011-02-14 13:33:34 UTC (rev 5975)
@@ -0,0 +1,39 @@
+Index: aeskulap-0.2.2b1/configure
+===================================================================
+--- aeskulap-0.2.2b1.orig/configure 2011-02-14 13:39:50.000000000 +0100
++++ aeskulap-0.2.2b1/configure 2011-02-14 13:38:39.000000000 +0100
+@@ -24361,7 +24361,7 @@
+
+
+ DCMTK_CFLAGS="-DHAVE_CONFIG_H -I\$(prefix)/include"
+-DCMTK_LIBS="-L\$(prefix)/lib -ldcmjpeg -lijg8 -lijg12 -lijg16 -ldcmimage -ldcmimgle -ldcmnet -ldcmdata -lofstd -lwrap"
++DCMTK_LIBS="-L\$(prefix)/lib -ldcmjpeg -lijg8 -lijg12 -lijg16 -ldcmimage -ldcmimgle -ldcmnet -ldcmdata -lofstd -loflog -lwrap"
+
+ if test "x${prefix}" = "xNONE"; then
+ packageprefix=${ac_default_prefix}
+Index: aeskulap-0.2.2b1/configure.in
+===================================================================
+--- aeskulap-0.2.2b1.orig/configure.in 2011-02-14 13:39:50.000000000 +0100
++++ aeskulap-0.2.2b1/configure.in 2011-02-14 13:38:48.000000000 +0100
+@@ -103,7 +103,7 @@
+ AC_SUBST(DCMTK_LIBS)
+
+ DCMTK_CFLAGS="-DHAVE_CONFIG_H -I\$(prefix)/include"
+-DCMTK_LIBS="-L\$(prefix)/lib -ldcmjpeg -lijg8 -lijg12 -lijg16 -ldcmimage -ldcmimgle -ldcmnet -ldcmdata -lofstd -lwrap"
++DCMTK_LIBS="-L\$(prefix)/lib -ldcmjpeg -lijg8 -lijg12 -lijg16 -ldcmimage -ldcmimgle -ldcmnet -ldcmdata -lofstd -loflog -lwrap"
+
+ dnl set PREFIX
+ if test "x${prefix}" = "xNONE"; then
+Index: aeskulap-0.2.2b1/debian/get-orig-source_patch
+===================================================================
+--- aeskulap-0.2.2b1.orig/debian/get-orig-source_patch 2011-02-14 13:39:50.000000000 +0100
++++ aeskulap-0.2.2b1/debian/get-orig-source_patch 2011-02-14 13:39:38.000000000 +0100
+@@ -51,7 +51,7 @@
+ AC_SUBST(DCMTK_LIBS)
+
+ +DCMTK_CFLAGS="-DHAVE_CONFIG_H -I\$(prefix)/include"
+-+DCMTK_LIBS="-L\$(prefix)/lib -ldcmjpeg -lijg8 -lijg12 -lijg16 -ldcmimage -ldcmimgle -ldcmnet -ldcmdata -lofstd -lwrap"
+++DCMTK_LIBS="-L\$(prefix)/lib -ldcmjpeg -lijg8 -lijg12 -lijg16 -ldcmimage -ldcmimgle -ldcmnet -ldcmdata -lofstd -loflog -lwrap"
+ +
+ dnl set PREFIX
+ if test "x${prefix}" = "xNONE"; then
Added: trunk/packages/aeskulap/trunk/debian/patches/patientsname.patch
===================================================================
--- trunk/packages/aeskulap/trunk/debian/patches/patientsname.patch (rev 0)
+++ trunk/packages/aeskulap/trunk/debian/patches/patientsname.patch 2011-02-14 13:33:34 UTC (rev 5975)
@@ -0,0 +1,68 @@
+Index: aeskulap-0.2.2b1/imagepool/netloader.cpp
+===================================================================
+--- aeskulap-0.2.2b1.orig/imagepool/netloader.cpp 2011-02-14 11:48:44.000000000 +0100
++++ aeskulap-0.2.2b1/imagepool/netloader.cpp 2011-02-14 11:48:47.000000000 +0100
+@@ -112,7 +112,7 @@
+ e->putString("STUDY");
+ query.insert(e);
+
+- e = newDicomElement(DCM_PatientsName);
++ e = newDicomElement(DCM_PatientName);
+ query.insert(e);
+
+ e = newDicomElement(DCM_PatientID);
+Index: aeskulap-0.2.2b1/imagepool/netquery.cpp
+===================================================================
+--- aeskulap-0.2.2b1.orig/imagepool/netquery.cpp 2011-02-14 11:48:44.000000000 +0100
++++ aeskulap-0.2.2b1/imagepool/netquery.cpp 2011-02-14 11:48:47.000000000 +0100
+@@ -210,7 +210,7 @@
+ e->putString(dicom_enc.c_str());
+ query.insert(e);
+
+- e = newDicomElement(DCM_PatientsName);
++ e = newDicomElement(DCM_PatientName);
+ e->putString(patientsname.c_str());
+ query.insert(e);
+
+@@ -225,10 +225,10 @@
+ e->putString(modality.c_str());
+ query.insert(e);
+
+- e = newDicomElement(DCM_PatientsBirthDate);
++ e = newDicomElement(DCM_PatientBirthDate);
+ query.insert(e);
+
+- e = newDicomElement(DCM_PatientsSex);
++ e = newDicomElement(DCM_PatientSex);
+ query.insert(e);
+
+ e = newDicomElement(DCM_StudyDate);
+Index: aeskulap-0.2.2b1/imagepool/poolinstance.cpp
+===================================================================
+--- aeskulap-0.2.2b1.orig/imagepool/poolinstance.cpp 2011-02-14 12:10:41.000000000 +0100
++++ aeskulap-0.2.2b1/imagepool/poolinstance.cpp 2011-02-14 12:11:04.000000000 +0100
+@@ -515,7 +515,7 @@
+ }
+
+ // set ManufacturersModelName
+- if(dset->findAndGetOFString(DCM_ManufacturersModelName, ofstr).good()) {
++ if(dset->findAndGetOFString(DCM_ManufacturerModelName, ofstr).good()) {
+ r->m_model = ofstr.c_str();
+ }
+
+@@ -565,12 +565,12 @@
+ //std::cout << "intercept: " << r->m_intercept << std::endl;
+
+ // study params
+- if(dset->findAndGetOFString(DCM_PatientsName, ofstr).good()) {
++ if(dset->findAndGetOFString(DCM_PatientName, ofstr).good()) {
+ r->m_patientsname = r->convert_string(ofstr.c_str());
+ }
+- dset->findAndGetOFString(DCM_PatientsBirthDate, ofstr);
++ dset->findAndGetOFString(DCM_PatientBirthDate, ofstr);
+ r->m_patientsbirthdate = ofstr.c_str();
+- dset->findAndGetOFString(DCM_PatientsSex, ofstr);
++ dset->findAndGetOFString(DCM_PatientSex, ofstr);
+ r->m_patientssex = ofstr.c_str();
+ if(dset->findAndGetOFString(DCM_StudyDescription, ofstr).good()) {
+ r->m_studydescription = r->convert_string(ofstr.c_str());
Modified: trunk/packages/aeskulap/trunk/debian/patches/series
===================================================================
--- trunk/packages/aeskulap/trunk/debian/patches/series 2011-02-14 13:15:50 UTC (rev 5974)
+++ trunk/packages/aeskulap/trunk/debian/patches/series 2011-02-14 13:33:34 UTC (rev 5975)
@@ -2,3 +2,8 @@
20_i18n_pt.patch
20_gcc4.4.patch
circular_svg_icon.patch
+findAndCopyElement.patch
+DcmElement_has_no_member_error.patch
+patientsname.patch
+dcmdata_debug.patch
+oflog.patch
More information about the debian-med-commit
mailing list