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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-08-23 12:13:54 +0000 (Tue, 23 Aug 2011)
New Revision: 7524

Modified:
   trunk/packages/dcmtk/trunk/debian/patches/removecharls.patch
Log:
Fix linking to CharLS

Modified: trunk/packages/dcmtk/trunk/debian/patches/removecharls.patch
===================================================================
--- trunk/packages/dcmtk/trunk/debian/patches/removecharls.patch	2011-08-23 12:10:23 UTC (rev 7523)
+++ trunk/packages/dcmtk/trunk/debian/patches/removecharls.patch	2011-08-23 12:13:54 UTC (rev 7524)
@@ -1,7 +1,7 @@
 Index: dcmtk-3.6.0/dcmjpls/Makefile.in
 ===================================================================
---- 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
+--- dcmtk-3.6.0.orig/dcmjpls/Makefile.in	2009-07-29 16:46:45.000000000 +0200
++++ dcmtk-3.6.0/dcmjpls/Makefile.in	2011-08-23 14:10:45.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 14:05:49.000000000 +0200
-+++ dcmtk-3.6.0/dcmjpls/libsrc/Makefile.in	2011-08-23 14:05:50.000000000 +0200
+--- dcmtk-3.6.0.orig/dcmjpls/libsrc/Makefile.in	2009-10-07 15:16:47.000000000 +0200
++++ dcmtk-3.6.0/dcmjpls/libsrc/Makefile.in	2011-08-23 14:10:45.000000000 +0200
 @@ -16,10 +16,9 @@
  oflogdir = $(top_srcdir)/../oflog
  dcmdatadir = $(top_srcdir)/../dcmdata
@@ -60,23 +60,23 @@
  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 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 @@
+--- dcmtk-3.6.0.orig/dcmjpls/apps/Makefile.in	2011-08-23 14:10:41.000000000 +0200
++++ dcmtk-3.6.0/dcmjpls/apps/Makefile.in	2011-08-23 14:11:27.000000000 +0200
+@@ -42,9 +42,7 @@
  dcmjplslibdir = -L$(dcmjplsdir)/libsrc
  dcmjplslib = -ldcmjpls
  
 -libcharlsdir = $(dcmjplsdir)
 -libcharlslibdir = -L$(dcmjplsdir)/libcharls
 -libcharlslib = -lcharls
--
++libcharlslib = -lCharLS
+ 
  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
+--- dcmtk-3.6.0.orig/dcmjpls/libsrc/djcodecd.cc	2010-10-14 15:14:24.000000000 +0200
++++ dcmtk-3.6.0/dcmjpls/libsrc/djcodecd.cc	2011-08-23 14:10:45.000000000 +0200
 @@ -44,7 +44,7 @@
  #include "djerror.h"                 /* for private class DJLSError */
  
@@ -88,8 +88,8 @@
  {
 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
+--- dcmtk-3.6.0.orig/dcmjpls/libsrc/djcodece.cc	2010-10-14 15:14:24.000000000 +0200
++++ dcmtk-3.6.0/dcmjpls/libsrc/djcodece.cc	2011-08-23 14:10:45.000000000 +0200
 @@ -62,7 +62,7 @@
  #include "dcmtk/dcmimgle/dcmimage.h"  /* for class DicomImage */
  
@@ -101,8 +101,8 @@
  #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
+--- dcmtk-3.6.0.orig/dcmjpls/libsrc/djerror.h	2010-10-14 15:20:24.000000000 +0200
++++ dcmtk-3.6.0/dcmjpls/libsrc/djerror.h	2011-08-23 14:10:45.000000000 +0200
 @@ -31,7 +31,7 @@
  
  #include "dcmtk/config/osconfig.h"