[med-svn] r7523 - trunk/packages/dcmtk/trunk/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-08-23 12:10:23 +0000 (Tue, 23 Aug 2011)
New Revision: 7523

Modified:
   trunk/packages/dcmtk/trunk/debian/patches/removecharls.patch
Log:
Use new file name convention

Modified: trunk/packages/dcmtk/trunk/debian/patches/removecharls.patch
===================================================================
--- trunk/packages/dcmtk/trunk/debian/patches/removecharls.patch	2011-08-23 11:56:34 UTC (rev 7522)
+++ trunk/packages/dcmtk/trunk/debian/patches/removecharls.patch	2011-08-23 12:10:23 UTC (rev 7523)
@@ -1,7 +1,7 @@
 Index: dcmtk-3.6.0/dcmjpls/Makefile.in
 ===================================================================
---- dcmtk-3.6.0.orig/dcmjpls/Makefile.in	2011-08-23 13:39:52.000000000 +0200
-+++ dcmtk-3.6.0/dcmjpls/Makefile.in	2011-08-23 13:40:31.000000000 +0200
+--- dcmtk-3.6.0.orig/dcmjpls/Makefile.in	2011-08-23 14:05:49.000000000 +0200
++++ dcmtk-3.6.0/dcmjpls/Makefile.in	2011-08-23 14:05:50.000000000 +0200
 @@ -36,7 +36,6 @@
  	(cd include && $(MAKE) ARCH="$(ARCH)" all)
  
@@ -44,8 +44,8 @@
  #	(cd tests && touch $(DEP) && $(MAKE) dependencies)
 Index: dcmtk-3.6.0/dcmjpls/libsrc/Makefile.in
 ===================================================================
---- dcmtk-3.6.0.orig/dcmjpls/libsrc/Makefile.in	2011-08-23 13:42:02.000000000 +0200
-+++ dcmtk-3.6.0/dcmjpls/libsrc/Makefile.in	2011-08-23 13:42:47.000000000 +0200
+--- dcmtk-3.6.0.orig/dcmjpls/libsrc/Makefile.in	2011-08-23 14:05:49.000000000 +0200
++++ dcmtk-3.6.0/dcmjpls/libsrc/Makefile.in	2011-08-23 14:05:50.000000000 +0200
 @@ -16,10 +16,9 @@
  oflogdir = $(top_srcdir)/../oflog
  dcmdatadir = $(top_srcdir)/../dcmdata
@@ -60,8 +60,8 @@
  objs = djcodecd.o djcodece.o djcparam.o djdecode.o djencode.o djrparam.o djutils.o
 Index: dcmtk-3.6.0/dcmjpls/apps/Makefile.in
 ===================================================================
---- dcmtk-3.6.0.orig/dcmjpls/apps/Makefile.in	2011-08-23 13:43:12.000000000 +0200
-+++ dcmtk-3.6.0/dcmjpls/apps/Makefile.in	2011-08-23 13:43:23.000000000 +0200
+--- dcmtk-3.6.0.orig/dcmjpls/apps/Makefile.in	2011-08-23 14:05:49.000000000 +0200
++++ dcmtk-3.6.0/dcmjpls/apps/Makefile.in	2011-08-23 14:05:50.000000000 +0200
 @@ -42,10 +42,6 @@
  dcmjplslibdir = -L$(dcmjplsdir)/libsrc
  dcmjplslib = -ldcmjpls
@@ -73,3 +73,42 @@
  LOCALINCLUDES = $(dcmjplsinc) $(ofstdinc) $(ofloginc) $(dcmdatainc) $(dcmimageinc) $(dcmimgleinc)
  LIBDIRS = -L$(top_srcdir)/libsrc $(dcmjplslibdir) $(libcharlslibdir) $(dcmimagelibdir) \
  	$(dcmimglelibdir) $(dcmdatalibdir) $(ofloglibdir) $(ofstdlibdir)
+Index: dcmtk-3.6.0/dcmjpls/libsrc/djcodecd.cc
+===================================================================
+--- dcmtk-3.6.0.orig/dcmjpls/libsrc/djcodecd.cc	2011-08-23 14:06:39.000000000 +0200
++++ dcmtk-3.6.0/dcmjpls/libsrc/djcodecd.cc	2011-08-23 14:06:32.000000000 +0200
+@@ -44,7 +44,7 @@
+ #include "djerror.h"                 /* for private class DJLSError */
+ 
+ // JPEG-LS library (CharLS) includes
+-#include "intrface.h"
++#include "CharLS/interface.h"
+ 
+ E_TransferSyntax DJLSLosslessDecoder::supportedTransferSyntax() const
+ {
+Index: dcmtk-3.6.0/dcmjpls/libsrc/djcodece.cc
+===================================================================
+--- dcmtk-3.6.0.orig/dcmjpls/libsrc/djcodece.cc	2011-08-23 14:06:39.000000000 +0200
++++ dcmtk-3.6.0/dcmjpls/libsrc/djcodece.cc	2011-08-23 14:06:32.000000000 +0200
+@@ -62,7 +62,7 @@
+ #include "dcmtk/dcmimgle/dcmimage.h"  /* for class DicomImage */
+ 
+ // JPEG-LS library (CharLS) includes
+-#include "intrface.h"
++#include "CharLS/interface.h"
+ 
+ BEGIN_EXTERN_C
+ #ifdef HAVE_FCNTL_H
+Index: dcmtk-3.6.0/dcmjpls/libsrc/djerror.h
+===================================================================
+--- dcmtk-3.6.0.orig/dcmjpls/libsrc/djerror.h	2011-08-23 14:06:39.000000000 +0200
++++ dcmtk-3.6.0/dcmjpls/libsrc/djerror.h	2011-08-23 14:06:32.000000000 +0200
+@@ -31,7 +31,7 @@
+ 
+ #include "dcmtk/config/osconfig.h"
+ #include "dcmtk/dcmjpls/djlsutil.h" /* For the OFCondition codes */
+-#include "intrface.h" /* CharLS include */
++#include "CharLS/interface.h" /* CharLS include */
+ 
+ /** Helper class for converting between dcmjpls and CharLS error codes
+  */