Author: malat Date: 2014-02-28 12:23:18 +0000 (Fri, 28 Feb 2014) New Revision: 16356
Removed: trunk/packages/dcmtk/branches/experimental/debian/patches/tpool_fix.patch Modified: trunk/packages/dcmtk/branches/experimental/debian/changelog trunk/packages/dcmtk/branches/experimental/debian/control trunk/packages/dcmtk/branches/experimental/debian/patches/series Log: new upload Modified: trunk/packages/dcmtk/branches/experimental/debian/changelog =================================================================== --- trunk/packages/dcmtk/branches/experimental/debian/changelog 2014-02-28 00:21:15 UTC (rev 16355) +++ trunk/packages/dcmtk/branches/experimental/debian/changelog 2014-02-28 12:23:18 UTC (rev 16356) @@ -1,3 +1,10 @@ +dcmtk (3.6.1~20131114-7) experimental; urgency=low + + * Bump Std-Vers to 3.9.5, no changes needed + * Fix failing SCP test. Closes: #740342 + + -- Mathieu Malaterre <[email protected]> Fri, 28 Feb 2014 13:19:20 +0100 + dcmtk (3.6.1~20131114-6) experimental; urgency=low * Remove non-ASCII char. Closes: #732673 Modified: trunk/packages/dcmtk/branches/experimental/debian/control =================================================================== --- trunk/packages/dcmtk/branches/experimental/debian/control 2014-02-28 00:21:15 UTC (rev 16355) +++ trunk/packages/dcmtk/branches/experimental/debian/control 2014-02-28 12:23:18 UTC (rev 16356) @@ -11,19 +11,19 @@ libpng-dev, libsndfile1-dev, libssl-dev, - libtiff-dev | libtiff5-dev, + libtiff-dev, libwrap0-dev, libxml2-dev, gettext, zlib1g-dev Build-Depends-Indep: doxygen (>= 1.7.4), graphviz -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/dcmtk/branches/experimental Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/dcmtk/branches/experimental Homepage: http://dicom.offis.de/dcmtk Package: dcmtk Architecture: any -Depends: adduser (>=3.34), ${misc:Depends}, ${shlibs:Depends} +Depends: adduser (>= 3.34), ${misc:Depends}, ${shlibs:Depends} Description: OFFIS DICOM toolkit command line utilities DCMTK includes a collection of libraries and applications for examining, constructing and converting DICOM image files, handling offline media, Modified: trunk/packages/dcmtk/branches/experimental/debian/patches/series =================================================================== --- trunk/packages/dcmtk/branches/experimental/debian/patches/series 2014-02-28 00:21:15 UTC (rev 16355) +++ trunk/packages/dcmtk/branches/experimental/debian/patches/series 2014-02-28 12:23:18 UTC (rev 16356) @@ -11,4 +11,4 @@ setuid2.patch import_git.patch timeout.patch -tpool_fix.patch +tpool2.patch Deleted: trunk/packages/dcmtk/branches/experimental/debian/patches/tpool_fix.patch =================================================================== --- trunk/packages/dcmtk/branches/experimental/debian/patches/tpool_fix.patch 2014-02-28 00:21:15 UTC (rev 16355) +++ trunk/packages/dcmtk/branches/experimental/debian/patches/tpool_fix.patch 2014-02-28 12:23:18 UTC (rev 16356) @@ -1,60 +0,0 @@ ---- dcmtk-3.6.1~20131114.orig/dcmnet/tests/tpool.cc -+++ dcmtk-3.6.1~20131114/dcmnet/tests/tpool.cc -@@ -25,6 +25,7 @@ - #ifdef WITH_THREADS - - #include "dcmtk/ofstd/oftest.h" -+#include "dcmtk/dcmnet/diutil.h" - #include "dcmtk/dcmnet/scppool.h" - #include "dcmtk/dcmnet/scu.h" - -@@ -34,9 +35,10 @@ struct TestSCU : DcmSCU, OFThread - protected: - void run() - { -- negotiateAssociation(); -+ result = negotiateAssociation(); -+ DCMNET_FATAL("negotiate association: " << result.text()); - result = sendECHORequest(0); -- releaseAssociation(); -+ releaseAssociation(); - } - }; - -@@ -51,13 +53,12 @@ protected: - }; - - --/* Test starts pool with a maximum of 5 SCP workers (default value). -- * All workers are configured to respond to C-ECHO (Verification SOP -- * Class). 20 SCU threads are created and connect simultaneously to -- * the pool, send C-ECHO messages are release the association. -- * Currently the pool ends itself after 3 seconds without connection -- * request. This can be changed to a "shutDown()" call on the pool -- * once it is implemented. -+/* Test starts pool with a maximum of 20 SCP workers. All workers are -+ * configured to respond to C-ECHO (Verification SOP Class). 20 SCU -+ * threads are created and connect simultaneously to the pool, send -+ * C-ECHO messages and release the association. Currently the pool -+ * ends itself after 3 seconds without connection request. This can -+ * be changed to a shutDown() call on the pool once it is implemented. - */ - OFTEST(dcmnet_scp_pool) - { -@@ -74,7 +75,7 @@ OFTEST(dcmnet_scp_pool) - * (currently under test), this should be done instead of exiting - * via connection timeout. - */ -- config.setConnectionTimeout(5); -+ config.setConnectionTimeout(3); - - pool.setMaxThreads(20); - OFList<OFString> xfers; -@@ -102,6 +103,7 @@ OFTEST(dcmnet_scp_pool) - for (OFVector<TestSCU*>::iterator it3 = scus.begin(); it3 != scus.end(); ++it3) - { - (*it3)->join(); -+ DCMNET_FATAL("send echo request: " << (*it3)->result.text()); - OFCHECK((*it3)->result.good()); - delete *it3; - } _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
