[med-svn] [dcmtkpp] 03/09: Fix patches

[Julien Lamy]

This is an automated email from the git hooks/post-receive script.

lamy-guest pushed a commit to branch master
in repository dcmtkpp.

commit f10ca65e7185b8edd2c0e034e0b0ca52a5264696
Author: Julien Lamy <lamy at unistra.fr>
Date:   Tue Jan 12 17:24:30 2016 +0100

    Fix patches
---
 debian/patches/807675.patch | 19 ++++++++-----------
 debian/patches/series       |  2 --
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/debian/patches/807675.patch b/debian/patches/807675.patch
index 615456d..183783d 100644
--- a/debian/patches/807675.patch
+++ b/debian/patches/807675.patch
@@ -16,33 +16,30 @@ Author: Julien Lamy <lamy at unistra.fr>
  configure() {
      cat > ${directory}/config  << EOF
  HostTable BEGIN
-@@ -40,18 +47,23 @@ clean() {
+@@ -40,10 +47,13 @@ clean() {
      rm -rf ${directory}
  }
  
--directory=$(mktemp -d dcmtkpp.XXX)
+-directory=$(mktemp -d odil.XXX)
 -configure
 -start_scp
 -add_data
 +if [ ${network} = "yes" ]
 +then
-+    directory=$(mktemp -d dcmtkpp.XXX)
++    directory=$(mktemp -d odil.XXX)
 +    configure
 +    start_scp
 +    add_data
 +fi
  
- export DCMTKPP_OWN_AET=LOCAL
- export DCMTKPP_PEER_HOST_NAME=localhost
- export DCMTKPP_PEER_PORT=11112
- export DCMTKPP_PEER_AET=REMOTE
+ export ODIL_OWN_AET=LOCAL
+ export ODIL_PEER_HOST_NAME=127.0.0.1
+@@ -52,6 +62,9 @@ export ODIL_PEER_AET=REMOTE
+ 
+ ctest --no-compress-output -T Test $@ || true
  
--ctest --no-compress-output -T Test || true
--
 -stop_scp
 -clean
-+ctest --no-compress-output -T Test $@ || true
- 
 +if [ ${network} = "yes" ]
 +then
 +    stop_scp
diff --git a/debian/patches/series b/debian/patches/series
index 3eaaec9..22ac312 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-fix-tests-boost1.56.patch
-804570.patch
 807675.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/dcmtkpp.git